From e5d5b526fe54edd983cbbe491de786be1bbfdad6 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:15:53 +0100
Subject: [PATCH 01/19] Update build.gradle

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 150c9d8385..200bd2e765 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ apply plugin: 'download-jbr'
 
 // configure jbr download
 downloadJbr {
-    jbrVersion = '17.0.6-b653.34'
+    jbrVersion = '17.0.8.1-b1000.32'
 }
 
 // detect if we are in a CI build
@@ -52,13 +52,13 @@ if (project.hasProperty("forceCI")) {
 
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
-def major = "2022"
-def minor = "3"
+def major = "2023"
+def minor = "2"
 
 // Dependency versions
-ext.mpsVersion = '2022.3.1'
+ext.mpsVersion = '2023.2'
 
-def mbeddrVersion = "2022.3+"
+def mbeddrVersion = "2023.2+"
 
 def mpsQAVersion = major + "." + minor
 

From a7d900d6bbb276c9a6e1ebd76c17fc878da4c9ff Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:16:01 +0100
Subject: [PATCH 02/19] Regenerate build-allScripts.xml

---
 build/scripts/build-allScripts.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/scripts/build-allScripts.xml b/build/scripts/build-allScripts.xml
index 49b5339484..283cb7c701 100644
--- a/build/scripts/build-allScripts.xml
+++ b/build/scripts/build-allScripts.xml
@@ -36,7 +36,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>
   
@@ -302,11 +302,11 @@
         <path location="${iets3.lang.opensource}/languages/org.iets3.opensource.build.gentests/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
@@ -316,10 +316,8 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -329,14 +327,18 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -368,11 +370,11 @@
         <path location="${iets3.lang.opensource}/languages/org.iets3.opensource.build.gentests/generator/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
@@ -382,10 +384,8 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -396,14 +396,18 @@
         <pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />

From a83f18b30018d90b3a1df8f012360d497a1a9e0e Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:22:29 +0100
Subject: [PATCH 03/19] Remove deprecated call in widget presentation

---
 .../org.iets3.analysis.base/models/plugin.mps | 67 +++----------------
 1 file changed, 10 insertions(+), 57 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
index 24b1aa2ebe..49bea793ac 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
@@ -137,15 +137,10 @@
       </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-        <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
-      <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
-        <reference id="1188214555875" name="key" index="2B6OnR" />
-        <child id="1188214607812" name="value" index="2B70Vg" />
-      </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
@@ -298,7 +293,7 @@
         <child id="1160998896846" name="condition" index="1gVkn0" />
         <child id="1160998916832" name="message" index="1gVpfI" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -333,7 +328,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -440,9 +435,6 @@
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
-      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
-        <child id="2667874559098216723" name="text" index="3HnX3l" />
-      </concept>
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
@@ -457,7 +449,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>
@@ -525,7 +517,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">
@@ -6442,46 +6434,7 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="3clFb_" id="2fgSOgkgxBz" role="jymVt">
-      <property role="TrG5h" value="getMaxPossibleText" />
-      <node concept="3Tm1VV" id="2fgSOgkgxB_" role="1B3o_S" />
-      <node concept="2AHcQZ" id="2fgSOgkgxBB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-        <node concept="2B6LJw" id="7tc9lTMfnGo" role="2B76xF">
-          <ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
-          <node concept="Xl_RD" id="7tc9lTMfnGk" role="2B70Vg">
-            <property role="Xl_RC" value="2020.2" />
-          </node>
-        </node>
-        <node concept="2B6LJw" id="7tc9lTMfnGp" role="2B76xF">
-          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
-          <node concept="3clFbT" id="7tc9lTMfnGq" role="2B70Vg">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2fgSOgkgxBC" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-      </node>
-      <node concept="3uibUv" id="2fgSOgkgxBJ" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-      </node>
-      <node concept="3clFbS" id="2fgSOgkgxBN" role="3clF47">
-        <node concept="3clFbF" id="2fgSOgkgCy3" role="3cqZAp">
-          <node concept="Xl_RD" id="2fgSOgkgCy2" role="3clFbG">
-            <property role="Xl_RC" value="ISolvables" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2fgSOgkgxBO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="P$JXv" id="7tc9lTMfnGl" role="lGtFl">
-        <node concept="TZ5HI" id="7tc9lTMfnGm" role="3nqlJM">
-          <node concept="TZ5HA" id="7tc9lTMfnGn" role="3HnX3l" />
-        </node>
-      </node>
-    </node>
+    <node concept="2tJIrI" id="4z0AnX4KPM9" role="jymVt" />
     <node concept="3clFb_" id="2S0X1v6MAGK" role="jymVt">
       <property role="TrG5h" value="getClickConsumer" />
       <node concept="3Tm1VV" id="2S0X1v6MAGL" role="1B3o_S" />
@@ -8770,12 +8723,12 @@
             <node concept="2ShNRf" id="5HzZDakJctO" role="37vLTx">
               <node concept="1pGfFk" id="5HzZDakJctP" role="2ShVmc">
                 <ref role="37wK5l" to="dxuu:~JLabel.&lt;init&gt;(java.lang.String,javax.swing.Icon,int)" resolve="JLabel" />
-                <node concept="2OqwBi" id="5HzZDakJctQ" role="37wK5m">
-                  <node concept="37vLTw" id="2S0X1v6N2GP" role="2Oq$k0">
+                <node concept="2OqwBi" id="4z0AnX4L0SL" role="37wK5m">
+                  <node concept="37vLTw" id="4z0AnX4KZhg" role="2Oq$k0">
                     <ref role="3cqZAo" node="2S0X1v6N1c0" resolve="widgetText" />
                   </node>
-                  <node concept="liA8E" id="5HzZDakJctS" role="2OqNvi">
-                    <ref role="37wK5l" to="jkny:~StatusBarWidget$TextPresentation.getMaxPossibleText()" resolve="getMaxPossibleText" />
+                  <node concept="liA8E" id="4z0AnX4L2gN" role="2OqNvi">
+                    <ref role="37wK5l" to="jkny:~StatusBarWidget$TextPresentation.getText()" resolve="getText" />
                   </node>
                 </node>
                 <node concept="10M0yZ" id="$0lM0JKFLd" role="37wK5m">

From d8afb6fde77aa643b646abf5195cc53538a5b4ce Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:35:29 +0100
Subject: [PATCH 04/19] Use ConstraintsCanBeFacade instead of ModelConstraints

---
 .../models/behavior.mps                       |  55 +++++--
 .../org.iets3.core.attributes.mpl             |   3 +-
 .../models/intentions.mps                     | 154 ++++++++++++++----
 .../org/iets3/opensource/build/build.mps      |  34 +++-
 4 files changed, 194 insertions(+), 52 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
index ee1d5b8424..8e01dbc3e4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
@@ -20,6 +20,9 @@
     <import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" />
     <import index="1zby" ref="r:e876148b-672e-4264-9fee-d6d24a2d1223(org.iets3.core.expr.path.behavior)" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(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="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -67,6 +70,9 @@
       <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="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -77,7 +83,6 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -116,10 +121,11 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -128,7 +134,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -223,7 +229,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>
@@ -715,7 +721,6 @@
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getAllAttributes" />
-      <property role="DiZV1" value="true" />
       <node concept="3Tm1VV" id="spmH6cG2lB" role="1B3o_S" />
       <node concept="3clFbS" id="spmH6cG2lD" role="3clF47">
         <node concept="3clFbF" id="spmH6cG4N4" role="3cqZAp">
@@ -811,15 +816,39 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="2YIFZM" id="7VZAX31dZ6l" role="3uHU7w">
-                        <ref role="37wK5l" to="ykok:~ModelConstraints.canBeChild(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SAbstractConcept,org.jetbrains.mps.openapi.language.SContainmentLink,jetbrains.mps.smodel.runtime.CheckingNodeContext)" resolve="canBeChild" />
-                        <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-                        <node concept="13iPFW" id="4um6WxnZX4M" role="37wK5m" />
-                        <node concept="37vLTw" id="4um6WxnZXZN" role="37wK5m">
-                          <ref role="3cqZAo" node="5ZBgTg_Iy85" resolve="it" />
+                      <node concept="2OqwBi" id="4z0AnX6tT$k" role="3uHU7w">
+                        <node concept="2YIFZM" id="4z0AnX6tNER" role="2Oq$k0">
+                          <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                          <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                          <node concept="2OqwBi" id="4z0AnX6tS6J" role="37wK5m">
+                            <node concept="2OqwBi" id="4z0AnX6tQNI" role="2Oq$k0">
+                              <node concept="2OqwBi" id="4z0AnX6tQaq" role="2Oq$k0">
+                                <node concept="2ShNRf" id="4z0AnX6tOBv" role="2Oq$k0">
+                                  <node concept="1pGfFk" id="4z0AnX6tPZ9" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="4z0AnX6tQpu" role="2OqNvi">
+                                  <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.parentNode(org.jetbrains.mps.openapi.model.SNode)" resolve="parentNode" />
+                                  <node concept="13iPFW" id="4z0AnX6tQvg" role="37wK5m" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="4z0AnX6tQVS" role="2OqNvi">
+                                <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
+                                <node concept="37vLTw" id="4z0AnX6tRKW" role="37wK5m">
+                                  <ref role="3cqZAo" node="5ZBgTg_Iy85" resolve="it" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="4z0AnX6tSjo" role="2OqNvi">
+                              <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.build()" resolve="build" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4z0AnX6tVm8" role="2OqNvi">
+                          <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                         </node>
-                        <node concept="10Nm6u" id="7VZAX31dZ6o" role="37wK5m" />
-                        <node concept="10Nm6u" id="7VZAX31dZ6p" role="37wK5m" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
index 90afc9ec3c..0aa51790a1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -19,6 +18,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">583939be-ded0-4735-a055-a74f8477fc34(org.iets3.core.attributes)</dependency>
     <dependency reexport="false">f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)</dependency>
+    <dependency reexport="false">8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -101,6 +101,7 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="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="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
index 1610a53c16..79e5b504d9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
@@ -23,6 +23,9 @@
     <import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" />
     <import index="4kwy" ref="r:657c9fde-2f36-4e61-ae17-20f02b8630ad(org.iets3.core.base.structure)" />
     <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
+    <import index="ykol" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(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="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" implicit="true" />
   </imports>
   <registry>
@@ -65,6 +68,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -111,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>
@@ -132,7 +138,7 @@
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -270,7 +276,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1865,47 +1871,129 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4FREEt6vhKg" role="3cqZAp">
-          <node concept="1Wc70l" id="4FREEt6vga8" role="3clFbG">
-            <node concept="2YIFZM" id="4FREEt6vga9" role="3uHU7B">
-              <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-              <ref role="37wK5l" to="ykok:~ModelConstraints.canBeChild(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SAbstractConcept,org.jetbrains.mps.openapi.language.SContainmentLink,jetbrains.mps.smodel.runtime.CheckingNodeContext)" resolve="canBeChild" />
-              <node concept="2OqwBi" id="4FREEt6vgaa" role="37wK5m">
-                <node concept="37vLTw" id="4FREEt6vhSD" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+        <node concept="3cpWs8" id="SAzYS3hHlv" role="3cqZAp">
+          <node concept="3cpWsn" id="SAzYS3hHlw" role="3cpWs9">
+            <property role="TrG5h" value="containmentContext" />
+            <node concept="3uibUv" id="SAzYS3hHlx" role="1tU5fm">
+              <ref role="3uigEE" to="pdwk:~ContainmentContext" resolve="ContainmentContext" />
+            </node>
+            <node concept="2OqwBi" id="1PoRi1pBgG8" role="33vP2m">
+              <node concept="2OqwBi" id="1PoRi1pBfb3" role="2Oq$k0">
+                <node concept="2OqwBi" id="1PoRi1pBeJq" role="2Oq$k0">
+                  <node concept="2OqwBi" id="1PoRi1pBc5E" role="2Oq$k0">
+                    <node concept="2ShNRf" id="1PoRi1pB9Yy" role="2Oq$k0">
+                      <node concept="1pGfFk" id="1PoRi1pBbWD" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1PoRi1pBcfZ" role="2OqNvi">
+                      <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.parentNode(org.jetbrains.mps.openapi.model.SNode)" resolve="parentNode" />
+                      <node concept="2OqwBi" id="1PoRi1pBcQ_" role="37wK5m">
+                        <node concept="37vLTw" id="1PoRi1pBcGU" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+                        </node>
+                        <node concept="1mfA1w" id="1PoRi1pBeG3" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="1PoRi1pBePp" role="2OqNvi">
+                    <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
+                    <node concept="37vLTw" id="1PoRi1pBeYF" role="37wK5m">
+                      <ref role="3cqZAo" node="4FREEt6vhHF" resolve="replacementConcept" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="1PoRi1pBfj9" role="2OqNvi">
+                  <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.link(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="link" />
+                  <node concept="2OqwBi" id="1PoRi1pBfQT" role="37wK5m">
+                    <node concept="37vLTw" id="1PoRi1pBfM7" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+                    </node>
+                    <node concept="2NL2c5" id="1PoRi1pBfWj" role="2OqNvi" />
+                  </node>
                 </node>
-                <node concept="1mfA1w" id="4FREEt6vgac" role="2OqNvi" />
               </node>
-              <node concept="37vLTw" id="4FREEt6viIV" role="37wK5m">
-                <ref role="3cqZAo" node="4FREEt6vhHF" resolve="replacementConcept" />
+              <node concept="liA8E" id="1PoRi1pBgT_" role="2OqNvi">
+                <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.build()" resolve="build" />
               </node>
-              <node concept="2OqwBi" id="4FREEt6vgae" role="37wK5m">
-                <node concept="37vLTw" id="4FREEt6viun" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1PoRi1pBiqK" role="3cqZAp">
+          <node concept="3cpWsn" id="1PoRi1pBiqL" role="3cpWs9">
+            <property role="TrG5h" value="ancestorContext" />
+            <node concept="3uibUv" id="1PoRi1pBiqM" role="1tU5fm">
+              <ref role="3uigEE" to="pdwk:~CanBeAncestorContext" resolve="CanBeAncestorContext" />
+            </node>
+            <node concept="2OqwBi" id="4z0AnX4Iwxu" role="33vP2m">
+              <node concept="2OqwBi" id="1PoRi1pBle6" role="2Oq$k0">
+                <node concept="2OqwBi" id="1PoRi1pBkFK" role="2Oq$k0">
+                  <node concept="2OqwBi" id="1PoRi1pBjGB" role="2Oq$k0">
+                    <node concept="2ShNRf" id="1PoRi1pBj92" role="2Oq$k0">
+                      <node concept="1pGfFk" id="1PoRi1pBjx3" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1PoRi1pBjTR" role="2OqNvi">
+                      <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.parentNode(org.jetbrains.mps.openapi.model.SNode)" resolve="parentNode" />
+                      <node concept="2OqwBi" id="1PoRi1pBkuw" role="37wK5m">
+                        <node concept="37vLTw" id="1PoRi1pBkpx" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+                        </node>
+                        <node concept="1mfA1w" id="1PoRi1pBk_i" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="1PoRi1pBkOE" role="2OqNvi">
+                    <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
+                    <node concept="37vLTw" id="1PoRi1pBl0R" role="37wK5m">
+                      <ref role="3cqZAo" node="4FREEt6vhHF" resolve="replacementConcept" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="1PoRi1pBlvR" role="2OqNvi">
+                  <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.link(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="link" />
+                  <node concept="2OqwBi" id="1PoRi1pBmge" role="37wK5m">
+                    <node concept="37vLTw" id="1PoRi1pBm1K" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+                    </node>
+                    <node concept="2NL2c5" id="1PoRi1pBmwD" role="2OqNvi" />
+                  </node>
                 </node>
-                <node concept="2NL2c5" id="4FREEt6vgag" role="2OqNvi" />
               </node>
-              <node concept="10Nm6u" id="4FREEt6vgah" role="37wK5m" />
+              <node concept="liA8E" id="4z0AnX4IwPm" role="2OqNvi">
+                <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.build()" resolve="build" />
+              </node>
             </node>
-            <node concept="2YIFZM" id="4FREEt6vgai" role="3uHU7w">
-              <ref role="37wK5l" to="ykok:~ModelConstraints.canBeAncestor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SAbstractConcept,org.jetbrains.mps.openapi.language.SContainmentLink,jetbrains.mps.smodel.runtime.CheckingNodeContext)" resolve="canBeAncestor" />
-              <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-              <node concept="2OqwBi" id="4FREEt6vgaj" role="37wK5m">
-                <node concept="37vLTw" id="4FREEt6vifn" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="4FREEt6vhKg" role="3cqZAp">
+          <node concept="1Wc70l" id="4FREEt6vga8" role="3clFbG">
+            <node concept="2OqwBi" id="4z0AnX4IM1V" role="3uHU7B">
+              <node concept="2YIFZM" id="SAzYS3hF7Z" role="2Oq$k0">
+                <ref role="37wK5l" to="ykol:~ConstraintsCanBeFacade.checkCanBeChild(jetbrains.mps.core.aspects.constraints.rules.kinds.ContainmentContext)" resolve="checkCanBeChild" />
+                <ref role="1Pybhc" to="ykol:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
+                <node concept="37vLTw" id="1PoRi1pBh7a" role="37wK5m">
+                  <ref role="3cqZAo" node="SAzYS3hHlw" resolve="containmentContext" />
                 </node>
-                <node concept="1mfA1w" id="4FREEt6vgal" role="2OqNvi" />
               </node>
-              <node concept="37vLTw" id="4FREEt6viSb" role="37wK5m">
-                <ref role="3cqZAo" node="4FREEt6vhHF" resolve="replacementConcept" />
+              <node concept="liA8E" id="4z0AnX4INvt" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
-              <node concept="2OqwBi" id="4FREEt6vgan" role="37wK5m">
-                <node concept="37vLTw" id="4FREEt6vijt" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+            </node>
+            <node concept="2OqwBi" id="4z0AnX4IOPH" role="3uHU7w">
+              <node concept="2YIFZM" id="1PoRi1pBi85" role="2Oq$k0">
+                <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="4z0AnX4Ixzo" role="37wK5m">
+                  <ref role="3cqZAo" node="1PoRi1pBiqL" resolve="ancestorContext" />
                 </node>
-                <node concept="2NL2c5" id="4FREEt6vgap" role="2OqNvi" />
               </node>
-              <node concept="10Nm6u" id="4FREEt6vgaq" role="37wK5m" />
+              <node concept="liA8E" id="4z0AnX4IQqc" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 64885ea516..835d91b21a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -90,7 +90,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
@@ -113,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -152,7 +152,6 @@
       </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>
@@ -3130,7 +3129,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="org.iets3.core.expr.base.collections.stubs" />
         <property role="3LESm3" value="b76a0f63-5959-456b-993a-c796cc0d0c13" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="5khwDRKS3BU" role="3LF7KH">
           <ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
           <node concept="2Ry0Ak" id="5khwDRKS3GV" role="iGT6I">
@@ -4826,6 +4824,11 @@
             <ref role="1Busuk" node="5wLtKNeSRPD" resolve="org.iets3.core.expr.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4z0AnX6FA8Y" role="3bR37C">
+          <node concept="3bR9La" id="4z0AnX6FA8Z" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="ub9nkyRnyj" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7193,6 +7196,11 @@
             <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4z0AnX4Z6ON" role="3bR37C">
+          <node concept="3bR9La" id="4z0AnX4Z6OO" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="44TucI396gt" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10315,7 +10323,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="org.iets3.core.expr.genjava.functionalJava" />
         <property role="3LESm3" value="708a03ad-8699-43c9-821a-6cd00b68e9f8" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="26tZ$Z4rvHD" role="3LF7KH">
           <ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
           <node concept="2Ry0Ak" id="26tZ$Z4rwC$" role="iGT6I">
@@ -11091,6 +11098,18 @@
         <node concept="3LEDTy" id="6wzrxL2ZwhD" role="3LEDUa">
           <ref role="3LEDTV" node="6wzrxL2Zv5t" resolve="org.iets3.core.expr.genjava.data" />
         </node>
+        <node concept="3LEDTy" id="4z0AnX4Z6XI" role="3LEDUa">
+          <ref role="3LEDTV" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+        </node>
+        <node concept="3LEDTy" id="4z0AnX4Z6XJ" role="3LEDUa">
+          <ref role="3LEDTV" node="ub9nkyRnyj" resolve="org.iets3.core.expr.tests" />
+        </node>
+        <node concept="3LEDTy" id="4z0AnX4Z6XK" role="3LEDUa">
+          <ref role="3LEDTV" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+        </node>
+        <node concept="3LEDTy" id="4z0AnX4Z6XL" role="3LEDUa">
+          <ref role="3LEDTV" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+        </node>
       </node>
       <node concept="3LEwk6" id="j5CxBKa9ks" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13788,6 +13807,11 @@
           <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
         </node>
       </node>
+      <node concept="1SiIV0" id="4z0AnX4Z6B5" role="3bR37C">
+        <node concept="3bR9La" id="4z0AnX4Z6B6" role="1SiIV1">
+          <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
+        </node>
+      </node>
     </node>
     <node concept="2sgV4H" id="1YwzPHwBxon" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />

From 52926e99566fe3066670dd7e754537da3c421e14 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:44:06 +0100
Subject: [PATCH 05/19] Remove log4j call

---
 ...ore.expr.tests.generator.template.util.mps | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/org.iets3.core.expr.tests.generator.template.util.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/org.iets3.core.expr.tests.generator.template.util.mps
index ef997bd4b7..08a6a7e64f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/org.iets3.core.expr.tests.generator.template.util.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/org.iets3.core.expr.tests.generator.template.util.mps
@@ -7,8 +7,8 @@
   <imports>
     <import index="tpe3" ref="r:00000000-0000-4000-0000-011c895902d7(jetbrains.mps.baseLanguage.unitTest.structure)" />
     <import index="tpe5" ref="r:00000000-0000-4000-0000-011c895902d1(jetbrains.mps.baseLanguage.unitTest.behavior)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
     <import index="tp5o" ref="r:00000000-0000-4000-0000-011c89590380(jetbrains.mps.lang.test.behavior)" implicit="true" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -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>
@@ -82,7 +82,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" />
@@ -117,7 +117,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -169,17 +169,17 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7aH5t2gCbtb" role="3cqZAp">
-          <node concept="2OqwBi" id="7aH5t2gCbZ8" role="3clFbG">
-            <node concept="2YIFZM" id="7aH5t2gCbRh" role="2Oq$k0">
-              <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
-              <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-              <node concept="3VsKOn" id="7aH5t2gCbWc" role="37wK5m">
+        <node concept="3clFbF" id="4z0AnX5BR$y" role="3cqZAp">
+          <node concept="2OqwBi" id="4z0AnX5BRTQ" role="3clFbG">
+            <node concept="2YIFZM" id="4z0AnX5BRBS" role="2Oq$k0">
+              <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
+              <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+              <node concept="3VsKOn" id="4z0AnX5BRJf" role="37wK5m">
                 <ref role="3VsUkX" node="L0xQjiTXbn" resolve="TestsUtil" />
               </node>
             </node>
-            <node concept="liA8E" id="7aH5t2gCc9U" role="2OqNvi">
-              <ref role="37wK5l" to="q7tw:~Category.error(java.lang.Object)" resolve="error" />
+            <node concept="liA8E" id="4z0AnX5BS4F" role="2OqNvi">
+              <ref role="37wK5l" to="wwqx:~Logger.error(java.lang.String)" resolve="error" />
               <node concept="2YIFZM" id="7aH5t2gCcho" role="37wK5m">
                 <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />

From 3a3b41faaa08a425f8ec8944aafb332adf6b74a3 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 07:55:17 +0100
Subject: [PATCH 06/19] Run migrations

---
 .../org.iets3.opensource/.mps/migration.xml   |   4 +-
 .../CodeReviewPreferences/module.msd          |   5 +-
 ..._spreferences.TestExecutionPreferences.mps |   2 +-
 .../TestExecutionPreferences/module.msd       |   5 +-
 .../models/behavior.mps                       |  42 +-
 .../org.iets3.analysis.base/models/editor.mps |   6 +-
 .../models/intentions.mps                     |   4 +-
 .../org.iets3.analysis.base.migration.mps     |   2 +-
 .../org.iets3.analysis.base/models/plugin.mps |  56 +--
 .../models/structure.mps                      |   2 +-
 .../org.iets3.analysis.base.mpl               |   5 +-
 .../models/actions.mps                        |   2 +-
 .../models/behavior.mps                       | 138 ++---
 .../models/constraints.mps                    |  46 +-
 .../models/editor.mps                         | 130 ++---
 .../models/intentions.mps                     |  14 +-
 .../models/migration.mps                      |  58 +--
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  84 ++--
 .../org.iets3.components.core.mpl             |   6 +-
 .../org/iets3/components/plugin/plugin.mps    |  22 +-
 .../org.iets3.components.plugin.msd           |   7 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |   4 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.components.req.mpl              |   3 +-
 .../models/behavior.mps                       |  34 +-
 .../models/editor.mps                         |   6 +-
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.core.assessment.mpl             |   5 +-
 .../models/actions.mps                        |   4 +-
 .../models/behavior.mps                       |  52 +-
 .../models/editor.mps                         |  32 +-
 .../models/plugin.mps                         |  48 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.attributes.mpl             |   4 +-
 .../org.iets3.core.base/models/behavior.mps   |  38 +-
 .../models/constraints.mps                    |   2 +-
 .../org.iets3.core.base/models/editor.mps     |  36 +-
 .../org.iets3.core.base/models/intentions.mps |  24 +-
 .../org.iets3.core.base/models/plugin.mps     |  12 +-
 .../org.iets3.core.base/models/structure.mps  |   2 +-
 .../org.iets3.core.base/models/typesystem.mps |  24 +-
 .../org.iets3.core.base.mpl                   |   5 +-
 .../models/behavior.mps                       |  76 +--
 .../models/constraints.mps                    |  20 +-
 .../org.iets3.core.expr.adt/models/editor.mps |  34 +-
 .../models/intentions.mps                     |   4 +-
 .../org.iets3.core.expr.adt/models/plugin.mps |  18 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  14 +-
 .../org.iets3.core.expr.adt.mpl               |   5 +-
 .../models/actions.mps                        |   2 +-
 .../models/behavior.mps                       | 474 +++++++++---------
 .../models/constraints.mps                    |  18 +-
 .../models/editor.mps                         |  80 +--
 .../models/intentions.mps                     |  18 +-
 .../models/migration.mps                      |  22 +-
 .../models/plugin.mps                         |  96 ++--
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     | 114 ++---
 .../org.iets3.core.expr.base.mpl              |   7 +-
 .../models/actions.mps                        |   2 +-
 .../models/behavior.mps                       |  16 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  14 +-
 .../models/intentions.mps                     |   2 +-
 .../models/migration.mps                      |   2 +-
 .../models/plugin.mps                         |   4 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   6 +-
 .../org.iets3.core.expr.collections.mpl       |   3 +-
 .../org.iets3.core.expr.data.behavior.mps     |   6 +-
 .../org.iets3.core.expr.data.constraints.mps  |   2 +-
 .../org.iets3.core.expr.data.editor.mps       |  44 +-
 .../org.iets3.core.expr.data.migration.mps    |  26 +-
 .../org.iets3.core.expr.data.structure.mps    |   2 +-
 .../org.iets3.core.expr.data.typesystem.mps   |  42 +-
 .../org.iets3.core.expr.data.mpl              |   5 +-
 .../models/behavior.mps                       | 100 ++--
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |  64 +--
 .../models/intentions.mps                     |   4 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  18 +-
 .../org.iets3.core.expr.dataflow.mpl          |   3 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |  10 +-
 .../models/migration.mps                      |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.datetime.mpl          |   3 +-
 .../models/actions.mps                        |   2 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../org.iets3.core.expr.doc/models/editor.mps |  12 +-
 .../models/intentions.mps                     |  36 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.doc.mpl               |   3 +-
 ...iets3.core.expr.genjava.base@generator.mps |  60 +--
 .../org.iets3.core.expr.genjava.base.mpl      |   5 +-
 ....core.expr.genjava.contracts@generator.mps |  20 +-
 .../models/editor.mps                         |   4 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   2 +-
 .../org.iets3.core.expr.genjava.contracts.mpl |   5 +-
 ...ava.data.generator.templates@generator.mps |  16 +-
 .../org.iets3.core.expr.genjava.data.mpl      |   5 +-
 ...3.core.expr.genjava.datetime@generator.mps |   6 +-
 .../org.iets3.core.expr.genjava.datetime.mpl  |   5 +-
 ...3.core.expr.genjava.messages@generator.mps |  16 +-
 .../org.iets3.core.expr.genjava.messages.mpl  |   5 +-
 ...ore.expr.genjava.simpleTypes@generator.mps |  24 +-
 ...rg.iets3.core.expr.genjava.simpleTypes.mpl |   5 +-
 .../generator/template/main@generator.mps     |  10 +-
 .../models/editor.mps                         |   6 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   2 +-
 ....core.expr.genjava.stateMachineExample.mpl |   5 +-
 ...pr.genjava.stateMachineExample.runtime.mps |   6 +-
 ...pr.genjava.stateMachineExample.runtime.msd |   5 +-
 ...pr.genjava.stateMachineExample.sandbox.mps |   2 +-
 ...pr.genjava.stateMachineExample.sandbox.msd |   5 +-
 ...lidation.generator.templates@generator.mps |   6 +-
 ...ts3.core.expr.genjava.stringvalidation.mpl |   5 +-
 ...3.core.expr.genjava.temporal@generator.mps |   6 +-
 .../org.iets3.core.expr.genjava.temporal.mpl  |   5 +-
 ...ets3.core.expr.genjava.tests@generator.mps |  28 +-
 .../org.iets3.core.expr.genjava.tests.mpl     |   5 +-
 ...3.core.expr.genjava.toplevel@generator.mps |  72 +--
 .../org.iets3.core.expr.genjava.toplevel.mpl  |   5 +-
 ...iets3.core.expr.genjava.util@generator.mps |  42 +-
 .../models/editor.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.core.expr.genjava.util.mpl      |   5 +-
 .../models/behavior.mps                       | 118 ++---
 .../models/constraints.mps                    |  24 +-
 .../models/editor.mps                         |  18 +-
 .../models/intentions.mps                     |  30 +-
 .../models/migration.mps                      |   4 +-
 .../models/plugin.mps                         |  58 +--
 .../models/refactorings.mps                   |   4 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  58 +--
 .../org.iets3.core.expr.lambda.mpl            |   5 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |  54 +-
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.lookup.mpl            |   5 +-
 .../models/behavior.mps                       |  14 +-
 .../models/constraints.mps                    |  18 +-
 .../models/editor.mps                         |  38 +-
 .../models/plugin.mps                         |  30 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  56 +--
 .../org.iets3.core.expr.math.mpl              |   4 +-
 .../models/behavior.mps                       |  22 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  12 +-
 ...org.iets3.core.expr.messages.migration.mps |   2 +-
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.messages.mpl          |   5 +-
 .../models/behavior.mps                       |  28 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |   8 +-
 .../models/plugin.mps                         |  22 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.metafunction.mpl      |   5 +-
 .../models/behavior.mps                       |  14 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |  58 +--
 .../models/intentions.mps                     |   2 +-
 .../models/migration.mps                      |   2 +-
 .../models/plugin.mps                         |  36 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.mutable.mpl           |   3 +-
 .../models/behavior.mps                       |  14 +-
 .../models/constraints.mps                    |  20 +-
 .../models/editor.mps                         |  22 +-
 .../models/intentions.mps                     |   2 +-
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   2 +-
 .../org.iets3.core.expr.natlang.mpl           |   5 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |   6 +-
 .../models/plugin.mps                         |   6 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.path.mpl              |   5 +-
 .../org.iets3.core.expr.process.behavior.mps  |  26 +-
 ...rg.iets3.core.expr.process.constraints.mps |   4 +-
 .../org.iets3.core.expr.process.editor.mps    |   4 +-
 .../org.iets3.core.expr.process.structure.mps |   2 +-
 ...org.iets3.core.expr.process.typesystem.mps |   4 +-
 .../models/plugin.mps                         |  30 +-
 .../org.iets3.core.expr.process.mpl           |   5 +-
 .../org.iets3.core.expr.query.behavior.mps    |   6 +-
 .../org.iets3.core.expr.query.editor.mps      |   6 +-
 .../org.iets3.core.expr.query.intentions.mps  |   2 +-
 .../org.iets3.core.expr.query.structure.mps   |   2 +-
 .../org.iets3.core.expr.query.typesystem.mps  |   4 +-
 .../org.iets3.core.expr.query.mpl             |   3 +-
 .../generator/template/main@generator.mps     |   2 +-
 .../models/intentions.mps                     |  50 +-
 .../org/iets3/core/expr/repl/behavior.mps     |  94 ++--
 .../org/iets3/core/expr/repl/constraints.mps  |  60 +--
 .../org/iets3/core/expr/repl/editor.mps       |  28 +-
 .../org/iets3/core/expr/repl/structure.mps    |   2 +-
 .../org/iets3/core/expr/repl/typesystem.mps   |  14 +-
 .../models/plugin.mps                         |   8 +-
 .../org.iets3.core.expr.repl.mpl              |   7 +-
 .../models/behavior.mps                       |  14 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.core.expr.simpleTypes.tests.mpl |   3 +-
 .../models/behavior.mps                       |  10 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  16 +-
 .../models/intentions.mps                     |  24 +-
 .../models/migration.mps                      |   4 +-
 .../models/plugin.mps                         |  44 +-
 .../models/structure.mps                      |   2 +-
 .../models/textGen.mps                        |   2 +-
 .../models/typesystem.mps                     |  18 +-
 .../org.iets3.core.expr.simpleTypes.mpl       |   5 +-
 .../models/actions.mps                        |   2 +-
 .../models/behavior.mps                       |  50 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  26 +-
 .../models/intentions.mps                     |  42 +-
 .../models/plugin.mps                         |  66 +--
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.statemachines.mpl     |   3 +-
 ...s3.core.expr.stringvalidation.behavior.mps |  26 +-
 ...core.expr.stringvalidation.constraints.mps |   2 +-
 ...ets3.core.expr.stringvalidation.editor.mps |  10 +-
 ...3.core.expr.stringvalidation.structure.mps |   2 +-
 ....core.expr.stringvalidation.typesystem.mps |   4 +-
 .../org.iets3.core.expr.stringvalidation.mpl  |   3 +-
 .../models/actions.mps                        |   4 +-
 .../models/behavior.mps                       |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../models/editor.mps                         |  10 +-
 .../models/intentions.mps                     |   2 +-
 ...org.iets3.core.expr.temporal.migration.mps |   2 +-
 .../models/plugin.mps                         |  24 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  26 +-
 .../org.iets3.core.expr.temporal.mpl          |   5 +-
 .../models/behavior.mps                       |   4 +-
 .../models/plugin.mps                         |   4 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.core.expr.testExecution.mpl     |   5 +-
 .../generator/template/main@generator.mps     |  10 +-
 .../models/behavior.mps                       | 212 ++++----
 .../models/constraints.mps                    |  18 +-
 .../models/editor.mps                         |  78 +--
 .../models/findUsages.mps                     |  12 +-
 .../models/intentions.mps                     |  50 +-
 .../models/migration.mps                      |  20 +-
 .../models/plugin.mps                         |  10 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../org.iets3.core.expr.tests.mpl             |   7 +-
 .../models/intentions.mps                     |   4 +-
 .../models/listeners.mps                      |  14 +-
 .../org/iets3/core/expr/toplevel/actions.mps  |   2 +-
 .../org/iets3/core/expr/toplevel/behavior.mps | 298 +++++------
 .../iets3/core/expr/toplevel/constraints.mps  |  54 +-
 .../org/iets3/core/expr/toplevel/editor.mps   |  38 +-
 .../org/iets3/core/expr/toplevel/plugin.mps   |  24 +-
 .../iets3/core/expr/toplevel/structure.mps    |   2 +-
 .../iets3/core/expr/toplevel/typesystem.mps   |  56 +--
 .../org.iets3.core.expr.toplevel.mpl          |   6 +-
 .../models/editor.mps                         |  18 +-
 .../models/structure.mps                      |   2 +-
 .../models/util.mps                           |   6 +-
 .../org.iets3.core.expr.tracing.mpl           |   5 +-
 ...dingtime.generator.templates@generator.mps |   2 +-
 ...ore.expr.typetags.bindingtime.behavior.mps |   6 +-
 ....core.expr.typetags.bindingtime.editor.mps |   8 +-
 ...re.expr.typetags.bindingtime.structure.mps |   2 +-
 ...e.expr.typetags.bindingtime.typesystem.mps |   4 +-
 ...g.iets3.core.expr.typetags.bindingtime.mpl |   5 +-
 .../generator/template/main@generator.mps     |   2 +-
 .../iets3/core/expr/typetags/lib/behavior.mps |   6 +-
 .../iets3/core/expr/typetags/lib/editor.mps   |   2 +-
 .../iets3/core/expr/typetags/lib/plugin.mps   |   2 +-
 .../core/expr/typetags/lib/structure.mps      |   2 +-
 .../core/expr/typetags/lib/typesystem.mps     |  12 +-
 .../org.iets3.core.expr.typetags.lib.mpl      |   7 +-
 ....expr.typetags.units.quantity.behavior.mps |  14 +-
 ...re.expr.typetags.units.quantity.editor.mps |  20 +-
 ...expr.typetags.units.quantity.structure.mps |   2 +-
 ...xpr.typetags.units.quantity.typesystem.mps |   6 +-
 ...ets3.core.expr.typetags.units.quantity.mpl |   3 +-
 .../models/behavior.mps                       |  84 ++--
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  22 +-
 .../models/intentions.mps                     |   2 +-
 ...ts3.core.expr.typetags.units.migration.mps |  82 +--
 ....iets3.core.expr.typetags.units.plugin.mps |  60 +--
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  64 +--
 .../org.iets3.core.expr.typetags.units.mpl    |   5 +-
 .../generator/template/main@generator.mps     |   2 +-
 .../org/iets3/core/expr/typetags/behavior.mps |  22 +-
 .../iets3/core/expr/typetags/constraints.mps  |   2 +-
 .../org/iets3/core/expr/typetags/editor.mps   |  26 +-
 .../iets3/core/expr/typetags/structure.mps    |   2 +-
 .../iets3/core/expr/typetags/typesystem.mps   |  10 +-
 .../org.iets3.core.expr.typetags.mpl          |   5 +-
 .../models/behavior.mps                       | 122 ++---
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         | 100 ++--
 .../models/intentions.mps                     |  94 ++--
 .../models/migration.mps                      |   2 +-
 .../models/plugin.mps                         |   2 +-
 .../models/structure.mps                      |   2 +-
 .../models/typesystem.mps                     |  46 +-
 .../org.iets3.core.expr.util.mpl              |   5 +-
 .../models/org/iets3/core/plugin/plugin.mps   |  54 +-
 .../org.iets3.core.plugin.msd                 |   7 +-
 .../org/iets3/core/trace/test/behavior.mps    |   6 +-
 .../org/iets3/core/trace/test/structure.mps   |   2 +-
 .../org.iets3.core.trace.test.mpl             |   3 +-
 .../org.iets3.core.trace/models/behavior.mps  |   6 +-
 .../models/constraints.mps                    |   2 +-
 .../models/findUsages.mps                     |  12 +-
 .../org.iets3.core.trace/models/plugin.mps    |  60 +--
 .../org.iets3.core.trace/models/structure.mps |   2 +-
 .../org.iets3.core.trace.mpl                  |   5 +-
 .../org.iets3.core.users/models/behavior.mps  |   8 +-
 .../org.iets3.core.users/models/editor.mps    |   8 +-
 .../org.iets3.core.users/models/structure.mps |   2 +-
 .../models/typesystem.mps                     |  16 +-
 .../org.iets3.core.users.mpl                  |   3 +-
 .../org.iets3.glossary/models/behavior.mps    |   6 +-
 .../org.iets3.glossary/models/constraints.mps |   2 +-
 .../org.iets3.glossary/models/editor.mps      |  14 +-
 .../org.iets3.glossary/models/intentions.mps  |   4 +-
 .../org.iets3.glossary/models/structure.mps   |   2 +-
 .../org.iets3.glossary/models/typesystem.mps  |  14 +-
 .../org.iets3.glossary/org.iets3.glossary.mpl |   3 +-
 .../generator/template/main@generator.mps     |  46 +-
 .../models/behavior.mps                       |   6 +-
 .../models/structure.mps                      |   2 +-
 .../org.iets3.opensource.build.gentests.mpl   |   5 +-
 .../org.iets3.req.core/models/behavior.mps    |   6 +-
 .../org.iets3.req.core/models/constraints.mps |   2 +-
 .../org.iets3.req.core/models/editor.mps      |  58 +--
 .../org.iets3.req.core/models/intentions.mps  |   4 +-
 .../org.iets3.req.core/models/structure.mps   |   2 +-
 .../org.iets3.req.core/org.iets3.req.core.mpl |   3 +-
 .../models/org/iets3/req/plugin/plugin.mps    |  74 +--
 .../org.iets3.req.plugin.msd                  |   7 +-
 .../models/behavior.mps                       |   4 +-
 .../models/editor.mps                         |  12 +-
 .../models/structure.mps                      |   2 +-
 .../test.iest3.component.attribute.mpl        |   3 +-
 ...t.ts.expr.os.validNameConcept.behavior.mps |   4 +-
 ....ts.expr.os.validNameConcept.structure.mps |   2 +-
 .../test.ts.expr.os.validNameConcept.mpl      |   3 +-
 .../models/plugin.mps                         |   4 +-
 .../org.iets3.components.core.interpreter.msd |   5 +-
 .../models/adapter.mps                        |   6 +-
 .../org.iets3.components.core.sandbox.msd     |   5 +-
 .../models/plugin.mps                         |   6 +-
 .../org.iets3.core.expr.adt.interpreter.msd   |   5 +-
 ...iets3.core.expr.base.collections.stubs.msd |   7 +-
 .../models/plugin.mps                         |  28 +-
 .../org.iets3.core.expr.base.interpreter.msd  |   5 +-
 .../models/runtime.mps                        |  54 +-
 .../org.iets3.core.expr.base.runtime.msd      |   5 +-
 ...rg.iets3.core.expr.base.shared.runtime.mps |   6 +-
 ...rg.iets3.core.expr.base.shared.runtime.msd |   3 +-
 .../models/plugin.mps                         |  32 +-
 ...ets3.core.expr.collections.interpreter.msd |   5 +-
 .../org.iets3.core.expr.collections.rt.rt.mps |   8 +-
 .../org.iets3.core.expr.collections.rt.msd    |   5 +-
 ...ets3.core.expr.data.interpreter.plugin.mps |  34 +-
 .../org.iets3.core.expr.data.interpreter.msd  |   5 +-
 .../models/plugin.mps                         |  34 +-
 ...g.iets3.core.expr.dataflow.interpreter.msd |   5 +-
 .../models/plugin.mps                         |  20 +-
 ...g.iets3.core.expr.datetime.interpreter.msd |   5 +-
 .../org.iets3.core.expr.datetime.runtime.mps  |  10 +-
 .../org.iets3.core.expr.datetime.runtime.msd  |   5 +-
 .../models/plugin.mps                         |  22 +-
 .../org.iets3.core.expr.doc.plugin.msd        |   7 +-
 .../models/genplan.mps                        | 117 +++--
 ...a.advanced.genplan.interpreter_genplan.mps | 307 +++++++-----
 ...anced.genplan.java_interpreter_genplan.mps |   4 +-
 ...ts3.core.expr.genjava.advanced.genplan.msd |   7 +-
 .../models/rt.mps                             |   8 +-
 .../org.iets3.core.expr.genjava.base.rt.msd   |   5 +-
 .../models/interpreter_genplan.mps            | 287 ++++++-----
 .../models/java_genplan.mps                   |  73 ++-
 .../models/java_interpreter_genplan.mps       |   4 +-
 ...g.iets3.core.expr.genjava.core.genplan.msd |   7 +-
 ...iets3.core.expr.genjava.functionalJava.msd |   7 +-
 .../models/rt.mps                             |   8 +-
 ...rg.iets3.core.expr.genjava.messages.rt.msd |   3 +-
 ...pr.genjava.stateMachineExample.genplan.mps |  49 +-
 ...pr.genjava.stateMachineExample.genplan.msd |   7 +-
 .../models/runtime.mps                        |  20 +-
 ...rg.iets3.core.expr.genjava.temporal.rt.msd |   5 +-
 ...rg.iets3.core.expr.genjava.tests.rt.rt.mps |   6 +-
 .../org.iets3.core.expr.genjava.tests.rt.msd  |   5 +-
 .../models/rt.mps                             |   6 +-
 ...rg.iets3.core.expr.genjava.toplevel.rt.msd |   5 +-
 .../models/plugin.mps                         |  14 +-
 ...org.iets3.core.expr.lambda.interpreter.msd |   5 +-
 .../iets3/core/expr/lambda/plugin/plugin.mps  |   4 +-
 .../org.iets3.core.expr.lambda.plugin.msd     |   5 +-
 .../models/plugin.mps                         |  18 +-
 ...org.iets3.core.expr.lookup.interpreter.msd |   5 +-
 .../models/plugin.mps                         |  10 +-
 .../org.iets3.core.expr.math.interpreter.msd  |   5 +-
 .../models/plugin.mps                         |   6 +-
 ...g.iets3.core.expr.messages.interpreter.msd |   5 +-
 .../models/plugin.mps                         |   4 +-
 ...ts3.core.expr.metafunction.interpreter.msd |   5 +-
 .../models/plugin.mps                         |  20 +-
 ...rg.iets3.core.expr.mutable.interpreter.msd |   5 +-
 .../models/plugin.mps                         |   6 +-
 ...rg.iets3.core.expr.natlang.interpreter.msd |   5 +-
 .../models/plugin.mps                         |   6 +-
 .../org.iets3.core.expr.path.interpreter.msd  |   5 +-
 .../models/plugin.mps                         |  88 ++--
 .../org.iets3.core.expr.plugin.msd            |   8 +-
 .../models/plugin.mps                         |   6 +-
 ...rg.iets3.core.expr.process.interpreter.msd |   5 +-
 ...ts3.core.expr.query.interpreter.plugin.mps |   6 +-
 .../org.iets3.core.expr.query.interpreter.msd |   5 +-
 .../models/plugin.mps                         |  14 +-
 .../org.iets3.core.expr.repl.interpreter.msd  |   5 +-
 .../iets3/core/expr/repl/plugin/plugin.mps    |  33 +-
 .../org.iets3.core.expr.repl.plugin.msd       |   7 +-
 .../models/plugin.mps                         |   6 +-
 ...ets3.core.expr.simpleTypes.interpreter.msd |   5 +-
 ...rg.iets3.core.expr.simpleTypes.runtime.mps |   8 +-
 ...rg.iets3.core.expr.simpleTypes.runtime.msd |   5 +-
 .../models/plugin.mps                         |   6 +-
 ...s3.core.expr.statemachines.interpreter.msd |   5 +-
 ...pr.stringvalidation.interpreter.plugin.mps |  14 +-
 ...core.expr.stringvalidation.interpreter.msd |   5 +-
 ....expr.stringvalidation.runtime.runtime.mps |  34 +-
 ...ts3.core.expr.stringvalidation.runtime.msd |   5 +-
 .../models/plugin.mps                         |   6 +-
 ...g.iets3.core.expr.temporal.interpreter.msd |   5 +-
 .../org.iets3.core.expr.temporal.runtime.mps  |   8 +-
 .../org.iets3.core.expr.temporal.runtime.msd  |   3 +-
 .../models/plugin.mps                         |   6 +-
 .../org.iets3.core.expr.tests.interpreter.msd |   5 +-
 .../models/runtime.mps                        |   8 +-
 .../org.iets3.core.expr.tests.rt.msd          |   5 +-
 .../models/plugin.mps                         |  14 +-
 ...g.iets3.core.expr.toplevel.interpreter.msd |   5 +-
 .../models/plugin.mps                         |   6 +-
 ...ts3.core.expr.typetags.lib.interpreter.msd |   5 +-
 ...expr.typetags.units.interpreter.plugin.mps |   8 +-
 ...3.core.expr.typetags.units.interpreter.msd |   7 +-
 .../models/units.mps                          |   2 +-
 .../org.iets3.core.expr.typetags.units.si.msd |   5 +-
 .../models/plugin.mps                         |  86 ++--
 .../org.iets3.core.expr.util.interpreter.msd  |   5 +-
 .../opensource/allScripts/build/build.mps     |   4 +-
 .../org.iets3.opensource.allScripts.build.msd |   3 +-
 ...org.iets3.opensource.build.gentests.rt.mps |   6 +-
 ...org.iets3.opensource.build.gentests.rt.msd |   7 +-
 .../org.iets3.opensource.build.msd            |   3 +-
 .../models/org.iets3.opensource.linters.mps   |  52 +-
 .../org.iets3.opensource.linters.msd          |   5 +-
 .../solutions/playground/models/m1.mps        |  14 +-
 .../models/playground.bindingtimes.mps        |   6 +-
 .../models/playground.priorisationInCC.mps    |  10 +-
 .../solutions/playground/models/sheets.mps    |  12 +-
 .../solutions/playground/models/wgld.mps      |   8 +-
 .../solutions/playground/playground.msd       |   5 +-
 .../models/messages@tests.mps                 |  16 +-
 .../test.ex.core.expr.genjava.msd             |   5 +-
 .../test/iets3/core/tracequery/input1.mps     |  12 +-
 .../test/iets3/core/tracequery/input2.mps     |  10 +-
 .../core/tracequery/tracequery@tests.mps      |  14 +-
 .../test.iets3.core.tracequery.msd            |   5 +-
 .../models/tests@tests.mps                    |   2 +-
 .../test.org.iets3.core.comments.msd          |   5 +-
 .../models/tests@tests.mps                    |  14 +-
 .../test.ts.components.core.msd               |   5 +-
 .../models/algebraic@tests.mps                |  20 +-
 .../test.in.expr.os/models/dataflow@tests.mps |  10 +-
 .../test.in.expr.os/models/datetime@tests.mps |   8 +-
 .../test.in.expr.os/models/math@tests.mps     |  14 +-
 .../test.in.expr.os/models/messages@tests.mps |  16 +-
 .../test.in.expr.os/models/mutable@tests.mps  |  28 +-
 .../models/operatorgroup@tests.mps            |   4 +-
 .../models/statemachines@tests.mps            |   2 +-
 .../test.in.expr.os/models/temporal@tests.mps |  26 +-
 .../models/test.in.expr.os.alt@tests.mps      |  16 +-
 ...t.in.expr.os.applicationExamples@tests.mps |  16 +-
 .../models/test.in.expr.os.base@tests.mps     |  20 +-
 .../test.in.expr.os.collections@tests.mps     |  28 +-
 .../test.in.expr.os.contracts@tests.mps       |  18 +-
 .../models/test.in.expr.os.coverage@tests.mps |   2 +-
 .../test.in.expr.os.datatable@tests.mps       |   6 +-
 .../test.in.expr.os.datatablegen@tests.mps    |   2 +-
 .../models/test.in.expr.os.dectabs@tests.mps  |  14 +-
 .../models/test.in.expr.os.enums@tests.mps    |  14 +-
 .../models/test.in.expr.os.error@tests.mps    |  16 +-
 .../test.in.expr.os.functions@tests.mps       |  16 +-
 .../test.in.expr.os.ignoredTests@tests.mps    |   2 +-
 .../models/test.in.expr.os.lambda@tests.mps   |  20 +-
 .../test.in.expr.os.lookuptable@tests.mps     |   2 +-
 .../models/test.in.expr.os.nix@tests.mps      |   6 +-
 .../models/test.in.expr.os.numbers@tests.mps  |  12 +-
 .../models/test.in.expr.os.options@tests.mps  |  18 +-
 .../models/test.in.expr.os.query@tests.mps    |  10 +-
 .../models/test.in.expr.os.records@tests.mps  |  18 +-
 .../models/test.in.expr.os.strings@tests.mps  |   4 +-
 ...test.in.expr.os.stringvalidation@tests.mps |  12 +-
 .../models/test.in.expr.os.tests@tests.mps    |  10 +-
 .../test.in.expr.os.tolerance@tests.mps       |   4 +-
 .../models/test.in.expr.os.tuples@tests.mps   |   6 +-
 .../models/test.in.expr.os.typedefs@tests.mps |  20 +-
 .../test.in.expr.os/models/todo@tests.mps     |  28 +-
 .../test.in.expr.os/models/utils@tests.mps    |  18 +-
 .../tests/test.in.expr.os/test.in.expr.os.msd |   5 +-
 ...st.ts.expr.os.IValidNamedConcept@tests.mps |  10 +-
 ....ts.expr.os.LeastCommonSuperType@tests.mps |  14 +-
 .../models/test.ts.expr.os.base@tests.mps     |   4 +-
 .../test.ts.expr.os.bindingtimes@tests.mps    |   8 +-
 .../models/test.ts.expr.os.plugin.mps         |  10 +-
 .../models/test.ts.expr.os.records@tests.mps  |   6 +-
 .../models/test.ts.expr.os.temporal@tests.mps |  12 +-
 .../models/test/ts/expr/os/m1@tests.mps       |  34 +-
 .../test.ts.expr.os/models/typetags@tests.mps |  18 +-
 .../models/unitsonly@tests.mps                |  40 +-
 .../tests/test.ts.expr.os/test.ts.expr.os.msd |   7 +-
 554 files changed, 4886 insertions(+), 4817 deletions(-)

diff --git a/code/languages/org.iets3.opensource/.mps/migration.xml b/code/languages/org.iets3.opensource/.mps/migration.xml
index eaae3e276b..5dc30689bf 100644
--- a/code/languages/org.iets3.opensource/.mps/migration.xml
+++ b/code/languages/org.iets3.opensource/.mps/migration.xml
@@ -19,8 +19,10 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd b/code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd
index 345a4267c9..8691b3009d 100644
--- a/code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#org.iets3.core.__spreferences.CodeReviewPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.__spreferences.CodeReviewPreferences" uuid="~_PreferencesModule#org.iets3.core.__spreferences.CodeReviewPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
@@ -21,7 +20,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps b/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps
index e03ac94d51..94fbdd4539 100644
--- a/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps
+++ b/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps
@@ -7,7 +7,7 @@
   <imports />
   <registry>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd b/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd
index 327bbce3cd..cf975f2a07 100644
--- a/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd
+++ b/code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.__spreferences.TestExecutionPreferences" uuid="~_PreferencesModule#org.iets3.opensource.__spreferences.TestExecutionPreferences" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.opensource.__spreferences.TestExecutionPreferences" uuid="~_PreferencesModule#org.iets3.opensource.__spreferences.TestExecutionPreferences" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -20,7 +19,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
index c853ace129..d7f14e170d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
@@ -55,7 +55,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -162,7 +162,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
         <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">
@@ -201,6 +201,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" />
@@ -307,7 +308,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>
@@ -323,7 +324,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="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" />
@@ -887,7 +887,7 @@
                                 <node concept="10Nm6u" id="4bUWUHuPNK" role="3uHU7w" />
                                 <node concept="2OqwBi" id="4bUWUHuPNL" role="3uHU7B">
                                   <node concept="37vLTw" id="4bUWUHuPNM" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4bUWUHuPNP" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8170u" />
                                   </node>
                                   <node concept="3CFZ6_" id="4bUWUHuPNN" role="2OqNvi">
                                     <node concept="3CFYIy" id="4bUWUHuPNO" role="3CFYIz">
@@ -898,9 +898,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4bUWUHuPNP" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8170u" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4bUWUHuPNQ" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8170v" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -911,7 +911,7 @@
                           <node concept="3clFbF" id="4bUWUHuPNU" role="3cqZAp">
                             <node concept="2OqwBi" id="4bUWUHuPNV" role="3clFbG">
                               <node concept="37vLTw" id="4bUWUHuPNW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4bUWUHuPNZ" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8170w" />
                               </node>
                               <node concept="3CFZ6_" id="4bUWUHuPNX" role="2OqNvi">
                                 <node concept="3CFYIy" id="4bUWUHuPNY" role="3CFYIz">
@@ -921,9 +921,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4bUWUHuPNZ" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8170w" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4bUWUHuPO0" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8170x" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1079,7 +1079,7 @@
                                   <node concept="2OqwBi" id="2ZalWa8J0A9" role="3uHU7B">
                                     <node concept="2OqwBi" id="2ZalWa8IZPh" role="2Oq$k0">
                                       <node concept="37vLTw" id="2ZalWa8IZ$Y" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2ZalWa8ITQs" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8170y" />
                                       </node>
                                       <node concept="3CFZ6_" id="2ZalWa8J05z" role="2OqNvi">
                                         <node concept="3CFYIy" id="2ZalWa8J0fY" role="3CFYIz">
@@ -1095,7 +1095,7 @@
                                 <node concept="3y3z36" id="2ZalWa8IVcD" role="3uHU7B">
                                   <node concept="2OqwBi" id="2ZalWa8IUg3" role="3uHU7B">
                                     <node concept="37vLTw" id="2ZalWa8IU0l" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2ZalWa8ITQs" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8170y" />
                                     </node>
                                     <node concept="3CFZ6_" id="2ZalWa8IUtL" role="2OqNvi">
                                       <node concept="3CFYIy" id="2ZalWa8IUEI" role="3CFYIz">
@@ -1108,9 +1108,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2ZalWa8ITQs" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8170y" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2ZalWa8ITQt" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8170z" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1121,7 +1121,7 @@
                           <node concept="3clFbF" id="2ZalWa8IWsH" role="3cqZAp">
                             <node concept="2OqwBi" id="2ZalWa8IWHg" role="3clFbG">
                               <node concept="37vLTw" id="2ZalWa8IWsG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2ZalWa8IWgt" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8170$" />
                               </node>
                               <node concept="3CFZ6_" id="2ZalWa8IWWN" role="2OqNvi">
                                 <node concept="3CFYIy" id="2ZalWa8IX7j" role="3CFYIz">
@@ -1131,9 +1131,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ZalWa8IWgt" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8170$" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ZalWa8IWgu" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8170_" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1591,7 +1591,7 @@
                     <node concept="3clFbF" id="XhdFKw2TSS" role="3cqZAp">
                       <node concept="2OqwBi" id="XhdFKw2U3M" role="3clFbG">
                         <node concept="37vLTw" id="XhdFKw2TSR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="XhdFKw2TOD" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8170A" />
                         </node>
                         <node concept="3TrcHB" id="XhdFKw2Uhn" role="2OqNvi">
                           <ref role="3TsBF5" to="l80j:XhdFKvXSNs" resolve="msg" />
@@ -1599,9 +1599,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="XhdFKw2TOD" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8170A" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="XhdFKw2TOE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8170B" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
index 12d08276a6..3d7310d3fa 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
@@ -68,7 +68,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" />
@@ -120,7 +120,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -142,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps
index 722cf47b00..3123cdfdf4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps
@@ -75,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>
@@ -144,7 +144,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.iets3.opensource/languages/org.iets3.analysis.base/models/org.iets3.analysis.base.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/org.iets3.analysis.base.migration.mps
index 0271229ca5..53521fe078 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/org.iets3.analysis.base.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/org.iets3.analysis.base.migration.mps
@@ -12,7 +12,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
index 49bea793ac..8c70c26a9b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
@@ -2,12 +2,12 @@
 <model ref="r:d354209e-0bea-497f-b905-d66f72900fa8(org.iets3.analysis.base.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
     <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="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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
@@ -24,7 +24,7 @@
     <import index="juu2" ref="r:197c9a7f-bef3-4d38-a48a-51524151fecf(org.iets3.core.base.plugin)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="9sez" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:org.apache.commons.collections4(de.q60.mps.libs/)" />
+    <import index="9sez" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:org.apache.commons.collections4(de.q60.mps.collections.libs/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -33,7 +33,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
-    <import index="gyfg" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.base(de.q60.mps.libs/)" />
+    <import index="gyfg" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.base(de.q60.mps.collections.libs/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
@@ -57,7 +57,7 @@
     <import index="9w4s" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util(MPS.IDEA/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="dzyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.time.temporal(JDK/)" />
-    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.libs/)" />
+    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.collections.libs/)" />
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
@@ -408,6 +408,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" />
@@ -570,7 +571,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -1024,7 +1024,7 @@
                               <ref role="2pJxcJ" to="l80j:XhdFKvXSNs" resolve="msg" />
                               <node concept="WxPPo" id="uuJ7IpZtu8" role="28ntcv">
                                 <node concept="37vLTw" id="rj7uJEnjLr" role="WxPPp">
-                                  <ref role="3cqZAo" node="rj7uJEnjLs" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8170C" />
                                 </node>
                               </node>
                             </node>
@@ -1032,9 +1032,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="rj7uJEnjLs" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8170C" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="rj7uJEnjLt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8170D" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1359,7 +1359,7 @@
                             <node concept="3cpWs3" id="1kfQzZFABkd" role="37wK5m">
                               <node concept="2OqwBi" id="1kfQzZFABnW" role="3uHU7w">
                                 <node concept="37vLTw" id="1kfQzZFABkr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1kfQzZFAAOO" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8170E" />
                                 </node>
                                 <node concept="2qgKlT" id="1kfQzZFABt0" role="2OqNvi">
                                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1373,9 +1373,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1kfQzZFAAOO" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8170E" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1kfQzZFAAOP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8170F" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3068,7 +3068,7 @@
                                     <node concept="3fqX7Q" id="5BRQP3Ri6nE" role="3clFbG">
                                       <node concept="2OqwBi" id="5BRQP3Ri6nF" role="3fr31v">
                                         <node concept="37vLTw" id="5BRQP3Ri6nG" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5BRQP3Ri6nI" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8170G" />
                                         </node>
                                         <node concept="liA8E" id="5BRQP3Ri6nH" role="2OqNvi">
                                           <ref role="37wK5l" to="gdgh:5zG5$Lyex2e" resolve="isOk" />
@@ -3077,9 +3077,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5BRQP3Ri6nI" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8170G" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5BRQP3Ri6nJ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8170H" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3091,14 +3091,14 @@
                                   <node concept="1rXfSq" id="5BRQP3Ri6nO" role="3clFbG">
                                     <ref role="37wK5l" node="6QuUnma$l2x" resolve="messageOf" />
                                     <node concept="37vLTw" id="5BRQP3Ri6nP" role="37wK5m">
-                                      <ref role="3cqZAo" node="5BRQP3Ri6nQ" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8170I" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5BRQP3Ri6nQ" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8170I" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5BRQP3Ri6nR" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8170J" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4819,7 +4819,7 @@
                               </node>
                             </node>
                             <node concept="37vLTw" id="3NwcubmjYQE" role="37wK5m">
-                              <ref role="3cqZAo" node="3NwcubmjYQG" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8170K" />
                             </node>
                             <node concept="37vLTw" id="3NwcubmjYQF" role="37wK5m">
                               <ref role="3cqZAo" node="3NwcubmjYQs" resolve="errorMessage" />
@@ -4828,9 +4828,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3NwcubmjYQG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8170K" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3NwcubmjYQH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8170L" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5238,7 +5238,7 @@
                             <node concept="3y3z36" id="4fQRPNhf0YQ" role="3uHU7B">
                               <node concept="2OqwBi" id="4fQRPNheYI1" role="3uHU7B">
                                 <node concept="37vLTw" id="4fQRPNheYjW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4fQRPNheXGq" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8170M" />
                                 </node>
                                 <node concept="2OwXpG" id="4fQRPNhf0wm" role="2OqNvi">
                                   <ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
@@ -5250,7 +5250,7 @@
                               <node concept="10Nm6u" id="2SyD3e2oUXX" role="3uHU7w" />
                               <node concept="2OqwBi" id="2SyD3e2oROp" role="3uHU7B">
                                 <node concept="37vLTw" id="2SyD3e2oRly" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4fQRPNheXGq" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8170M" />
                                 </node>
                                 <node concept="2OwXpG" id="2SyD3e2oTkN" role="2OqNvi">
                                   <ref role="2Oxat5" node="2f_Mi5n99G5" resolve="type" />
@@ -5260,9 +5260,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4fQRPNheXGq" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8170M" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4fQRPNheXGr" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8170N" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5274,14 +5274,14 @@
                         <node concept="1rXfSq" id="1ukHH8$vbXu" role="3clFbG">
                           <ref role="37wK5l" node="2f_Mi5ndzsh" resolve="toHighlighterMessage" />
                           <node concept="37vLTw" id="1ukHH8$vcFP" role="37wK5m">
-                            <ref role="3cqZAo" node="1ukHH8$vaHs" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8170O" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1ukHH8$vaHs" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8170O" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1ukHH8$vaHt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8170P" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/structure.mps
index 838a00ac8f..a3bde6acfe 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/structure.mps
@@ -63,7 +63,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.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl
index b34e31e50f..c13715b8a9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -31,7 +30,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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" />
@@ -60,7 +59,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/actions.mps
index 42d215f284..f6ad2be177 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/actions.mps
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
index 8d962d5b55..6852a8243a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
@@ -98,7 +98,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="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
@@ -213,7 +213,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -236,7 +236,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">
@@ -274,6 +274,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -421,7 +422,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>
@@ -470,7 +471,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -559,7 +559,7 @@
                           <ref role="cht4Q" to="w9y2:6LfBX8Yivpj" resolve="IComponentsChunkContent" />
                         </node>
                         <node concept="37vLTw" id="5kXA14n1pUv" role="1m5AlR">
-                          <ref role="3cqZAo" node="5kXA14n1pRF" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8170Q" />
                         </node>
                       </node>
                       <node concept="3TrcHB" id="5kXA14n1qjG" role="2OqNvi">
@@ -568,9 +568,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5kXA14n1pRF" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8170Q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5kXA14n1pRG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8170R" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -756,7 +756,7 @@
                           <node concept="3clFbF" id="7Zvsa54vqrg" role="3cqZAp">
                             <node concept="2OqwBi" id="7Zvsa54vqwK" role="3clFbG">
                               <node concept="37vLTw" id="7Zvsa54vqrf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7Zvsa54vqnF" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8170S" />
                               </node>
                               <node concept="2qgKlT" id="7Zvsa54vqDQ" role="2OqNvi">
                                 <ref role="37wK5l" node="7Zvsa54vnYI" resolve="allContents" />
@@ -764,9 +764,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Zvsa54vqnF" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8170S" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Zvsa54vqnG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8170T" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1403,7 +1403,7 @@
                           <node concept="3clFbF" id="siw10FnrMW" role="3cqZAp">
                             <node concept="2OqwBi" id="siw10FnrMX" role="3clFbG">
                               <node concept="37vLTw" id="siw10FnrMY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="siw10FnrN0" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8170U" />
                               </node>
                               <node concept="2qgKlT" id="siw10FnrMZ" role="2OqNvi">
                                 <ref role="37wK5l" node="siw10FnrMt" resolve="allSubstructure" />
@@ -1411,9 +1411,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="siw10FnrN0" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8170U" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="siw10FnrN1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8170V" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1517,7 +1517,7 @@
                           <node concept="2OqwBi" id="JbnHRlSPoy" role="3clFbG">
                             <node concept="2OqwBi" id="JbnHRlSPo$" role="2Oq$k0">
                               <node concept="37vLTw" id="JbnHRlSPo_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="JbnHRlSPoD" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8170W" />
                               </node>
                               <node concept="2qgKlT" id="3PhTX5bGUk6" role="2OqNvi">
                                 <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -1529,9 +1529,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="JbnHRlSPoD" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8170W" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="JbnHRlSPoE" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8170X" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1629,7 +1629,7 @@
                       <node concept="3clFbF" id="3PhTX5bHqSr" role="3cqZAp">
                         <node concept="2OqwBi" id="3PhTX5bHtf8" role="3clFbG">
                           <node concept="37vLTw" id="3PhTX5bHqSq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3PhTX5bHmvG" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8170Y" />
                           </node>
                           <node concept="2qgKlT" id="3PhTX5bHxGb" role="2OqNvi">
                             <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -1637,9 +1637,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3PhTX5bHmvG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8170Y" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3PhTX5bHmvH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8170Z" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1743,7 +1743,7 @@
                     <node concept="2OqwBi" id="mIQkxfv1W9" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfv1Wa" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfv1Wb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="mIQkxfv1We" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81710" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfv1Wc" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1755,9 +1755,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="mIQkxfv1We" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81710" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="mIQkxfv1Wf" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81711" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1783,7 +1783,7 @@
                     <node concept="2OqwBi" id="mIQkxfv1WA" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfv1WB" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfv1WC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="mIQkxfv1WF" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81712" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfv1WD" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1795,9 +1795,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="mIQkxfv1WF" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81712" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="mIQkxfv1WG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81713" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1834,7 +1834,7 @@
                     <node concept="2OqwBi" id="mIQkxfCIxg" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfCIxh" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfCIxi" role="2Oq$k0">
-                          <ref role="3cqZAo" node="mIQkxfCIxn" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81714" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfCIxj" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1850,9 +1850,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="mIQkxfCIxn" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81714" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="mIQkxfCIxo" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81715" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1896,7 +1896,7 @@
                       <node concept="2OqwBi" id="mIQkxf$FQp" role="3uHU7B">
                         <node concept="2OqwBi" id="mIQkxf$F2i" role="2Oq$k0">
                           <node concept="37vLTw" id="mIQkxf$EUh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="mIQkxf$EOq" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81716" />
                           </node>
                           <node concept="3TrEf2" id="mIQkxf$FgW" role="2OqNvi">
                             <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1912,9 +1912,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="mIQkxf$EOq" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81716" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="mIQkxf$EOr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81717" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2511,7 +2511,7 @@
                     <node concept="3clFbF" id="3PhTX5bHIb_" role="3cqZAp">
                       <node concept="2OqwBi" id="3PhTX5bHIpq" role="3clFbG">
                         <node concept="37vLTw" id="3PhTX5bHIb$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3PhTX5bHHXo" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81718" />
                         </node>
                         <node concept="2qgKlT" id="3PhTX5bHIUd" role="2OqNvi">
                           <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -2519,9 +2519,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3PhTX5bHHXo" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81718" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3PhTX5bHHXp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81719" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3486,7 +3486,7 @@
                           <node concept="2OqwBi" id="76PiIP0J6Ak" role="33vP2m">
                             <node concept="2OqwBi" id="76PiIP0J6Al" role="2Oq$k0">
                               <node concept="37vLTw" id="76PiIP0J6Am" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3sKE3ts8K7$" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8171a" />
                               </node>
                               <node concept="3TrEf2" id="76PiIP0J6An" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
@@ -3504,7 +3504,7 @@
                             <node concept="2OqwBi" id="3sKE3ts8K7i" role="3uHU7B">
                               <node concept="2OqwBi" id="3sKE3ts8K7j" role="2Oq$k0">
                                 <node concept="37vLTw" id="3sKE3ts8K7k" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3sKE3ts8K7$" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171a" />
                                 </node>
                                 <node concept="3TrEf2" id="3sKE3ts8K7l" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -3544,9 +3544,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3sKE3ts8K7$" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171a" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3sKE3ts8K7_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171b" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3946,7 +3946,7 @@
                       </node>
                       <node concept="2OqwBi" id="7Atos1y666E" role="33vP2m">
                         <node concept="37vLTw" id="7Atos1y666F" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8171c" />
                         </node>
                         <node concept="2qgKlT" id="7Atos1y666G" role="2OqNvi">
                           <ref role="37wK5l" node="mIQkxg5ZT6" resolve="getPorts" />
@@ -3975,7 +3975,7 @@
                             <node concept="3clFbC" id="4VHfdEqkKQi" role="1eOMHV">
                               <node concept="2OqwBi" id="4VHfdEqkKQj" role="3uHU7B">
                                 <node concept="37vLTw" id="4VHfdEqkKQk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171c" />
                                 </node>
                                 <node concept="2qgKlT" id="4VHfdEqkKQl" role="2OqNvi">
                                   <ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
@@ -4002,7 +4002,7 @@
                             <node concept="3clFbC" id="4VHfdEqkBOj" role="1eOMHV">
                               <node concept="2OqwBi" id="4VHfdEqk$mS" role="3uHU7B">
                                 <node concept="37vLTw" id="4VHfdEqkzO7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7Atos1y666T" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171c" />
                                 </node>
                                 <node concept="2qgKlT" id="4VHfdEqk$Ya" role="2OqNvi">
                                   <ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
@@ -4039,9 +4039,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Atos1y666T" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8171c" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Atos1y666U" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8171d" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7399,7 +7399,7 @@
                     <node concept="2OqwBi" id="siw10GLzjO" role="3clFbG">
                       <node concept="2OqwBi" id="siw10GLzjP" role="2Oq$k0">
                         <node concept="37vLTw" id="siw10GLzjQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="siw10GLzjU" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8171e" />
                         </node>
                         <node concept="3TrcHB" id="siw10GLzjR" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7414,9 +7414,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="siw10GLzjU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8171e" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="siw10GLzjV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8171f" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7600,14 +7600,14 @@
                       <node concept="3y3z36" id="1WCh2thaTlJ" role="3clFbG">
                         <node concept="13iPFW" id="1WCh2thaTlK" role="3uHU7w" />
                         <node concept="37vLTw" id="1WCh2thaTlL" role="3uHU7B">
-                          <ref role="3cqZAo" node="1WCh2thaTlM" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8171g" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1WCh2thaTlM" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8171g" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1WCh2thaTlN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8171h" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7637,7 +7637,7 @@
                     <node concept="3clFbF" id="1WCh2thclCA" role="3cqZAp">
                       <node concept="2OqwBi" id="1WCh2thclCB" role="3clFbG">
                         <node concept="37vLTw" id="1WCh2thclCC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1WCh2thclCE" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8171i" />
                         </node>
                         <node concept="2qgKlT" id="1WCh2thclCD" role="2OqNvi">
                           <ref role="37wK5l" node="1WCh2thchui" resolve="sourcePortsAndInstance" />
@@ -7645,9 +7645,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1WCh2thclCE" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8171i" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1WCh2thclCF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8171j" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7695,7 +7695,7 @@
                         <node concept="3fqX7Q" id="7Nni8xTZFXQ" role="3uHU7w">
                           <node concept="2OqwBi" id="7Nni8xTZFXS" role="3fr31v">
                             <node concept="37vLTw" id="7Nni8xTZFXT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1WCh2thaPui" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171k" />
                             </node>
                             <node concept="2qgKlT" id="7Nni8xTZFXU" role="2OqNvi">
                               <ref role="37wK5l" node="mIQkxf$r$2" resolve="isOptional" />
@@ -7705,7 +7705,7 @@
                         <node concept="2OqwBi" id="7Nni8xTZ$vh" role="3uHU7B">
                           <node concept="2OqwBi" id="7Nni8xTZuZR" role="2Oq$k0">
                             <node concept="37vLTw" id="7Nni8xTZtHX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1WCh2thaPui" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171k" />
                             </node>
                             <node concept="3TrEf2" id="7Nni8xTZz4d" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -7718,9 +7718,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1WCh2thaPui" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8171k" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1WCh2thaPuj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8171l" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7779,7 +7779,7 @@
                                         <property role="3cmrfH" value="0" />
                                       </node>
                                       <node concept="37vLTw" id="7Nni8xU4IGX" role="1LFl5Q">
-                                        <ref role="3cqZAo" node="1WCh2thcbsY" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8171m" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7Nni8xU4OoL" role="2OqNvi">
@@ -7797,7 +7797,7 @@
                                         <property role="3cmrfH" value="0" />
                                       </node>
                                       <node concept="37vLTw" id="7Nni8xU4XM6" role="1LFl5Q">
-                                        <ref role="3cqZAo" node="1WCh2thcbsY" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8171m" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="7Nni8xU4XM7" role="2OqNvi">
@@ -7814,7 +7814,7 @@
                                     <property role="3cmrfH" value="0" />
                                   </node>
                                   <node concept="37vLTw" id="1WCh2thcbsU" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="1WCh2thcbsY" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8171m" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="1WCh2thcJ7d" role="2OqNvi">
@@ -7831,9 +7831,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1WCh2thcbsY" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171m" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1WCh2thcbsZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171n" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7859,7 +7859,7 @@
                           <node concept="2OqwBi" id="1WCh2thdoAO" role="3clFbG">
                             <node concept="2OqwBi" id="1WCh2thdoAP" role="2Oq$k0">
                               <node concept="37vLTw" id="1WCh2thdoAQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1WCh2thdoAU" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8171o" />
                               </node>
                               <node concept="3TrEf2" id="1WCh2thdoAR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
@@ -7874,9 +7874,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1WCh2thdoAU" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171o" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1WCh2thdoAV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171p" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8188,15 +8188,15 @@
                   <node concept="3clFbF" id="1WCh2thcj7N" role="3cqZAp">
                     <node concept="1Ls8ON" id="1WCh2thcj7M" role="3clFbG">
                       <node concept="37vLTw" id="1WCh2thcjmy" role="1Lso8e">
-                        <ref role="3cqZAo" node="1WCh2thcj0N" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8171q" />
                       </node>
                       <node concept="13iPFW" id="1WCh2thcjv1" role="1Lso8e" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1WCh2thcj0N" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8171q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1WCh2thcj0O" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8171r" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
index 8a485ab7f3..72ddc99204 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
@@ -92,7 +92,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,6 +146,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" />
@@ -232,7 +233,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -271,7 +272,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -332,14 +332,14 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="1F1F0IUZ_dk" role="3uHU7B">
-                            <ref role="3cqZAo" node="1F1F0IUZ_dl" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8171s" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZ_dl" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171s" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZ_dm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171t" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -749,7 +749,7 @@
                         <node concept="2OqwBi" id="1F1F0IUZ$YZ" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ$Z0" role="2Oq$k0">
                             <node concept="37vLTw" id="1F1F0IUZ$Z1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1F1F0IUZ$Z4" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171u" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZ$Z2" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -761,9 +761,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZ$Z4" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171u" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZ$Z5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171v" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -984,7 +984,7 @@
                         <node concept="2OqwBi" id="1F1F0IUZ$S7" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ$S8" role="2Oq$k0">
                             <node concept="37vLTw" id="1F1F0IUZ$S9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1F1F0IUZ$Sc" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171w" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZ$Sa" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -996,9 +996,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZ$Sc" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171w" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZ$Sd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171x" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1493,7 +1493,7 @@
                                 <node concept="3O6GUB" id="6ETHnAJXoFc" role="2OqNvi">
                                   <node concept="25Kdxt" id="6ETHnAJXp75" role="3QVz_e">
                                     <node concept="37vLTw" id="6ETHnAJXpz1" role="25KhWn">
-                                      <ref role="3cqZAo" node="6ETHnAJXe4t" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8171y" />
                                     </node>
                                   </node>
                                 </node>
@@ -1505,7 +1505,7 @@
                                 <node concept="2Zo12i" id="6ETHnAJXj69" role="2OqNvi">
                                   <node concept="25Kdxt" id="6ETHnAJXllx" role="2Zo12j">
                                     <node concept="37vLTw" id="6ETHnAJXlL3" role="25KhWn">
-                                      <ref role="3cqZAo" node="6ETHnAJXe4t" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8171y" />
                                     </node>
                                   </node>
                                 </node>
@@ -1513,9 +1513,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6ETHnAJXe4t" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8171y" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6ETHnAJXe4u" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8171z" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2592,15 +2592,15 @@
                                 <node concept="3clFbF" id="68KkV784WuT" role="3cqZAp">
                                   <node concept="2OqwBi" id="68KkV784WuU" role="3clFbG">
                                     <node concept="37vLTw" id="68KkV784WuV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="68KkV784WuX" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8171$" />
                                     </node>
                                     <node concept="2yIwOk" id="68KkV784WuW" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="68KkV784WuX" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8171$" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="68KkV784WuY" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8171_" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2639,7 +2639,7 @@
                                     <node concept="3O6GUB" id="6ETHnAJXONh" role="2OqNvi">
                                       <node concept="25Kdxt" id="6ETHnAJXPky" role="3QVz_e">
                                         <node concept="37vLTw" id="6ETHnAJXPPQ" role="25KhWn">
-                                          <ref role="3cqZAo" node="6ETHnAJXG2W" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171A" />
                                         </node>
                                       </node>
                                     </node>
@@ -2651,7 +2651,7 @@
                                     <node concept="2Zo12i" id="6ETHnAJXKYh" role="2OqNvi">
                                       <node concept="25Kdxt" id="6ETHnAJXLv3" role="2Zo12j">
                                         <node concept="37vLTw" id="6ETHnAJXLZS" role="25KhWn">
-                                          <ref role="3cqZAo" node="6ETHnAJXG2W" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171A" />
                                         </node>
                                       </node>
                                     </node>
@@ -2659,9 +2659,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6ETHnAJXG2W" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8171A" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6ETHnAJXG2X" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8171B" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
index c470710905..a58f0cfee6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
@@ -149,7 +149,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -172,7 +172,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -206,7 +206,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">
@@ -262,7 +262,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">
@@ -381,7 +381,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -405,7 +405,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">
@@ -435,6 +435,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" />
@@ -474,7 +475,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G" />
@@ -551,7 +552,7 @@
       </concept>
       <concept id="3462102746004176270" name="de.itemis.mps.editor.diagram.structure.DeleteHandler" flags="ig" index="2fs66k" />
       <concept id="8377729485182319155" name="de.itemis.mps.editor.diagram.structure.PaletteSource_EntryQuery" flags="ig" index="gQ1qB" />
-      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ng" index="ljJFv">
+      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ngI" index="ljJFv">
         <child id="7188630757225274921" name="navigationTargets" index="1i7NIZ" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -576,7 +577,7 @@
         <child id="2531824743736393627" name="height" index="2gOmqF" />
         <child id="500099795019625833" name="shape" index="G$OdO" />
       </concept>
-      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ng" index="HB_m5">
+      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ngI" index="HB_m5">
         <child id="3155126767688717334" name="contentList" index="aCds2" />
       </concept>
       <concept id="7890587897031726207" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery" flags="ng" index="2M4AIt">
@@ -727,7 +728,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" />
@@ -759,7 +760,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -3689,7 +3689,7 @@
                         <node concept="3fqX7Q" id="siw10FErbQ" role="3clFbG">
                           <node concept="2OqwBi" id="siw10FErjc" role="3fr31v">
                             <node concept="37vLTw" id="siw10FEreR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="siw10FEr7C" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171C" />
                             </node>
                             <node concept="1mIQ4w" id="siw10FErsu" role="2OqNvi">
                               <node concept="chp4Y" id="siw10FErxF" role="cj9EA">
@@ -3700,9 +3700,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="siw10FEr7C" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171C" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="siw10FEr7D" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171D" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4242,7 +4242,7 @@
                               <node concept="37u81S" id="v8xu81RjRP" role="3uHU7w" />
                               <node concept="2OqwBi" id="v8xu81RjRQ" role="3uHU7B">
                                 <node concept="37vLTw" id="v8xu81RjRR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="v8xu81RjRT" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171E" />
                                 </node>
                                 <node concept="3TrEf2" id="v8xu81RjRS" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:cJpacq2_ov" resolve="outerPort" />
@@ -4251,9 +4251,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="v8xu81RjRT" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8171E" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="v8xu81RjRU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8171F" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4264,15 +4264,15 @@
                         <node concept="3clFbF" id="v8xu81RjRY" role="3cqZAp">
                           <node concept="2OqwBi" id="v8xu81RjRZ" role="3clFbG">
                             <node concept="37vLTw" id="v8xu81RjS0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="v8xu81RjS2" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171G" />
                             </node>
                             <node concept="3YRAZt" id="v8xu81RjS1" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="v8xu81RjS2" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171G" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="v8xu81RjS3" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171H" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4302,7 +4302,7 @@
                               <node concept="37u81S" id="v8xu81RjSi" role="3uHU7w" />
                               <node concept="2OqwBi" id="v8xu81RjSj" role="3uHU7B">
                                 <node concept="37vLTw" id="v8xu81RjSk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="v8xu81RjSm" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171I" />
                                 </node>
                                 <node concept="3TrEf2" id="v8xu81RjSl" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:cJpacq1tbb" resolve="outerPort" />
@@ -4311,9 +4311,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="v8xu81RjSm" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8171I" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="v8xu81RjSn" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8171J" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4324,15 +4324,15 @@
                         <node concept="3clFbF" id="v8xu81RjSr" role="3cqZAp">
                           <node concept="2OqwBi" id="v8xu81RjSs" role="3clFbG">
                             <node concept="37vLTw" id="v8xu81RjSt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="v8xu81RjSv" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8171K" />
                             </node>
                             <node concept="3YRAZt" id="v8xu81RjSu" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="v8xu81RjSv" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171K" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="v8xu81RjSw" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171L" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4411,7 +4411,7 @@
                                   <node concept="3clFbF" id="7jwD7MQjiAB" role="3cqZAp">
                                     <node concept="2OqwBi" id="7jwD7MQjiQ_" role="3clFbG">
                                       <node concept="37vLTw" id="7jwD7MQjiA_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
                                       </node>
                                       <node concept="2qgKlT" id="7jwD7MQjjq0" role="2OqNvi">
                                         <ref role="37wK5l" to="3eba:7jwD7MQjeSk" resolve="getComponentIconSmall" />
@@ -4429,7 +4429,7 @@
                                   <node concept="3clFbF" id="siw10GXGyh" role="3cqZAp">
                                     <node concept="2OqwBi" id="siw10GXGB6" role="3clFbG">
                                       <node concept="37vLTw" id="mIQkxfYbBN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
                                       </node>
                                       <node concept="3TrcHB" id="siw10GXGMR" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4489,7 +4489,7 @@
                                                             <ref role="cht4Q" to="w9y2:6LfBX8YlosD" resolve="ComponentInstance" />
                                                           </node>
                                                           <node concept="37vLTw" id="41i_FWyXP0P" role="1m5AlR">
-                                                            <ref role="3cqZAo" node="41i_FWyXP14" resolve="it" />
+                                                            <ref role="3cqZAo" node="4z0AnX8171M" />
                                                           </node>
                                                         </node>
                                                         <node concept="3TrEf2" id="41i_FWyXP0Q" role="2OqNvi">
@@ -4504,7 +4504,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="41i_FWyXP0S" role="3clFbw">
                                                   <node concept="37vLTw" id="41i_FWyXP0T" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="41i_FWyXP14" resolve="it" />
+                                                    <ref role="3cqZAo" node="4z0AnX8171M" />
                                                   </node>
                                                   <node concept="1mIQ4w" id="41i_FWyXP0U" role="2OqNvi">
                                                     <node concept="chp4Y" id="41i_FWyXP0V" role="cj9EA">
@@ -4517,7 +4517,7 @@
                                                     <node concept="3cpWs6" id="41i_FWyXP0Y" role="3cqZAp">
                                                       <node concept="2OqwBi" id="41i_FWyXP0Z" role="3cqZAk">
                                                         <node concept="37vLTw" id="41i_FWyXP10" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="41i_FWyXP14" resolve="it" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171M" />
                                                         </node>
                                                         <node concept="2Xjw5R" id="41i_FWyXP11" role="2OqNvi">
                                                           <node concept="1xMEDy" id="41i_FWyXP12" role="1xVPHs">
@@ -4532,9 +4532,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="41i_FWyXP14" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX8171M" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="41i_FWyXP15" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX8171N" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -4561,7 +4561,7 @@
                                                           <ref role="ehGHo" to="w9y2:6LfBX8Yi4o1" resolve="Component" />
                                                         </node>
                                                         <node concept="37vLTw" id="41i_FWyXP1k" role="2HTEbv">
-                                                          <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
                                                         </node>
                                                       </node>
                                                     </node>
@@ -4574,7 +4574,7 @@
                                                     </node>
                                                     <node concept="2WmjW8" id="41i_FWyXP1o" role="2OqNvi">
                                                       <node concept="37vLTw" id="41i_FWyXP1p" role="25WWJ7">
-                                                        <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -4586,7 +4586,7 @@
                                                     <node concept="3clFbF" id="41i_FWyXP1t" role="3cqZAp">
                                                       <node concept="2OqwBi" id="41i_FWyXP1u" role="3clFbG">
                                                         <node concept="37vLTw" id="41i_FWyXP1v" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="41i_FWyXP1x" resolve="it" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171O" />
                                                         </node>
                                                         <node concept="3TrcHB" id="41i_FWyXP1w" role="2OqNvi">
                                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4594,9 +4594,9 @@
                                                       </node>
                                                     </node>
                                                   </node>
-                                                  <node concept="Rh6nW" id="41i_FWyXP1x" role="1bW2Oz">
+                                                  <node concept="gl6BB" id="4z0AnX8171O" role="1bW2Oz">
                                                     <property role="TrG5h" value="it" />
-                                                    <node concept="2jxLKc" id="41i_FWyXP1y" role="1tU5fm" />
+                                                    <node concept="2jxLKc" id="4z0AnX8171P" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -4656,7 +4656,7 @@
                                       </node>
                                       <node concept="3JPx81" id="41i_FWyXP1L" role="2OqNvi">
                                         <node concept="37vLTw" id="41i_FWyXP1M" role="25WWJ7">
-                                          <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
                                         </node>
                                       </node>
                                     </node>
@@ -4678,7 +4678,7 @@
                                                 <ref role="2pIpSl" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
                                                 <node concept="36biLy" id="mIQkxfT2kr" role="28nt2d">
                                                   <node concept="37vLTw" id="mIQkxfYbOH" role="36biLW">
-                                                    <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                                    <ref role="3cqZAo" node="4z0AnX8171Q" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -4741,7 +4741,7 @@
                                     <node concept="2OqwBi" id="siw10GXMy1" role="3clFbG">
                                       <node concept="2OqwBi" id="siw10GXMbi" role="2Oq$k0">
                                         <node concept="37vLTw" id="mIQkxfYbTh" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="mIQkxg1UMc" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
                                         </node>
                                         <node concept="2Xjw5R" id="siw10GXMn3" role="2OqNvi">
                                           <node concept="1xMEDy" id="siw10GXMn5" role="1xVPHs">
@@ -4763,10 +4763,10 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="mIQkxg1UMc" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171Q" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
                       <property role="3TUv4t" value="true" />
-                      <node concept="2jxLKc" id="mIQkxg1UMd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171R" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6766,7 +6766,7 @@
                                     <node concept="3clFbF" id="3VQCwTIkuho" role="3cqZAp">
                                       <node concept="2OqwBi" id="3VQCwTIkuhp" role="3clFbG">
                                         <node concept="37vLTw" id="3VQCwTIkuhq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3VQCwTIkuio" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171S" />
                                         </node>
                                         <node concept="2qgKlT" id="3VQCwTIkuhr" role="2OqNvi">
                                           <ref role="37wK5l" to="3eba:7jwD7MQjeSk" resolve="getComponentIconSmall" />
@@ -6784,7 +6784,7 @@
                                     <node concept="3clFbF" id="3VQCwTIkuhw" role="3cqZAp">
                                       <node concept="2OqwBi" id="3VQCwTIkuhx" role="3clFbG">
                                         <node concept="37vLTw" id="3VQCwTIkuhy" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3VQCwTIkuio" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8171S" />
                                         </node>
                                         <node concept="3TrcHB" id="3VQCwTIkuhz" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6835,7 +6835,7 @@
                                                   <ref role="2pIpSl" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
                                                   <node concept="36biLy" id="3VQCwTIkuhS" role="28nt2d">
                                                     <node concept="37vLTw" id="3VQCwTIkuhT" role="36biLW">
-                                                      <ref role="3cqZAo" node="3VQCwTIkuio" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX8171S" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -6918,7 +6918,7 @@
                                       <node concept="2OqwBi" id="3VQCwTIkui9" role="3clFbG">
                                         <node concept="2OqwBi" id="3VQCwTIkuia" role="2Oq$k0">
                                           <node concept="37vLTw" id="3VQCwTIkuib" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3VQCwTIkuio" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8171S" />
                                           </node>
                                           <node concept="2Xjw5R" id="3VQCwTIkuic" role="2OqNvi">
                                             <node concept="1xMEDy" id="3VQCwTIkuid" role="1xVPHs">
@@ -6990,10 +6990,10 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3VQCwTIkuio" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171S" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
                         <property role="3TUv4t" value="true" />
-                        <node concept="2jxLKc" id="3VQCwTIkuip" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171T" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7430,7 +7430,7 @@
                           <node concept="3fqX7Q" id="3VQCwTImx8f" role="3clFbG">
                             <node concept="2OqwBi" id="3VQCwTImx8g" role="3fr31v">
                               <node concept="37vLTw" id="3VQCwTImx8h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3VQCwTImx8k" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8171U" />
                               </node>
                               <node concept="1mIQ4w" id="3VQCwTImx8i" role="2OqNvi">
                                 <node concept="chp4Y" id="3VQCwTImx8j" role="cj9EA">
@@ -7441,9 +7441,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3VQCwTImx8k" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8171U" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3VQCwTImx8l" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8171V" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8085,7 +8085,7 @@
                             <node concept="2OqwBi" id="siw10GZ8cC" role="3uHU7B">
                               <node concept="2OqwBi" id="siw10GZ7Yv" role="2Oq$k0">
                                 <node concept="37vLTw" id="siw10GZ7Ur" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="siw10GZ7SI" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171W" />
                                 </node>
                                 <node concept="3TrEf2" id="siw10GZ84B" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:7Zvsa54vwqx" resolve="sourceInstance" />
@@ -8101,7 +8101,7 @@
                             <node concept="2OqwBi" id="siw10GZ8E7" role="3uHU7B">
                               <node concept="2OqwBi" id="siw10GZ8E8" role="2Oq$k0">
                                 <node concept="37vLTw" id="siw10GZ8E9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="siw10GZ7SI" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8171W" />
                                 </node>
                                 <node concept="3TrEf2" id="siw10GZ8MX" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:7Zvsa54vLP_" resolve="targetInstance" />
@@ -8116,9 +8116,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="siw10GZ7SI" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8171W" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="siw10GZ7SJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8171X" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8129,15 +8129,15 @@
                     <node concept="3clFbF" id="siw10GZ98t" role="3cqZAp">
                       <node concept="2OqwBi" id="siw10GZ9dY" role="3clFbG">
                         <node concept="37vLTw" id="siw10GZ98s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="siw10GZ93y" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8171Y" />
                         </node>
                         <node concept="3YRAZt" id="siw10GZ9ni" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="siw10GZ93y" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8171Y" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="siw10GZ93z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8171Z" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11666,7 +11666,7 @@
                           </node>
                           <node concept="2OqwBi" id="4dpHp7PqDR5" role="1m5AlR">
                             <node concept="37vLTw" id="4dpHp7PqDR6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4dpHp7PqDR9" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81720" />
                             </node>
                             <node concept="liA8E" id="4dpHp7PqDR7" role="2OqNvi">
                               <ref role="37wK5l" to="f4zo:~SubstituteAction.getOutputConcept()" resolve="getOutputConcept" />
@@ -11677,9 +11677,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4dpHp7PqDR9" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81720" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4dpHp7PqDRa" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81721" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11690,7 +11690,7 @@
                   <node concept="3clFbF" id="4dpHp7PqDRe" role="3cqZAp">
                     <node concept="2OqwBi" id="4dpHp7PqDRf" role="3clFbG">
                       <node concept="37vLTw" id="4dpHp7PqDRg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4dpHp7PqDRk" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX81722" />
                       </node>
                       <node concept="2Zo12i" id="4dpHp7PqDRh" role="2OqNvi">
                         <node concept="25Kdxt" id="4dpHp7PqDRi" role="2Zo12j">
@@ -11702,9 +11702,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4dpHp7PqDRk" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81722" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4dpHp7PqDRl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81723" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
index f781c51cf2..fb747f8474 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
@@ -108,7 +108,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -146,6 +146,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -261,7 +262,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" />
@@ -285,7 +286,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -523,7 +523,7 @@
                   <node concept="3clFbF" id="1WCh2thdbSL" role="3cqZAp">
                     <node concept="2OqwBi" id="1WCh2thdbZl" role="3clFbG">
                       <node concept="37vLTw" id="1WCh2thdbSK" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1WCh2thdbNy" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX81724" />
                       </node>
                       <node concept="2qgKlT" id="1WCh2thdceu" role="2OqNvi">
                         <ref role="37wK5l" to="3eba:1WCh2thaL0Y" resolve="autowire" />
@@ -531,9 +531,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1WCh2thdbNy" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81724" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1WCh2thdbNz" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81725" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
index ba626a183e..d14699cbf0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="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="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
   </languages>
@@ -65,7 +65,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -74,12 +74,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -155,7 +156,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -226,7 +227,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1225621920911" name="jetbrains.mps.baseLanguage.collections.structure.InsertElementOperation" flags="nn" index="1sK_Qi">
         <child id="1225621943565" name="element" index="1sKFgg" />
@@ -671,7 +671,7 @@
                           <node concept="2OqwBi" id="x8tpSA7Sjf" role="3clFbG">
                             <node concept="2OqwBi" id="x8tpSA7QIt" role="2Oq$k0">
                               <node concept="37vLTw" id="x8tpSA7Qqi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="x8tpSA7QiH" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX81726" />
                               </node>
                               <node concept="3TrEf2" id="x8tpSA7R_2" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:siw10Fjg04" resolve="substructure" />
@@ -681,9 +681,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="x8tpSA7QiH" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX81726" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="x8tpSA7QiI" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX81727" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -695,7 +695,7 @@
                         <node concept="2OqwBi" id="x8tpSA7WYM" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSA7Ubi" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSA7TTS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="x8tpSA7TNG" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81728" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSA7V8H" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -707,7 +707,7 @@
                             </node>
                             <node concept="2OqwBi" id="x8tpSA81fC" role="1sKFgg">
                               <node concept="37vLTw" id="x8tpSA80Nr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="x8tpSA7TNG" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX81728" />
                               </node>
                               <node concept="3TrEf2" id="x8tpSA82g3" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:siw10Fjg04" resolve="substructure" />
@@ -717,9 +717,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="x8tpSA7TNG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX81728" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="x8tpSA7TNH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX81729" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -747,7 +747,7 @@
                             <node concept="2OqwBi" id="x8tpSADkg1" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSADkg2" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSADQf5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="x8tpSADKFB" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172a" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAF92p" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -763,7 +763,7 @@
                               <node concept="2OqwBi" id="x8tpSADkg8" role="576Qk">
                                 <node concept="2OqwBi" id="x8tpSADkg9" role="2Oq$k0">
                                   <node concept="37vLTw" id="x8tpSAIwIU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="x8tpSADKFB" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8172a" />
                                   </node>
                                   <node concept="3Tsc0h" id="x8tpSALFUY" role="2OqNvi">
                                     <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -784,7 +784,7 @@
                         <node concept="2OqwBi" id="x8tpSAFdwr" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAFaUg" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAFaeT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="x8tpSADKFB" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172a" />
                             </node>
                             <node concept="2qgKlT" id="x8tpSAFbR3" role="2OqNvi">
                               <ref role="37wK5l" to="3eba:x8tpSAdLM$" resolve="interfaceContent" />
@@ -798,9 +798,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="x8tpSADKFB" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8172a" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="x8tpSADKFC" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8172b" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -919,7 +919,7 @@
                             <node concept="2OqwBi" id="x8tpSAXCLi" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSAXCLj" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSAXCLk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="x8tpSAXCLB" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172g" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAY5DW" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:x8tpS_RkBA" resolve="content" />
@@ -938,7 +938,7 @@
                                     <node concept="2OqwBi" id="x8tpSAYe5Z" role="3clFbG">
                                       <node concept="2OqwBi" id="x8tpSAYaBF" role="2Oq$k0">
                                         <node concept="37vLTw" id="x8tpSAY8UF" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="x8tpSAY7G$" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8172c" />
                                         </node>
                                         <node concept="3TrEf2" id="x8tpSAYby5" role="2OqNvi">
                                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -950,9 +950,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="x8tpSAY7G$" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8172c" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="x8tpSAY7G_" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8172d" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -963,7 +963,7 @@
                         <node concept="2OqwBi" id="x8tpSAYkj4" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAYhHh" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAYgVI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="x8tpSAXCLB" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172g" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSAYiNg" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:x8tpSAXuOU" resolve="governingPorts" />
@@ -988,7 +988,7 @@
                             <node concept="2OqwBi" id="x8tpSAY$Il" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSAY$Im" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSAY$In" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="x8tpSAXCLB" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172g" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAY$Io" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:x8tpS_RkBA" resolve="content" />
@@ -1008,7 +1008,7 @@
                                       <node concept="2OqwBi" id="x8tpSAYPr6" role="3fr31v">
                                         <node concept="2OqwBi" id="x8tpSAYPr7" role="2Oq$k0">
                                           <node concept="37vLTw" id="x8tpSAYPr8" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="x8tpSAY$I$" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8172e" />
                                           </node>
                                           <node concept="3TrEf2" id="x8tpSAYPr9" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1021,9 +1021,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="x8tpSAY$I$" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8172e" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="x8tpSAY$I_" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8172f" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1034,7 +1034,7 @@
                         <node concept="2OqwBi" id="x8tpSAY$Ia" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAY$Ib" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAY$Ic" role="2Oq$k0">
-                              <ref role="3cqZAo" node="x8tpSAXCLB" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172g" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSAYUgh" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:x8tpSAXvhR" resolve="subordinatePorts" />
@@ -1048,9 +1048,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="x8tpSAXCLB" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8172g" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="x8tpSAXCLC" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8172h" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/plugin.mps
index 651047d399..f321b9ddb6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:c3f8c118-0b96-42c8-81d3-9acdb23cdc68(org.iets3.components.core.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/structure.mps
index f3bd253c75..002468cb12 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/structure.mps
@@ -75,7 +75,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
index 1cb3256495..541da8d7be 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.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>
@@ -115,7 +115,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">
@@ -125,6 +125,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" />
@@ -278,7 +279,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -310,7 +311,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -725,7 +725,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="cJpacq2x6m" role="3uHU7B">
                                           <node concept="37vLTw" id="cJpacq2x6n" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="cJpacq2x6w" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8172i" />
                                           </node>
                                           <node concept="3TrEf2" id="3NBP8_OfLCu" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:cJpacq1tk2" resolve="sourcePort" />
@@ -736,7 +736,7 @@
                                         <node concept="2OqwBi" id="cJpacq2x6q" role="3uHU7B">
                                           <node concept="2OqwBi" id="cJpacq2x6r" role="2Oq$k0">
                                             <node concept="37vLTw" id="cJpacq2x6s" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="cJpacq2x6w" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8172i" />
                                             </node>
                                             <node concept="3TrEf2" id="3NBP8_OfRKX" role="2OqNvi">
                                               <ref role="3Tt5mk" to="w9y2:7Zvsa54vwqx" resolve="sourceInstance" />
@@ -753,9 +753,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="cJpacq2x6w" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8172i" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="cJpacq2x6x" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8172j" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -779,7 +779,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="cJpacq2xz_" role="3uHU7B">
                                           <node concept="37vLTw" id="cJpacq2xzA" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="cJpacq2xzJ" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8172k" />
                                           </node>
                                           <node concept="3TrEf2" id="3NBP8_OfUsv" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:cJpacq1V$o" resolve="targetPort" />
@@ -790,7 +790,7 @@
                                         <node concept="2OqwBi" id="cJpacq2xzD" role="3uHU7B">
                                           <node concept="2OqwBi" id="cJpacq2xzE" role="2Oq$k0">
                                             <node concept="37vLTw" id="cJpacq2xzF" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="cJpacq2xzJ" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8172k" />
                                             </node>
                                             <node concept="3TrEf2" id="3NBP8_OfP0v" role="2OqNvi">
                                               <ref role="3Tt5mk" to="w9y2:cJpacq1V$l" resolve="targetInstance" />
@@ -807,9 +807,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="cJpacq2xzJ" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8172k" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="cJpacq2xzK" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8172l" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -830,7 +830,7 @@
                           <node concept="3fqX7Q" id="cJpacq0XpF" role="3clFbG">
                             <node concept="2OqwBi" id="cJpacq0XE5" role="3fr31v">
                               <node concept="37vLTw" id="cJpacq0XpG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="cJpacq0X1s" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8172m" />
                               </node>
                               <node concept="2qgKlT" id="mIQkxf$u7r" role="2OqNvi">
                                 <ref role="37wK5l" to="3eba:mIQkxf$r$2" resolve="isOptional" />
@@ -839,9 +839,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="cJpacq0X1s" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8172m" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="cJpacq0X1t" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8172n" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1714,7 +1714,7 @@
                           </node>
                           <node concept="2OqwBi" id="3NBP8_O40HZ" role="3uHU7B">
                             <node concept="37vLTw" id="3NBP8_O40I0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3NBP8_O40I2" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172o" />
                             </node>
                             <node concept="3TrEf2" id="3NBP8_O40I1" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:4UgzZxsF_xI" resolve="param" />
@@ -1723,9 +1723,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3NBP8_O40I2" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8172o" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3NBP8_O40I3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8172p" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1777,7 +1777,7 @@
                             </node>
                             <node concept="2OqwBi" id="3NBP8_O42_I" role="3uHU7B">
                               <node concept="37vLTw" id="3NBP8_O42_J" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3NBP8_O42_L" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8172q" />
                               </node>
                               <node concept="3TrEf2" id="3NBP8_O42_K" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:4UgzZxsF_xI" resolve="param" />
@@ -1786,9 +1786,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3NBP8_O42_L" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8172q" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3NBP8_O42_M" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8172r" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1830,7 +1830,7 @@
                   <node concept="3fqX7Q" id="3NBP8_O3PpG" role="3clFbG">
                     <node concept="2OqwBi" id="3NBP8_O3PpI" role="3fr31v">
                       <node concept="37vLTw" id="3NBP8_O3PpJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3NBP8_O3O_W" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8172s" />
                       </node>
                       <node concept="2qgKlT" id="3NBP8_O3PpK" role="2OqNvi">
                         <ref role="37wK5l" to="3eba:3NBP8_O3NQF" resolve="isOptional" />
@@ -1839,9 +1839,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="3NBP8_O3O_W" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX8172s" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="3NBP8_O3O_X" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX8172t" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1977,7 +1977,7 @@
                   <node concept="2OqwBi" id="x8tpSAZ4qk" role="3clFbw">
                     <node concept="2OqwBi" id="x8tpSAZ3yU" role="2Oq$k0">
                       <node concept="37vLTw" id="_igokwK7M4" role="2Oq$k0">
-                        <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                        <ref role="3cqZAo" node="4z0AnX8172u" />
                       </node>
                       <node concept="3TrEf2" id="x8tpSAZ40x" role="2OqNvi">
                         <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1992,7 +1992,7 @@
                       <node concept="3clFbC" id="_igokwKkNE" role="2MkoU_">
                         <node concept="2OqwBi" id="_igokwKjZd" role="3uHU7B">
                           <node concept="37vLTw" id="_igokwKj_P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                            <ref role="3cqZAo" node="4z0AnX8172u" />
                           </node>
                           <node concept="2NL2c5" id="4llm6dFyM69" role="2OqNvi" />
                         </node>
@@ -2005,7 +2005,7 @@
                         <property role="Xl_RC" value="Port Category is 'governing'" />
                       </node>
                       <node concept="37vLTw" id="_igokwKlmV" role="1urrMF">
-                        <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                        <ref role="3cqZAo" node="4z0AnX8172u" />
                       </node>
                       <node concept="3Cnw8n" id="3km$jnhdo8n" role="1urrFz">
                         <property role="ARO6o" value="true" />
@@ -2013,7 +2013,7 @@
                         <node concept="3CnSsL" id="3km$jnhdUj$" role="3Coj4f">
                           <ref role="QkamJ" node="6dLmQVBsrXD" resolve="p" />
                           <node concept="37vLTw" id="3km$jnhdUuB" role="3CoRuB">
-                            <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                            <ref role="3cqZAo" node="4z0AnX8172u" />
                           </node>
                         </node>
                       </node>
@@ -2025,7 +2025,7 @@
                         <node concept="3clFbC" id="_igokwKvp$" role="2MkoU_">
                           <node concept="2OqwBi" id="_igokwKsKJ" role="3uHU7B">
                             <node concept="37vLTw" id="_igokwKsvG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                              <ref role="3cqZAo" node="4z0AnX8172u" />
                             </node>
                             <node concept="2NL2c5" id="4llm6dFyMgv" role="2OqNvi" />
                           </node>
@@ -2038,7 +2038,7 @@
                           <property role="Xl_RC" value="Port Category is 'subordinate'" />
                         </node>
                         <node concept="37vLTw" id="_igokwKtLF" role="1urrMF">
-                          <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                          <ref role="3cqZAo" node="4z0AnX8172u" />
                         </node>
                         <node concept="3Cnw8n" id="3km$jnhdojg" role="1urrFz">
                           <property role="ARO6o" value="true" />
@@ -2046,7 +2046,7 @@
                           <node concept="3CnSsL" id="3km$jnhdUDA" role="3Coj4f">
                             <ref role="QkamJ" node="6dLmQVBsrXD" resolve="p" />
                             <node concept="37vLTw" id="3km$jnhdUOJ" role="3CoRuB">
-                              <ref role="3cqZAo" node="_igokwK5R8" resolve="port" />
+                              <ref role="3cqZAo" node="4z0AnX8172u" />
                             </node>
                           </node>
                         </node>
@@ -2055,9 +2055,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="_igokwK5R8" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX8172u" role="1bW2Oz">
                 <property role="TrG5h" value="port" />
-                <node concept="2jxLKc" id="_igokwK5R9" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX8172v" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -2112,7 +2112,7 @@
                         </node>
                         <node concept="2OqwBi" id="6$fTUGAIu$3" role="33vP2m">
                           <node concept="37vLTw" id="6$fTUGAIu$4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6$fTUGAIe5E" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8172w" />
                           </node>
                           <node concept="3TrEf2" id="6$fTUGAIu$5" role="2OqNvi">
                             <ref role="3Tt5mk" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
@@ -2193,7 +2193,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="6$fTUGAIOCh" role="1urrMF">
-                            <ref role="3cqZAo" node="6$fTUGAIe5E" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8172w" />
                           </node>
                         </node>
                       </node>
@@ -2225,9 +2225,9 @@
                     </node>
                     <node concept="3clFbH" id="6$fTUGAIebi" role="3cqZAp" />
                   </node>
-                  <node concept="Rh6nW" id="6$fTUGAIe5E" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172w" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6$fTUGAIe5F" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172x" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2313,7 +2313,7 @@
                           <node concept="2qgKlT" id="PFqDnRTYtI" role="2OqNvi">
                             <ref role="37wK5l" to="3eba:7Atos1y63VI" resolve="getConnectionMulitplicityError" />
                             <node concept="37vLTw" id="4VHfdEqk8tI" role="37wK5m">
-                              <ref role="3cqZAo" node="PFqDnRUiiL" resolve="ci" />
+                              <ref role="3cqZAo" node="4z0AnX8172y" />
                             </node>
                             <node concept="37vLTw" id="PFqDnRUaXo" role="37wK5m">
                               <ref role="3cqZAo" node="PFqDnRU9qz" resolve="allConnectors" />
@@ -2349,7 +2349,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="PFqDnRUkwg" role="1urrMF">
-                            <ref role="3cqZAo" node="PFqDnRUiiL" resolve="ci" />
+                            <ref role="3cqZAo" node="4z0AnX8172y" />
                           </node>
                         </node>
                       </node>
@@ -2365,7 +2365,7 @@
                     <node concept="2OqwBi" id="PFqDnRTYu1" role="2Oq$k0">
                       <node concept="2OqwBi" id="PFqDnRTYu3" role="2Oq$k0">
                         <node concept="37vLTw" id="PFqDnRUkwe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="PFqDnRUiiL" resolve="ci" />
+                          <ref role="3cqZAo" node="4z0AnX8172y" />
                         </node>
                         <node concept="2qgKlT" id="3PhTX5bIm8i" role="2OqNvi">
                           <ref role="37wK5l" to="3eba:77HYM7H$sfU" resolve="component" />
@@ -2381,9 +2381,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="PFqDnRUiiL" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX8172y" role="1bW2Oz">
                 <property role="TrG5h" value="ci" />
-                <node concept="2jxLKc" id="PFqDnRUiiM" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX8172z" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl
index 0931a7007d..314b55509d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -45,7 +44,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -70,7 +69,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -131,7 +130,6 @@
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
     <module reference="f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)" version="10" />
     <module reference="583939be-ded0-4735-a055-a74f8477fc34(org.iets3.core.attributes)" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
index ba44649ec5..86a14c72c8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1f1b4a81-113d-4b88-9b67-2bae3e4f8128" name="com.mbeddr.mpsutil.projectview" version="1" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -68,19 +68,20 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -136,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -158,7 +159,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -193,7 +193,7 @@
                   <node concept="3clFbF" id="5Jew25TJ3VJ" role="3cqZAp">
                     <node concept="2OqwBi" id="5Jew25TJ42F" role="3clFbG">
                       <node concept="37vLTw" id="5Jew25TJ3VI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Jew25TJ3Qg" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mc" />
                       </node>
                       <node concept="2qgKlT" id="5Jew25TJ4ho" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -201,9 +201,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5Jew25TJ3Qg" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5Jew25TJ3Qh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817md" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="5Jew25TJ3Qi" role="2S7zOq">
@@ -260,7 +260,7 @@
                   <node concept="3fqX7Q" id="1MpR5BkUpof" role="3clFbG">
                     <node concept="2OqwBi" id="1MpR5BkUpsg" role="3fr31v">
                       <node concept="37vLTw" id="1MpR5BkUpom" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1MpR5BkUpiM" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817me" />
                       </node>
                       <node concept="1mIQ4w" id="1MpR5BkUpC3" role="2OqNvi">
                         <node concept="chp4Y" id="1MpR5BkUpGA" role="cj9EA">
@@ -271,9 +271,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1MpR5BkUpiM" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817me" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1MpR5BkUpiN" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817mf" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd
index 5a8e664234..5e9433da3f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.components.plugin" uuid="7e09f312-66d1-4b1d-91cb-92e8984cbbe2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.components.plugin" uuid="7e09f312-66d1-4b1d-91cb-92e8984cbbe2" 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">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -24,10 +23,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.iets3.opensource/languages/org.iets3.components.req/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/behavior.mps
index d9242b7d70..0dcc81eedd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/behavior.mps
@@ -51,11 +51,11 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -76,7 +76,7 @@
       <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/constraints.mps
index 524f4c240c..20852c2962 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/constraints.mps
@@ -29,7 +29,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps
index a57f0f21a7..1007ef4d43 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps
@@ -43,7 +43,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -74,7 +74,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/structure.mps
index 703a4276f5..1bb401c629 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/structure.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/org.iets3.components.req.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/org.iets3.components.req.mpl
index 0e5bfcbefa..cead8fc4ed 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/org.iets3.components.req.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/org.iets3.components.req.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
index fed5b39448..485a9adb14 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,12 +94,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" />
@@ -150,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +166,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -210,7 +210,7 @@
                           <node concept="2OqwBi" id="1HLccB8EnHF" role="2Oq$k0">
                             <node concept="2JrnkZ" id="1HLccB8Ent9" role="2Oq$k0">
                               <node concept="37vLTw" id="1HLccB8EmE8" role="2JrQYb">
-                                <ref role="3cqZAo" node="1HLccB8EmgA" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8172_" />
                               </node>
                             </node>
                             <node concept="liA8E" id="1HLccB8EnZd" role="2OqNvi">
@@ -223,9 +223,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1HLccB8EmgA" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8172_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1HLccB8EmgB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8172A" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -430,7 +430,7 @@
                             <node concept="36biLy" id="1HLccB8vwoI" role="28nt2d">
                               <node concept="2OqwBi" id="1HLccB8vwoJ" role="36biLW">
                                 <node concept="37vLTw" id="1HLccB8vwoK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1HLccB8vwpg" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172D" />
                                 </node>
                                 <node concept="2qgKlT" id="1HLccB8vwoL" role="2OqNvi">
                                   <ref role="37wK5l" to="fp62:7qN5a9Pfhlm" resolve="getTraceSource" />
@@ -452,7 +452,7 @@
                     <node concept="2OqwBi" id="1HLccB8vwoP" role="3clFbG">
                       <node concept="2OqwBi" id="1HLccB8vwoQ" role="2Oq$k0">
                         <node concept="37vLTw" id="1HLccB8vwoR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1HLccB8vwpg" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8172D" />
                         </node>
                         <node concept="3Tsc0h" id="1HLccB8vwoS" role="2OqNvi">
                           <ref role="3TtcxE" to="ci3w:1PzuxQOT_1a" resolve="traceTarget" />
@@ -480,7 +480,7 @@
                                         <node concept="36biLy" id="1HLccB8vwp5" role="28nt2d">
                                           <node concept="2OqwBi" id="1HLccB8vwp6" role="36biLW">
                                             <node concept="37vLTw" id="1HLccB8vwp7" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1HLccB8vwp9" resolve="target" />
+                                              <ref role="3cqZAo" node="4z0AnX8172B" />
                                             </node>
                                             <node concept="3TrEf2" id="1HLccB8vwp8" role="2OqNvi">
                                               <ref role="3Tt5mk" to="ci3w:1PzuxQOTLHd" resolve="traceTarget" />
@@ -494,9 +494,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1HLccB8vwp9" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8172B" role="1bW2Oz">
                             <property role="TrG5h" value="target" />
-                            <node concept="2jxLKc" id="1HLccB8vwpa" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8172C" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -515,9 +515,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1HLccB8vwpg" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8172D" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1HLccB8vwph" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8172E" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -636,7 +636,7 @@
                               <ref role="2pIpSl" to="330h:378sigX3YpV" resolve="element" />
                               <node concept="36biLy" id="6_Ift$_DuFb" role="28nt2d">
                                 <node concept="37vLTw" id="6_Ift$_DuQl" role="36biLW">
-                                  <ref role="3cqZAo" node="6_Ift$_DmzS" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172F" />
                                 </node>
                               </node>
                             </node>
@@ -646,9 +646,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6_Ift$_DmzS" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8172F" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6_Ift$_DmzT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8172G" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps
index 8a057dbecd..fad1835aaf 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/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" />
@@ -94,7 +94,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -128,7 +128,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.assessment/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/plugin.mps
index 0a42db2460..1c0a72584e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/structure.mps
index 0a2229d941..48bcb91f14 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/structure.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.iets3.opensource/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl
index 43e7c8313a..2d17bc0620 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">7d21cc4b-4c24-41db-9868-8af4a7f3eba9(org.iets3.core.trace)</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" />
@@ -49,7 +48,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/actions.mps
index 37205a8cd1..44203925f9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/actions.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
index 8e01dbc3e4..9628cb6e16 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -145,6 +145,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" />
@@ -250,7 +251,6 @@
         <child id="1209727996925" name="ascending" index="2Dq5b$" />
       </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="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -460,7 +460,7 @@
                   <node concept="3clFbF" id="1HqphBIBEzC" role="3cqZAp">
                     <node concept="2OqwBi" id="1HqphBIBEB_" role="3clFbG">
                       <node concept="37vLTw" id="1HqphBIBEzB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1HqphBIBExm" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8172H" />
                       </node>
                       <node concept="2qgKlT" id="1HqphBIQF4H" role="2OqNvi">
                         <ref role="37wK5l" node="1HqphBICm56" resolve="getEffectiveValue" />
@@ -468,9 +468,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1HqphBIBExm" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8172H" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1HqphBIBExn" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8172I" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -518,24 +518,24 @@
                     <node concept="3clFbF" id="1HqphBIBG8q" role="3cqZAp">
                       <node concept="2OqwBi" id="1HqphBIBGcM" role="3clFbG">
                         <node concept="37vLTw" id="1HqphBIBG8p" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1HqphBIBG5i" resolve="a" />
+                          <ref role="3cqZAo" node="4z0AnX8172J" />
                         </node>
                         <node concept="2qgKlT" id="1HqphBIBGhC" role="2OqNvi">
                           <ref role="37wK5l" node="1HqphBI_m8C" resolve="compareTo" />
                           <node concept="37vLTw" id="1HqphBIBGll" role="37wK5m">
-                            <ref role="3cqZAo" node="1HqphBIBG5k" resolve="b" />
+                            <ref role="3cqZAo" node="4z0AnX8172L" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1HqphBIBG5i" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172J" role="1bW2Oz">
                     <property role="TrG5h" value="a" />
-                    <node concept="2jxLKc" id="1HqphBIBG5j" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172K" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="1HqphBIBG5k" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172L" role="1bW2Oz">
                     <property role="TrG5h" value="b" />
-                    <node concept="2jxLKc" id="1HqphBIBG5l" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172M" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="1HqphBIBG5m" role="2Dq5b$">
@@ -569,24 +569,24 @@
                     <node concept="3clFbF" id="1HqphBIBGM3" role="3cqZAp">
                       <node concept="2OqwBi" id="1HqphBIBGM4" role="3clFbG">
                         <node concept="37vLTw" id="1HqphBIBGM5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1HqphBIBGM8" resolve="a" />
+                          <ref role="3cqZAo" node="4z0AnX8172N" />
                         </node>
                         <node concept="2qgKlT" id="1HqphBIBGM6" role="2OqNvi">
                           <ref role="37wK5l" node="1HqphBI_m8C" resolve="compareTo" />
                           <node concept="37vLTw" id="1HqphBIBGM7" role="37wK5m">
-                            <ref role="3cqZAo" node="1HqphBIBGMa" resolve="b" />
+                            <ref role="3cqZAo" node="4z0AnX8172P" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1HqphBIBGM8" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172N" role="1bW2Oz">
                     <property role="TrG5h" value="a" />
-                    <node concept="2jxLKc" id="1HqphBIBGM9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172O" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="1HqphBIBGMa" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172P" role="1bW2Oz">
                     <property role="TrG5h" value="b" />
-                    <node concept="2jxLKc" id="1HqphBIBGMb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172Q" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="1HqphBIBGMc" role="2Dq5b$">
@@ -800,7 +800,7 @@
                         <node concept="3fqX7Q" id="5ZBgTg_IznW" role="3uHU7B">
                           <node concept="2OqwBi" id="5ZBgTg_IznY" role="3fr31v">
                             <node concept="37vLTw" id="5ZBgTg_IznZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5ZBgTg_Iy85" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172R" />
                             </node>
                             <node concept="liA8E" id="5ZBgTg_Izo0" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -809,7 +809,7 @@
                         </node>
                         <node concept="2OqwBi" id="5ZBgTg_I_T4" role="3uHU7w">
                           <node concept="37vLTw" id="5ZBgTg_I_FS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5ZBgTg_Iy85" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8172R" />
                           </node>
                           <node concept="2qgKlT" id="4um6WxnZVtc" role="2OqNvi">
                             <ref role="37wK5l" node="5ZBgTg_IANQ" resolve="isMainAttribute" />
@@ -826,7 +826,7 @@
                                 <node concept="2ShNRf" id="4z0AnX6tOBv" role="2Oq$k0">
                                   <node concept="1pGfFk" id="4z0AnX6tPZ9" role="2ShVmc">
                                     <property role="373rjd" value="true" />
-                                    <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                                    <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="ContainmentContext.Builder" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="4z0AnX6tQpu" role="2OqNvi">
@@ -837,7 +837,7 @@
                               <node concept="liA8E" id="4z0AnX6tQVS" role="2OqNvi">
                                 <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
                                 <node concept="37vLTw" id="4z0AnX6tRKW" role="37wK5m">
-                                  <ref role="3cqZAo" node="5ZBgTg_Iy85" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8172R" />
                                 </node>
                               </node>
                             </node>
@@ -853,9 +853,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ZBgTg_Iy85" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8172R" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ZBgTg_Iy86" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8172S" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -885,7 +885,7 @@
                     <node concept="2OqwBi" id="3fP_noAMNYc" role="3clFbG">
                       <node concept="2OqwBi" id="3fP_noAMRbE" role="2Oq$k0">
                         <node concept="37vLTw" id="3fP_noAMNYd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3fP_noAMNYk" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8172T" />
                         </node>
                         <node concept="2yIwOk" id="3fP_noAMR__" role="2OqNvi" />
                       </node>
@@ -895,9 +895,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3fP_noAMNYk" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8172T" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3fP_noAMNYl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8172U" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
index 9f83001912..7d55f8fd0a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" 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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
@@ -74,10 +74,10 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -116,7 +116,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -176,7 +176,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </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>
@@ -191,6 +191,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" />
@@ -250,7 +251,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -268,7 +269,6 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -380,7 +380,7 @@
                           <node concept="10Nm6u" id="4A8SzOVb0KZ" role="3uHU7w" />
                           <node concept="2OqwBi" id="4A8SzOVb0we" role="3uHU7B">
                             <node concept="37vLTw" id="4A8SzOVb0rx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4A8SzOVb0ls" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8172V" />
                             </node>
                             <node concept="2qgKlT" id="4A8SzOVb0BJ" role="2OqNvi">
                               <ref role="37wK5l" to="soq7:4A8SzOVam5y" resolve="summaryString" />
@@ -389,9 +389,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4A8SzOVb0ls" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8172V" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4A8SzOVb0lt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8172W" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -483,7 +483,7 @@
                         <node concept="10Nm6u" id="4A8SzOVb2oc" role="3uHU7w" />
                         <node concept="2OqwBi" id="4A8SzOVb2ds" role="3uHU7B">
                           <node concept="37vLTw" id="4A8SzOVb29O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4A8SzOVb255" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8172X" />
                           </node>
                           <node concept="2qgKlT" id="4A8SzOVb2je" role="2OqNvi">
                             <ref role="37wK5l" to="soq7:4A8SzOVam5y" resolve="summaryString" />
@@ -492,9 +492,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4A8SzOVb255" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8172X" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4A8SzOVb256" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8172Y" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -868,7 +868,7 @@
                                 <node concept="2OqwBi" id="4p5cXWqPMNc" role="3clFbG">
                                   <node concept="2OqwBi" id="4p5cXWqPLw5" role="2Oq$k0">
                                     <node concept="37vLTw" id="4p5cXWqPLcd" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4p5cXWqPKUl" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8172Z" />
                                     </node>
                                     <node concept="2yIwOk" id="4p5cXWqPMdd" role="2OqNvi" />
                                   </node>
@@ -878,9 +878,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4p5cXWqPKUl" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8172Z" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4p5cXWqPKUm" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81730" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
index d7f0b3fc0a..b93028e31a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -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">
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -104,7 +104,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" />
@@ -124,6 +124,7 @@
       <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -152,7 +153,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -179,7 +180,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -321,7 +321,7 @@
                       <node concept="2OqwBi" id="6TDynbfeEVw" role="3clFbG">
                         <node concept="2OqwBi" id="6TDynbfeEVx" role="2Oq$k0">
                           <node concept="37vLTw" id="6TDynbfeEVy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6TDynbfeEOv" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81733" />
                           </node>
                           <node concept="liA8E" id="6TDynbfeEVz" role="2OqNvi">
                             <ref role="37wK5l" node="5aWcZMN3ifR" resolve="getSupportedAttributedTypes" />
@@ -338,25 +338,25 @@
                                   <node concept="1mIQ4w" id="6TDynbfeEVE" role="2OqNvi">
                                     <node concept="25Kdxt" id="6TDynbfeEVF" role="cj9EA">
                                       <node concept="37vLTw" id="6TDynbfeEVG" role="25KhWn">
-                                        <ref role="3cqZAo" node="6TDynbfeEVH" resolve="attributedConcept" />
+                                        <ref role="3cqZAo" node="4z0AnX81731" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6TDynbfeEVH" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX81731" role="1bW2Oz">
                               <property role="TrG5h" value="attributedConcept" />
-                              <node concept="2jxLKc" id="6TDynbfeEVI" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81732" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6TDynbfeEOv" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81733" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6TDynbfeEOw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81734" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -368,7 +368,7 @@
                   <node concept="3clFbF" id="6TDynbfeHvn" role="3cqZAp">
                     <node concept="2OqwBi" id="6TDynbfeHSh" role="3clFbG">
                       <node concept="37vLTw" id="6TDynbfeHCS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6TDynbfeHvp" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX81735" />
                       </node>
                       <node concept="liA8E" id="6TDynbfeIRd" role="2OqNvi">
                         <ref role="37wK5l" node="6TDynbfe$rC" resolve="requiresMandatoryAttributes" />
@@ -379,9 +379,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6TDynbfeHvp" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81735" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6TDynbfeHvq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81736" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -452,7 +452,7 @@
                       <node concept="2OqwBi" id="5IqIsYeDEjY" role="3clFbG">
                         <node concept="2OqwBi" id="5aWcZMN4aqH" role="2Oq$k0">
                           <node concept="37vLTw" id="5aWcZMN4ah9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5aWcZMN4aaL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81739" />
                           </node>
                           <node concept="liA8E" id="5aWcZMN4aKQ" role="2OqNvi">
                             <ref role="37wK5l" node="5aWcZMN3ifR" resolve="getSupportedAttributedTypes" />
@@ -469,25 +469,25 @@
                                   <node concept="1mIQ4w" id="5IqIsYeDIWU" role="2OqNvi">
                                     <node concept="25Kdxt" id="5IqIsYeDJqN" role="cj9EA">
                                       <node concept="37vLTw" id="5IqIsYeDKcP" role="25KhWn">
-                                        <ref role="3cqZAo" node="5IqIsYeDG1J" resolve="attributedConcept" />
+                                        <ref role="3cqZAo" node="4z0AnX81737" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5IqIsYeDG1J" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX81737" role="1bW2Oz">
                               <property role="TrG5h" value="attributedConcept" />
-                              <node concept="2jxLKc" id="5IqIsYeDG1K" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81738" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5aWcZMN4aaL" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81739" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5aWcZMN4aaM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173a" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -503,7 +503,7 @@
                       </node>
                       <node concept="2OqwBi" id="5aWcZMN4_mt" role="33vP2m">
                         <node concept="37vLTw" id="5aWcZMN4_mu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5aWcZMN4bB$" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8173b" />
                         </node>
                         <node concept="liA8E" id="5aWcZMN4_mv" role="2OqNvi">
                           <ref role="37wK5l" node="5aWcZMN3iQj" resolve="createMandatoryAttributesFor" />
@@ -575,9 +575,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5aWcZMN4bB$" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173b" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5aWcZMN4bB_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173c" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/structure.mps
index 3ef1c9d342..30c639126d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/typesystem.mps
index bd295bb3bb..cc312b2a45 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/typesystem.mps
@@ -53,7 +53,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -109,7 +109,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
index 0aa51790a1..b2beeb986f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl
@@ -27,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -55,7 +55,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
index 5390738119..34dd0249bc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -49,7 +49,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
         <child id="2323553266850475953" name="modifiers" index="2frcjj" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -61,7 +61,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
@@ -167,7 +167,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -192,7 +192,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
@@ -219,6 +219,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" />
@@ -275,7 +276,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -316,7 +317,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <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" />
@@ -2684,7 +2684,7 @@
                   <node concept="3clFbF" id="3JvidvJxehH" role="3cqZAp">
                     <node concept="2OqwBi" id="3JvidvJxemu" role="3clFbG">
                       <node concept="37vLTw" id="3JvidvJxehG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3JvidvJxeen" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173d" />
                       </node>
                       <node concept="2qgKlT" id="3JvidvJxew9" role="2OqNvi">
                         <ref role="37wK5l" node="3JvidvJx7iM" resolve="performAdditionalEditorUpdate" />
@@ -2695,9 +2695,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3JvidvJxeen" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173d" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3JvidvJxeeo" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173e" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2745,15 +2745,15 @@
                         <node concept="3clFbF" id="3JvidvJwMGj" role="3cqZAp">
                           <node concept="2OqwBi" id="3JvidvJwN1D" role="3clFbG">
                             <node concept="37vLTw" id="3JvidvJwMGi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3JvidvJwMri" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8173f" />
                             </node>
                             <node concept="2Rxl7S" id="3JvidvJwNwU" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3JvidvJwMri" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8173f" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3JvidvJwMrj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8173g" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2783,7 +2783,7 @@
                           <node concept="2OqwBi" id="4bmM0avMFeJ" role="25WWJ7">
                             <node concept="2OqwBi" id="4bmM0avMFeK" role="2Oq$k0">
                               <node concept="37vLTw" id="4bmM0avMFeL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4bmM0avMFeO" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8173h" />
                               </node>
                               <node concept="liA8E" id="4bmM0avMFeM" role="2OqNvi">
                                 <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -2797,9 +2797,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4bmM0avMFeO" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8173h" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4bmM0avMFeP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2810,7 +2810,7 @@
                   <node concept="3clFbF" id="4bmM0avMFeT" role="3cqZAp">
                     <node concept="2OqwBi" id="4bmM0avMFeU" role="3clFbG">
                       <node concept="37vLTw" id="4bmM0avMFeV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4bmM0avMFeX" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173j" />
                       </node>
                       <node concept="liA8E" id="4bmM0avMFeW" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -2818,9 +2818,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4bmM0avMFeX" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173j" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4bmM0avMFeY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173k" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/constraints.mps
index eaede86394..aa5a7c24a7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/constraints.mps
@@ -45,7 +45,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
index dc69fd5b5d..49289995d9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
@@ -65,7 +65,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
@@ -87,10 +87,10 @@
       </concept>
       <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -111,7 +111,7 @@
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -120,7 +120,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -224,7 +224,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -239,7 +239,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -254,6 +254,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" />
@@ -300,7 +301,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -316,7 +317,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
     <language id="62a3babb-5d40-4920-897f-d4144dc99c9d" name="com.mbeddr.mpsutil.userstyles">
@@ -775,7 +775,7 @@
                           <node concept="3fqX7Q" id="7MFzeeGr9NL" role="3clFbG">
                             <node concept="2OqwBi" id="7MFzeeGr9NM" role="3fr31v">
                               <node concept="37vLTw" id="7MFzeeGr9NN" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7MFzeeGr9NQ" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8173l" />
                               </node>
                               <node concept="1mIQ4w" id="7MFzeeGr9NO" role="2OqNvi">
                                 <node concept="chp4Y" id="7MFzeeGr9NP" role="cj9EA">
@@ -786,9 +786,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7MFzeeGr9NQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8173l" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7MFzeeGr9NR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8173m" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1016,7 +1016,7 @@
                           <node concept="3fqX7Q" id="7MFzeeGrfQ_" role="3clFbG">
                             <node concept="2OqwBi" id="7MFzeeGrfQA" role="3fr31v">
                               <node concept="37vLTw" id="7MFzeeGrfQB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7MFzeeGrfQE" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8173n" />
                               </node>
                               <node concept="1mIQ4w" id="7MFzeeGrfQC" role="2OqNvi">
                                 <node concept="chp4Y" id="7MFzeeGrfQD" role="cj9EA">
@@ -1027,9 +1027,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7MFzeeGrfQE" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8173n" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7MFzeeGrfQF" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8173o" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1294,7 +1294,7 @@
                       <node concept="3fqX7Q" id="1RXwPEXP854" role="3clFbG">
                         <node concept="2OqwBi" id="1RXwPEXP855" role="3fr31v">
                           <node concept="37vLTw" id="1RXwPEXP856" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1RXwPEXP859" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8173p" />
                           </node>
                           <node concept="1mIQ4w" id="1RXwPEXP857" role="2OqNvi">
                             <node concept="chp4Y" id="1RXwPEXP858" role="cj9EA">
@@ -1305,9 +1305,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1RXwPEXP859" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8173p" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1RXwPEXP85a" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
index b027bf465a..7387a867b3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
@@ -57,7 +57,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -71,6 +71,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" />
@@ -117,7 +118,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>
@@ -135,7 +136,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -268,7 +268,7 @@
                         <node concept="2OqwBi" id="6js_s$imKOJ" role="3uHU7B">
                           <node concept="2OqwBi" id="6js_s$imKOK" role="2Oq$k0">
                             <node concept="37vLTw" id="6js_s$imKOL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6js_s$imKOO" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8173r" />
                             </node>
                             <node concept="liA8E" id="6js_s$imKOM" role="2OqNvi">
                               <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -281,9 +281,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6js_s$imKOO" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8173r" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6js_s$imKOP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173s" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -294,7 +294,7 @@
                   <node concept="3clFbF" id="6js_s$imKOT" role="3cqZAp">
                     <node concept="2OqwBi" id="6js_s$imKOU" role="3clFbG">
                       <node concept="37vLTw" id="6js_s$imKOV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6js_s$imKOX" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173t" />
                       </node>
                       <node concept="liA8E" id="6js_s$imKOW" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -302,9 +302,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6js_s$imKOX" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173t" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6js_s$imKOY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173u" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -333,7 +333,7 @@
                   <node concept="3clFbF" id="6js_s$imTAS" role="3cqZAp">
                     <node concept="2OqwBi" id="6js_s$imTR0" role="3clFbG">
                       <node concept="37vLTw" id="6js_s$imTAR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6js_s$imTAC" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173v" />
                       </node>
                       <node concept="2qgKlT" id="1Kc3mnJ0OvJ" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumwpO" resolve="hasExistingResult" />
@@ -341,9 +341,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6js_s$imTAC" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173v" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6js_s$imTAD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173w" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/plugin.mps
index 4143667759..84d47b90f6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/plugin.mps
@@ -2,9 +2,9 @@
 <model ref="r:197c9a7f-bef3-4d38-a48a-51524151fecf(org.iets3.core.base.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="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="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" />
@@ -22,7 +22,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">
@@ -94,7 +94,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,7 +111,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -125,7 +125,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/structure.mps
index abad4ee0dc..d1f75faf62 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/structure.mps
@@ -51,7 +51,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.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
index 48c1ce0248..1c164f6d36 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
@@ -79,7 +79,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,6 +97,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -146,7 +147,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">
@@ -188,7 +189,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -365,15 +365,15 @@
                                             <node concept="3clFbF" id="3SU4Z7Bfw3c" role="3cqZAp">
                                               <node concept="2OqwBi" id="3SU4Z7Bfw3d" role="3clFbG">
                                                 <node concept="37vLTw" id="3SU4Z7Bfw3e" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3SU4Z7Bfw3g" resolve="targetNode" />
+                                                  <ref role="3cqZAo" node="4z0AnX8173x" />
                                                 </node>
                                                 <node concept="3x8VRR" id="3SU4Z7Bfw3f" role="2OqNvi" />
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="3SU4Z7Bfw3g" role="1bW2Oz">
+                                          <node concept="gl6BB" id="4z0AnX8173x" role="1bW2Oz">
                                             <property role="TrG5h" value="targetNode" />
-                                            <node concept="2jxLKc" id="3SU4Z7Bfw3h" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="4z0AnX8173y" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -581,7 +581,7 @@
                                         <node concept="3fqX7Q" id="4MH81Y0Un4X" role="3clFbG">
                                           <node concept="2OqwBi" id="4MH81Y0Un4Z" role="3fr31v">
                                             <node concept="37vLTw" id="4MH81Y0Un50" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4MH81Y0UmJY" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8173z" />
                                             </node>
                                             <node concept="liA8E" id="4MH81Y0Un51" role="2OqNvi">
                                               <ref role="37wK5l" to="gdgh:5zG5$Lyex2e" resolve="isOk" />
@@ -590,9 +590,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4MH81Y0UmJY" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8173z" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4MH81Y0UmJZ" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8173$" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -607,15 +607,15 @@
                                         </node>
                                         <node concept="1Bd96e" id="4MH81Y0UnYr" role="2OqNvi">
                                           <node concept="37vLTw" id="4MH81Y0Uo2K" role="1BdPVh">
-                                            <ref role="3cqZAo" node="4MH81Y0Un_k" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8173_" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4MH81Y0Un_k" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX8173_" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4MH81Y0Un_l" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX8173A" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl
index b3e89f4ad3..d5369af7d7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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" />
@@ -46,7 +45,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
index 96c23582c8..6bbe26919b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
@@ -119,7 +119,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -132,13 +132,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -214,7 +215,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -238,7 +239,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
@@ -340,7 +340,7 @@
                     <node concept="3fqX7Q" id="5a_u3OzPrMZ" role="3clFbG">
                       <node concept="2OqwBi" id="5a_u3OzPrN1" role="3fr31v">
                         <node concept="37vLTw" id="5a_u3OzPrN2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5a_u3OzPr6T" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8173B" />
                         </node>
                         <node concept="3TrcHB" id="5a_u3OzPrN3" role="2OqNvi">
                           <ref role="3TsBF5" to="v0r8:5a_u3OzNkkU" resolve="abstract" />
@@ -349,9 +349,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5a_u3OzPr6T" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173B" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5a_u3OzPr6U" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173C" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -386,7 +386,7 @@
                   <node concept="3clFbF" id="5a_u3OzPrSU" role="3cqZAp">
                     <node concept="2OqwBi" id="5a_u3OzPrSW" role="3clFbG">
                       <node concept="37vLTw" id="5a_u3OzPrSX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5a_u3OzPrSZ" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173D" />
                       </node>
                       <node concept="3TrcHB" id="5a_u3OzPrSY" role="2OqNvi">
                         <ref role="3TsBF5" to="v0r8:5a_u3OzNkkU" resolve="abstract" />
@@ -394,9 +394,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5a_u3OzPrSZ" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173D" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5a_u3OzPrT0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173E" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -504,7 +504,7 @@
                         <node concept="3clFbF" id="28$LOSBEeOo" role="3cqZAp">
                           <node concept="2OqwBi" id="28$LOSBEeZN" role="3clFbG">
                             <node concept="37vLTw" id="28$LOSBEeOn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="28$LOSBEeEQ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8173F" />
                             </node>
                             <node concept="3TrEf2" id="28$LOSBEfgZ" role="2OqNvi">
                               <ref role="3Tt5mk" to="v0r8:28$LOSBCugO" resolve="type" />
@@ -512,9 +512,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="28$LOSBEeEQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8173F" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="28$LOSBEeER" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8173G" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -540,7 +540,7 @@
                           <node concept="3clFbF" id="28$LOSBEn6h" role="3cqZAp">
                             <node concept="2OqwBi" id="28$LOSBEnll" role="3clFbG">
                               <node concept="37vLTw" id="28$LOSBEn6g" role="2Oq$k0">
-                                <ref role="3cqZAo" node="28$LOSBEmRQ" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8173H" />
                               </node>
                               <node concept="3TrEf2" id="28$LOSBEoA$" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v0r8:28$LOSBCugO" resolve="type" />
@@ -548,9 +548,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="28$LOSBEmRQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8173H" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="28$LOSBEmRR" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8173I" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1132,16 +1132,16 @@
                           </node>
                           <node concept="2OqwBi" id="7aipPVpERzR" role="3uHU7B">
                             <node concept="37vLTw" id="7aipPVpERzS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7aipPVpERzU" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8173J" />
                             </node>
                             <node concept="2bSWHS" id="7aipPVpERzT" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7aipPVpERzU" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8173J" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7aipPVpERzV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8173K" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1152,7 +1152,7 @@
                     <node concept="3clFbF" id="7aipPVpERzZ" role="3cqZAp">
                       <node concept="3cpWs3" id="7aipPVpER$0" role="3clFbG">
                         <node concept="37vLTw" id="7aipPVpER$1" role="3uHU7w">
-                          <ref role="3cqZAo" node="7aipPVpER$5" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8173L" />
                         </node>
                         <node concept="37vLTw" id="7aipPVpER$2" role="3uHU7B">
                           <ref role="3cqZAo" node="7aipPVpER$3" resolve="s" />
@@ -1164,9 +1164,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="7aipPVpER$4" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="7aipPVpER$5" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8173L" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7aipPVpER$6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173M" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7aipPVpER$7" role="1MDeny">
@@ -1250,7 +1250,7 @@
                     <node concept="3clFbF" id="28$LOSAhdin" role="3cqZAp">
                       <node concept="2OqwBi" id="28$LOSAhdwP" role="3clFbG">
                         <node concept="37vLTw" id="28$LOSAhdim" role="2Oq$k0">
-                          <ref role="3cqZAo" node="28$LOSAhd4U" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8173N" />
                         </node>
                         <node concept="2qgKlT" id="28$LOSAhdRi" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -1258,9 +1258,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="28$LOSAhd4U" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8173N" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="28$LOSAhd4V" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8173O" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1312,7 +1312,7 @@
                             <ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
                           </node>
                           <node concept="37vLTw" id="28$LOSBsyFL" role="1m5AlR">
-                            <ref role="3cqZAo" node="28$LOSBsx5X" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8173P" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="28$LOSBs$5T" role="2OqNvi">
@@ -1321,7 +1321,7 @@
                       </node>
                       <node concept="2OqwBi" id="28$LOSBsxoX" role="3uHU7B">
                         <node concept="37vLTw" id="28$LOSBsxbX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="28$LOSBsx5X" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8173P" />
                         </node>
                         <node concept="1mIQ4w" id="28$LOSBsxRo" role="2OqNvi">
                           <node concept="chp4Y" id="28$LOSBsy1N" role="cj9EA">
@@ -1332,9 +1332,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="28$LOSBsx5X" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173P" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="28$LOSBsx5Y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173Q" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1366,7 +1366,7 @@
                   <node concept="3clFbF" id="28$LOSBsp6v" role="3cqZAp">
                     <node concept="2OqwBi" id="28$LOSBsp6w" role="3clFbG">
                       <node concept="37vLTw" id="28$LOSBsp6x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="28$LOSBsp6$" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173R" />
                       </node>
                       <node concept="1mIQ4w" id="28$LOSBsp6y" role="2OqNvi">
                         <node concept="chp4Y" id="28$LOSBsp6z" role="cj9EA">
@@ -1376,9 +1376,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="28$LOSBsp6$" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173R" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="28$LOSBsp6_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173S" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2123,14 +2123,14 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="5a_u3OzQHs2" role="3uHU7B">
-                        <ref role="3cqZAo" node="5a_u3OzQyFC" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173T" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5a_u3OzQyFC" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173T" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5a_u3OzQyFD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173U" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2389,14 +2389,14 @@
                         <ref role="3cqZAo" node="28$LOSBr$l_" resolve="constructor" />
                       </node>
                       <node concept="37vLTw" id="28$LOSBrFWj" role="3uHU7B">
-                        <ref role="3cqZAo" node="28$LOSBrFr_" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8173V" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="28$LOSBrFr_" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8173V" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="28$LOSBrFrA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8173W" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
index 0738a58a5d..9f89b7927f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
@@ -80,7 +80,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,7 +93,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -117,6 +117,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -167,7 +168,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -175,7 +176,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
@@ -285,7 +285,7 @@
                             <node concept="3clFbF" id="5a_u3OzPYSX" role="3cqZAp">
                               <node concept="2OqwBi" id="5a_u3OzPYSY" role="3clFbG">
                                 <node concept="37vLTw" id="5a_u3OzPYSZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5a_u3OzPYT1" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8173X" />
                                 </node>
                                 <node concept="2qgKlT" id="5a_u3OzQ0wf" role="2OqNvi">
                                   <ref role="37wK5l" to="dnkk:5a_u3OzPizZ" resolve="allConstructors" />
@@ -293,9 +293,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5a_u3OzPYT1" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8173X" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5a_u3OzPYT2" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8173Y" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -350,7 +350,7 @@
                               <node concept="3clFbF" id="5a_u3OzPVja" role="3cqZAp">
                                 <node concept="2OqwBi" id="5a_u3OzPVjb" role="3clFbG">
                                   <node concept="37vLTw" id="5a_u3OzPVjc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5a_u3OzPVje" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8173Z" />
                                   </node>
                                   <node concept="2qgKlT" id="5a_u3OzPVjd" role="2OqNvi">
                                     <ref role="37wK5l" to="dnkk:5a_u3OzPjJn" resolve="concreteConstructors" />
@@ -358,9 +358,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5a_u3OzPVje" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8173Z" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5a_u3OzPVjf" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81740" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
index 2d41e92cc8..a9f1a0d121 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
@@ -71,7 +71,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>
@@ -80,7 +80,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -108,7 +108,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -185,7 +185,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -199,13 +199,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -222,7 +223,7 @@
       </concept>
       <concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n" />
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G" />
@@ -295,7 +296,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -304,7 +305,6 @@
         <child id="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="1225621920911" name="jetbrains.mps.baseLanguage.collections.structure.InsertElementOperation" flags="nn" index="1sK_Qi">
         <child id="1225621943565" name="element" index="1sKFgg" />
         <child id="1225621960341" name="index" index="1sKJu8" />
@@ -708,7 +708,7 @@
                           <node concept="3clFbF" id="7aipPVpTAJy" role="3cqZAp">
                             <node concept="2OqwBi" id="7aipPVpTAJz" role="3clFbG">
                               <node concept="37vLTw" id="7aipPVpTAJ$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7aipPVpTAJB" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX81741" />
                               </node>
                               <node concept="1mIQ4w" id="7aipPVpTAJ_" role="2OqNvi">
                                 <node concept="chp4Y" id="7aipPVpTAJA" role="cj9EA">
@@ -718,9 +718,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7aipPVpTAJB" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX81741" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7aipPVpTAJC" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX81742" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -842,7 +842,7 @@
                         <node concept="3clFbF" id="7aipPVpTAKp" role="3cqZAp">
                           <node concept="2OqwBi" id="7aipPVpTAKq" role="3clFbG">
                             <node concept="37vLTw" id="7aipPVpTAKr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7aipPVpTAKu" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81743" />
                             </node>
                             <node concept="1mIQ4w" id="7aipPVpTAKs" role="2OqNvi">
                               <node concept="chp4Y" id="7aipPVpTAKt" role="cj9EA">
@@ -852,9 +852,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7aipPVpTAKu" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX81743" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7aipPVpTAKv" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX81744" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1292,7 +1292,7 @@
                       <node concept="2OqwBi" id="7aipPVpTT$2" role="3uHU7B">
                         <node concept="2JrnkZ" id="7aipPVpTT$3" role="2Oq$k0">
                           <node concept="37vLTw" id="7aipPVpTT$4" role="2JrQYb">
-                            <ref role="3cqZAo" node="7aipPVpTT$7" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81745" />
                           </node>
                         </node>
                         <node concept="liA8E" id="7aipPVpTT$5" role="2OqNvi">
@@ -1305,9 +1305,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7aipPVpTT$7" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81745" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7aipPVpTT$8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81746" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/intentions.mps
index e89cc11489..31ef1124a4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/intentions.mps
@@ -52,7 +52,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,7 +121,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
index eb1b7e9ca5..5e385e643c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -40,7 +40,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -151,7 +151,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -172,7 +172,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">
@@ -191,6 +191,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -229,7 +230,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -268,7 +269,6 @@
       <concept id="1227022196108" name="jetbrains.mps.baseLanguage.collections.structure.RemoveAtElementOperation" flags="nn" index="2KedMh">
         <child id="1227022274197" name="index" index="2KewY8" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -521,7 +521,7 @@
                     <node concept="3clFbF" id="7aipPVpQnAf" role="3cqZAp">
                       <node concept="2OqwBi" id="7aipPVpQnSY" role="3clFbG">
                         <node concept="37vLTw" id="7aipPVpQnAe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7aipPVpQnyU" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81749" />
                         </node>
                         <node concept="liA8E" id="7aipPVpQodb" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -529,9 +529,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7aipPVpQnyU" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81749" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7aipPVpQnyV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174a" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/structure.mps
index 8b543216a2..461016e101 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/structure.mps
@@ -58,7 +58,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.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
index f13ae4eb83..b0790282b9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
@@ -87,7 +87,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,6 +100,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" />
@@ -238,7 +239,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -258,7 +259,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1523,7 +1523,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="5a_u3O$05dR" role="1m5AlR">
                                               <node concept="37vLTw" id="5a_u3O$05dS" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5a_u3OzZQHy" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX81747" />
                                               </node>
                                               <node concept="1mfA1w" id="5a_u3O$05dT" role="2OqNvi" />
                                             </node>
@@ -1543,7 +1543,7 @@
                                     <node concept="34jXtK" id="5a_u3O$05dX" role="2OqNvi">
                                       <node concept="2OqwBi" id="5a_u3O$05dY" role="25WWJ7">
                                         <node concept="37vLTw" id="5a_u3O$05dZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5a_u3OzZQHy" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX81747" />
                                         </node>
                                         <node concept="2bSWHS" id="5a_u3O$05e0" role="2OqNvi" />
                                       </node>
@@ -1572,9 +1572,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5a_u3OzZQHy" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX81747" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5a_u3OzZQHz" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81748" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/org.iets3.core.expr.adt.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/org.iets3.core.expr.adt.mpl
index 65a57cbe65..994c597db2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/org.iets3.core.expr.adt.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/org.iets3.core.expr.adt.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -34,7 +33,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -60,7 +59,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/actions.mps
index 8cfe40ffd3..b1a2b65870 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/actions.mps
@@ -59,7 +59,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index eb6c7e9dba..7c43fa0a29 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -7,7 +7,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" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -103,7 +103,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_" />
@@ -179,7 +179,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -256,7 +256,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -285,7 +285,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">
@@ -322,6 +322,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="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" />
@@ -498,7 +499,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">
@@ -562,7 +563,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -914,7 +914,7 @@
                         <node concept="2OqwBi" id="62HIBxktG4O" role="3uHU7B">
                           <node concept="2OqwBi" id="15gN1OJYwA5" role="2Oq$k0">
                             <node concept="37vLTw" id="15gN1OJYwA6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="15gN1OJYwAa" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174b" />
                             </node>
                             <node concept="2yIwOk" id="62HIBxktDw3" role="2OqNvi" />
                           </node>
@@ -925,9 +925,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="15gN1OJYwAa" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174b" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="15gN1OJYwAb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174c" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -963,7 +963,7 @@
                         <node concept="2OqwBi" id="62HIBxktV07" role="3uHU7B">
                           <node concept="2OqwBi" id="62HIBxktV08" role="2Oq$k0">
                             <node concept="37vLTw" id="62HIBxktV09" role="2Oq$k0">
-                              <ref role="3cqZAo" node="62HIBxktTPH" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174d" />
                             </node>
                             <node concept="2yIwOk" id="62HIBxktV0a" role="2OqNvi" />
                           </node>
@@ -974,9 +974,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="62HIBxktTPH" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174d" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="62HIBxktTPI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174e" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1033,7 +1033,7 @@
                             <node concept="2OqwBi" id="4Rn$FX8dv4u" role="3uHU7B">
                               <node concept="2OqwBi" id="4Rn$FX8d9p0" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Rn$FX8d912" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4Rn$FX8d8N_" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8174f" />
                                 </node>
                                 <node concept="2yIwOk" id="4Rn$FX8dkxh" role="2OqNvi" />
                               </node>
@@ -1044,9 +1044,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4Rn$FX8d8N_" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8174f" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4Rn$FX8d8NA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8174g" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1083,7 +1083,7 @@
                         <node concept="2OqwBi" id="2qNvObDoIq$" role="3fr31v">
                           <node concept="2OqwBi" id="2qNvObDoIq_" role="2Oq$k0">
                             <node concept="37vLTw" id="2qNvObDoIqA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="15gN1OKc75y" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174h" />
                             </node>
                             <node concept="2yIwOk" id="2qNvObDoIqB" role="2OqNvi" />
                           </node>
@@ -1096,9 +1096,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="15gN1OKc75y" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174h" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="15gN1OKc75z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1127,7 +1127,7 @@
                               <ref role="cht4Q" to="hm2y:6sdnDbSla17" resolve="Expression" />
                             </node>
                             <node concept="37vLTw" id="2qNvObDoD_y" role="1m5AlR">
-                              <ref role="3cqZAo" node="15gN1OKceg7" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174j" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="2qNvObDoD_z" role="2OqNvi">
@@ -1160,9 +1160,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="15gN1OKceg7" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174j" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="15gN1OKceg8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174k" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1838,7 +1838,7 @@
                         <node concept="3fqX7Q" id="6iqfHNBQFE5" role="3clFbG">
                           <node concept="2OqwBi" id="6iqfHNBQFON" role="3fr31v">
                             <node concept="37vLTw" id="6iqfHNBQFIP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6iqfHNBQFzG" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174l" />
                             </node>
                             <node concept="2qgKlT" id="6iqfHNBQFXt" role="2OqNvi">
                               <ref role="37wK5l" node="6iqfHNBQFh1" resolve="hideInStack" />
@@ -1847,9 +1847,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6iqfHNBQFzG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8174l" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6iqfHNBQFzH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8174m" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1860,7 +1860,7 @@
                     <node concept="3clFbF" id="6iqfHNBPq32" role="3cqZAp">
                       <node concept="2OqwBi" id="6iqfHNBPq6l" role="3clFbG">
                         <node concept="37vLTw" id="6iqfHNBPq31" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6iqfHNBPq0L" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174n" />
                         </node>
                         <node concept="2qgKlT" id="6iqfHNBPqaW" role="2OqNvi">
                           <ref role="37wK5l" node="6iqfHNBPkjP" resolve="asString" />
@@ -1868,9 +1868,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6iqfHNBPq0L" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174n" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6iqfHNBPq0M" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174o" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1899,7 +1899,7 @@
                   <node concept="3clFbF" id="6iqfHNBPrqt" role="3cqZAp">
                     <node concept="3cpWs3" id="6iqfHNBPrMM" role="3clFbG">
                       <node concept="37vLTw" id="6iqfHNBPrMT" role="3uHU7w">
-                        <ref role="3cqZAo" node="6iqfHNBPreW" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8174p" />
                       </node>
                       <node concept="3cpWs3" id="6iqfHNBPstl" role="3uHU7B">
                         <node concept="37vLTw" id="6iqfHNBPswV" role="3uHU7w">
@@ -1921,9 +1921,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="17QB3L" id="6iqfHNBPrm6" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="6iqfHNBPreW" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174p" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6iqfHNBPreX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174q" role="1tU5fm" />
                 </node>
               </node>
               <node concept="Xl_RD" id="6iqfHNBPrhL" role="1MDeny">
@@ -3445,7 +3445,7 @@
                         <node concept="10Nm6u" id="3kzwyUOCajC" role="3uHU7w" />
                         <node concept="2OqwBi" id="3kzwyUOCajD" role="3uHU7B">
                           <node concept="37vLTw" id="3kzwyUOCajE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3kzwyUOCajI" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174r" />
                           </node>
                           <node concept="2Xjw5R" id="3kzwyUOCajF" role="2OqNvi">
                             <node concept="1xMEDy" id="3kzwyUOCajG" role="1xVPHs">
@@ -3458,9 +3458,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3kzwyUOCajI" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174r" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3kzwyUOCajJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174s" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3485,7 +3485,7 @@
                       <node concept="22lmx$" id="3kzwyUOBp53" role="3clFbG">
                         <node concept="2OqwBi" id="3kzwyUOBpdW" role="3uHU7w">
                           <node concept="37vLTw" id="3kzwyUOBp9B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3kzwyUOBoHL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174t" />
                           </node>
                           <node concept="1mIQ4w" id="3kzwyUOBplp" role="2OqNvi">
                             <node concept="chp4Y" id="3kzwyUOBppp" role="cj9EA">
@@ -3495,7 +3495,7 @@
                         </node>
                         <node concept="2OqwBi" id="3kzwyUOBoOx" role="3uHU7B">
                           <node concept="37vLTw" id="3kzwyUOBoL0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3kzwyUOBoHL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174t" />
                           </node>
                           <node concept="1mIQ4w" id="3kzwyUOBoUd" role="2OqNvi">
                             <node concept="chp4Y" id="3kzwyUOBoYi" role="cj9EA">
@@ -3506,9 +3506,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3kzwyUOBoHL" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174t" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3kzwyUOBoHM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174u" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5922,13 +5922,13 @@
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
                           <ref role="37wK5l" to="wyt6:~Character.isAlphabetic(int)" resolve="isAlphabetic" />
                           <node concept="37vLTw" id="4iVHBBBBfJn" role="37wK5m">
-                            <ref role="3cqZAo" node="4iVHBBBBf7L" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174v" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="4iVHBBBBfby" role="3clFbx">
                           <node concept="3cpWs6" id="4iVHBBBBfN7" role="3cqZAp">
                             <node concept="37vLTw" id="4iVHBBBBfQ4" role="3cqZAk">
-                              <ref role="3cqZAo" node="4iVHBBBBf7L" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174v" />
                             </node>
                           </node>
                         </node>
@@ -5938,13 +5938,13 @@
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
                           <ref role="37wK5l" to="wyt6:~Character.isDigit(char)" resolve="isDigit" />
                           <node concept="37vLTw" id="4iVHBBBBfYI" role="37wK5m">
-                            <ref role="3cqZAo" node="4iVHBBBBf7L" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174v" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="4iVHBBBBfTX" role="3clFbx">
                           <node concept="3cpWs6" id="4iVHBBBBfTY" role="3cqZAp">
                             <node concept="37vLTw" id="4iVHBBBBfTZ" role="3cqZAk">
-                              <ref role="3cqZAo" node="4iVHBBBBf7L" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174v" />
                             </node>
                           </node>
                         </node>
@@ -5955,9 +5955,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4iVHBBBBf7L" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8174v" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4iVHBBBBf7M" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8174w" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5992,7 +5992,7 @@
                   <node concept="3clFbF" id="46cplYwxyje" role="3cqZAp">
                     <node concept="2OqwBi" id="46cplYwxytG" role="3clFbG">
                       <node concept="37vLTw" id="46cplYwxyjd" role="2Oq$k0">
-                        <ref role="3cqZAo" node="46cplYwxybU" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8174x" />
                       </node>
                       <node concept="2qgKlT" id="46cplYwxyHO" role="2OqNvi">
                         <ref role="37wK5l" node="46cplYwxrWE" resolve="canBeSimplified" />
@@ -6000,9 +6000,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="46cplYwxybU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174x" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="46cplYwxybV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6035,7 +6035,7 @@
                     <node concept="3clFbF" id="46cplYwxFDl" role="3cqZAp">
                       <node concept="2OqwBi" id="46cplYwxFOG" role="3clFbG">
                         <node concept="37vLTw" id="46cplYwxFDk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="46cplYwxFD8" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174z" />
                         </node>
                         <node concept="2qgKlT" id="46cplYwxFZ6" role="2OqNvi">
                           <ref role="37wK5l" node="46cplYwxrWE" resolve="canBeSimplified" />
@@ -6043,9 +6043,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="46cplYwxFD8" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174z" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="46cplYwxFD9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6056,7 +6056,7 @@
                   <node concept="3clFbF" id="46cplYwxBqb" role="3cqZAp">
                     <node concept="2OqwBi" id="46cplYwxBxy" role="3clFbG">
                       <node concept="37vLTw" id="46cplYwxBqa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="46cplYwxBnA" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8174_" />
                       </node>
                       <node concept="2qgKlT" id="46cplYwxGdC" role="2OqNvi">
                         <ref role="37wK5l" node="46cplYwxszL" resolve="simplify" />
@@ -6064,9 +6064,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="46cplYwxBnA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="46cplYwxBnB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174A" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6491,29 +6491,29 @@
                             <node concept="3clFbF" id="46cplYwP99x" role="3cqZAp">
                               <node concept="2OqwBi" id="46cplYwP9nQ" role="3clFbG">
                                 <node concept="37vLTw" id="46cplYwP99w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="46cplYwP3Lx" resolve="mine" />
+                                  <ref role="3cqZAo" node="4z0AnX8174D" />
                                 </node>
                                 <node concept="2qgKlT" id="46cplYwP9NE" role="2OqNvi">
                                   <ref role="37wK5l" node="69zaTr1Z8aS" resolve="isSameAs" />
                                   <node concept="37vLTw" id="46cplYwPa11" role="37wK5m">
-                                    <ref role="3cqZAo" node="46cplYwP8iv" resolve="theirs" />
+                                    <ref role="3cqZAo" node="4z0AnX8174B" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="46cplYwP8iv" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8174B" role="1bW2Oz">
                             <property role="TrG5h" value="theirs" />
-                            <node concept="2jxLKc" id="46cplYwP8iw" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8174C" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="46cplYwP3Lx" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174D" role="1bW2Oz">
                   <property role="TrG5h" value="mine" />
-                  <node concept="2jxLKc" id="46cplYwP3Ly" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174E" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7287,7 +7287,7 @@
                   <node concept="3clFbF" id="12WRc298INQ" role="3cqZAp">
                     <node concept="2OqwBi" id="12WRc298INR" role="3clFbG">
                       <node concept="37vLTw" id="12WRc298INS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="12WRc298INU" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8174F" />
                       </node>
                       <node concept="2qgKlT" id="12WRc298INT" role="2OqNvi">
                         <ref role="37wK5l" node="69zaTr1W0u$" resolve="isGeneric" />
@@ -7295,9 +7295,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="12WRc298INU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174F" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="12WRc298INV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174G" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7329,7 +7329,7 @@
                         <node concept="10Nm6u" id="18$bUx5HNxa" role="3uHU7w" />
                         <node concept="2OqwBi" id="18$bUx5HMCz" role="3uHU7B">
                           <node concept="37vLTw" id="18$bUx5HMuJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="12WRc298JBA" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174H" />
                           </node>
                           <node concept="3TrEf2" id="18$bUx5HMWE" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7340,7 +7340,7 @@
                         <node concept="2OqwBi" id="12WRc298Ktn" role="2Oq$k0">
                           <node concept="2OqwBi" id="12WRc298KhF" role="2Oq$k0">
                             <node concept="37vLTw" id="12WRc298KeD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="12WRc298JBA" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174H" />
                             </node>
                             <node concept="3TrEf2" id="12WRc298Kmz" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7360,9 +7360,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="12WRc298JBA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174H" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="12WRc298JBB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174I" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7444,13 +7444,13 @@
                                   <node concept="3clFbF" id="6SpoPQgScYL" role="3cqZAp">
                                     <node concept="2OqwBi" id="6SpoPQgScYM" role="3clFbG">
                                       <node concept="37vLTw" id="6SpoPQgScYN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6SpoPQgScYU" resolve="el" />
+                                        <ref role="3cqZAo" node="4z0AnX8174L" />
                                       </node>
                                       <node concept="2qgKlT" id="6SpoPQgScYO" role="2OqNvi">
                                         <ref role="37wK5l" node="69zaTr1Z8aS" resolve="isSameAs" />
                                         <node concept="2OqwBi" id="6SpoPQgScYP" role="37wK5m">
                                           <node concept="37vLTw" id="6SpoPQgScYQ" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6SpoPQgScYS" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8174J" />
                                           </node>
                                           <node concept="3TrEf2" id="6SpoPQgScYR" role="2OqNvi">
                                             <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7460,9 +7460,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6SpoPQgScYS" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8174J" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6SpoPQgScYT" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8174K" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -7470,9 +7470,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6SpoPQgScYU" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8174L" role="1bW2Oz">
                       <property role="TrG5h" value="el" />
-                      <node concept="2jxLKc" id="6SpoPQgScYV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8174M" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7993,7 +7993,7 @@
                         <node concept="3cpWs3" id="6iqfHNCeTjJ" role="3uHU7B">
                           <node concept="2OqwBi" id="6iqfHNCeT7p" role="3uHU7B">
                             <node concept="37vLTw" id="6iqfHNCeT3V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6iqfHNCeSWu" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174N" />
                             </node>
                             <node concept="3TrcHB" id="6iqfHNCeTcV" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8010,9 +8010,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6iqfHNCeSWu" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174N" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6iqfHNCeSWv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174O" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9858,7 +9858,7 @@
                     <node concept="3clFbF" id="7S4tmubFocB" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubFoqU" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubFocA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubFo3g" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174P" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubFoD9" role="2OqNvi">
                           <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -9866,9 +9866,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubFo3g" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174P" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubFo3h" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174Q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10066,7 +10066,7 @@
                     <node concept="3clFbF" id="6ovbtsiVf4Z" role="3cqZAp">
                       <node concept="2OqwBi" id="6ovbtsiVf8F" role="3clFbG">
                         <node concept="37vLTw" id="6ovbtsiVf4Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6ovbtsiVf2J" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174R" />
                         </node>
                         <node concept="2qgKlT" id="6ovbtsiVfhh" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -10074,9 +10074,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6ovbtsiVf2J" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174R" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6ovbtsiVf2K" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174S" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10162,7 +10162,7 @@
                     <node concept="3clFbF" id="5L2mTKmBl3J" role="3cqZAp">
                       <node concept="2OqwBi" id="5L2mTKmBlgS" role="3clFbG">
                         <node concept="37vLTw" id="5L2mTKmBl3I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5L2mTKmBkSp" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174T" />
                         </node>
                         <node concept="2qgKlT" id="5L2mTKmBlCy" role="2OqNvi">
                           <ref role="37wK5l" node="fIXgjlt4VE" resolve="isSameAs" />
@@ -10178,7 +10178,7 @@
                             <node concept="34jXtK" id="5L2mTKmBrKD" role="2OqNvi">
                               <node concept="2OqwBi" id="5L2mTKmBsce" role="25WWJ7">
                                 <node concept="37vLTw" id="5L2mTKmBrZs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5L2mTKmBkSp" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8174T" />
                                 </node>
                                 <node concept="2bSWHS" id="5L2mTKmBsGv" role="2OqNvi" />
                               </node>
@@ -10188,9 +10188,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5L2mTKmBkSp" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174T" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5L2mTKmBkSq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8174U" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10316,7 +10316,7 @@
                             <ref role="cht4Q" to="hm2y:aPhVmWYjmk" resolve="ICanBeLValue" />
                           </node>
                           <node concept="37vLTw" id="7b6J31DlyQw" role="1m5AlR">
-                            <ref role="3cqZAo" node="7b6J31Dlxkp" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8174V" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="7b6J31Dl_1D" role="2OqNvi">
@@ -10325,7 +10325,7 @@
                       </node>
                       <node concept="2OqwBi" id="7b6J31DlxxD" role="3uHU7B">
                         <node concept="37vLTw" id="7b6J31Dlxkw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7b6J31Dlxkp" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174V" />
                         </node>
                         <node concept="1mIQ4w" id="7b6J31Dlyaj" role="2OqNvi">
                           <node concept="chp4Y" id="7b6J31DlykY" role="cj9EA">
@@ -10336,9 +10336,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7b6J31Dlxkp" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174V" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7b6J31Dlxkq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174W" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10516,7 +10516,7 @@
                       <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                       <node concept="2OqwBi" id="3kzwyUOCVGN" role="37wK5m">
                         <node concept="37vLTw" id="3kzwyUOCVBC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1OStjV1GqcN" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8174X" />
                         </node>
                         <node concept="3TrEf2" id="3kzwyUOCVVb" role="2OqNvi">
                           <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -10525,9 +10525,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1OStjV1GqcN" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8174X" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1OStjV1GqcO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8174Y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10593,7 +10593,7 @@
                           <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                           <node concept="2OqwBi" id="3kzwyUOCY1U" role="37wK5m">
                             <node concept="37vLTw" id="3kzwyUOCY1V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="71dSyJVqNil" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8174Z" />
                             </node>
                             <node concept="3TrEf2" id="3kzwyUOCY1W" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -10603,9 +10603,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="71dSyJVqNil" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8174Z" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="71dSyJVqNim" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81750" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10759,7 +10759,7 @@
                         <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                         <node concept="2OqwBi" id="3kzwyUOCWya" role="37wK5m">
                           <node concept="37vLTw" id="3kzwyUOCWrY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="71dSyJVqLn1" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81751" />
                           </node>
                           <node concept="3TrEf2" id="3kzwyUOCWIf" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -10768,9 +10768,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="71dSyJVqLn1" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81751" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="71dSyJVqLn2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81752" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11129,7 +11129,7 @@
                       <node concept="TSZUe" id="21vB0Vz3U6a" role="2OqNvi">
                         <node concept="2OqwBi" id="21vB0Vz3UCx" role="25WWJ7">
                           <node concept="37vLTw" id="21vB0Vz3Ujv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="21vB0Vz3IOL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81753" />
                           </node>
                           <node concept="3TrEf2" id="21vB0Vz3Vjf" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -11146,7 +11146,7 @@
                       <node concept="TSZUe" id="21vB0Vz3V$E" role="2OqNvi">
                         <node concept="2OqwBi" id="21vB0Vz3V$F" role="25WWJ7">
                           <node concept="37vLTw" id="21vB0Vz3V$G" role="2Oq$k0">
-                            <ref role="3cqZAo" node="21vB0Vz3IOL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81753" />
                           </node>
                           <node concept="3TrEf2" id="21vB0Vz3WpS" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpK" resolve="then" />
@@ -11161,9 +11161,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="21vB0Vz3IOL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81753" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="21vB0Vz3IOM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81754" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11568,7 +11568,7 @@
                             <node concept="2OqwBi" id="5fy$GmV7qoH" role="25WWJ7">
                               <node concept="2OqwBi" id="5fy$GmV7qoI" role="2Oq$k0">
                                 <node concept="37vLTw" id="5fy$GmV7DAE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5fy$GmV7Ari" resolve="alternative" />
+                                  <ref role="3cqZAo" node="4z0AnX81755" />
                                 </node>
                                 <node concept="3TrEf2" id="5fy$GmV7Efv" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -11582,7 +11582,7 @@
                     </node>
                     <node concept="17R0WA" id="5fy$GmV7qoM" role="3clFbw">
                       <node concept="37vLTw" id="5fy$GmV7Dez" role="3uHU7w">
-                        <ref role="3cqZAo" node="5fy$GmV7Ari" resolve="alternative" />
+                        <ref role="3cqZAo" node="4z0AnX81755" />
                       </node>
                       <node concept="1y4W85" id="5fy$GmV7qoQ" role="3uHU7B">
                         <node concept="3cpWsd" id="5fy$GmV7qoR" role="1y58nS">
@@ -11600,9 +11600,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5fy$GmV7Ari" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81755" role="1bW2Oz">
                   <property role="TrG5h" value="alternative" />
-                  <node concept="2jxLKc" id="5fy$GmV7Arj" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81756" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11738,7 +11738,7 @@
                         <node concept="10Nm6u" id="4j3DGEk4mLG" role="3uHU7w" />
                         <node concept="2OqwBi" id="4j3DGEk4mLH" role="3uHU7B">
                           <node concept="37vLTw" id="4j3DGEk4mLI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4j3DGEk4mLM" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81757" />
                           </node>
                           <node concept="2Xjw5R" id="4j3DGEk4mLJ" role="2OqNvi">
                             <node concept="1xMEDy" id="4j3DGEk4mLK" role="1xVPHs">
@@ -11751,9 +11751,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4j3DGEk4mLM" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81757" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4j3DGEk4mLN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81758" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11778,7 +11778,7 @@
                       <node concept="22lmx$" id="4j3DGEk4mLZ" role="3clFbG">
                         <node concept="2OqwBi" id="4j3DGEk4mM0" role="3uHU7w">
                           <node concept="37vLTw" id="4j3DGEk4mM1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4j3DGEk4mM8" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81759" />
                           </node>
                           <node concept="1mIQ4w" id="4j3DGEk4mM2" role="2OqNvi">
                             <node concept="chp4Y" id="4j3DGEk4mM3" role="cj9EA">
@@ -11788,7 +11788,7 @@
                         </node>
                         <node concept="2OqwBi" id="4j3DGEk4mM4" role="3uHU7B">
                           <node concept="37vLTw" id="4j3DGEk4mM5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4j3DGEk4mM8" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX81759" />
                           </node>
                           <node concept="1mIQ4w" id="4j3DGEk4mM6" role="2OqNvi">
                             <node concept="chp4Y" id="4j3DGEk4mM7" role="cj9EA">
@@ -11799,9 +11799,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4j3DGEk4mM8" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81759" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4j3DGEk4mM9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175a" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13507,15 +13507,15 @@
                         <node concept="3clFbF" id="ucawTYeNHQ" role="3cqZAp">
                           <node concept="2OqwBi" id="ucawTYeNHR" role="3clFbG">
                             <node concept="37vLTw" id="ucawTYeNHS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="ucawTYeNHU" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175b" />
                             </node>
                             <node concept="2yIwOk" id="ucawTYeNHT" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="ucawTYeNHU" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8175b" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="ucawTYeNHV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8175c" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -15290,15 +15290,15 @@
                         </node>
                         <node concept="3JPx81" id="6SpoPQg9MV5" role="2OqNvi">
                           <node concept="37vLTw" id="6SpoPQg9NjU" role="25WWJ7">
-                            <ref role="3cqZAo" node="6SpoPQg9JK9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8175d" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6SpoPQg9JK9" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175d" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6SpoPQg9JKa" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175e" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -15459,16 +15459,16 @@
                           </node>
                           <node concept="3JPx81" id="6SpoPQgaRwH" role="2OqNvi">
                             <node concept="37vLTw" id="6SpoPQgaRwI" role="25WWJ7">
-                              <ref role="3cqZAo" node="6SpoPQgaRwJ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175f" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6SpoPQgaRwJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175f" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6SpoPQgaRwK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175g" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -16279,7 +16279,7 @@
                             <ref role="37wK5l" node="5DizcGOb6ar" resolve="getNodeCoverage" />
                             <ref role="1Pybhc" node="4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                             <node concept="37vLTw" id="3$EgSSy1dHF" role="37wK5m">
-                              <ref role="3cqZAo" node="3$EgSSy1aLq" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175h" />
                             </node>
                           </node>
                         </node>
@@ -16300,9 +16300,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3$EgSSy1aLq" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8175h" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3$EgSSy1aLr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8175i" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -16313,7 +16313,7 @@
                     <node concept="3clFbF" id="3$EgSSy1fK$" role="3cqZAp">
                       <node concept="3cpWs3" id="3$EgSSy1gAS" role="3clFbG">
                         <node concept="37vLTw" id="3$EgSSy1gGd" role="3uHU7w">
-                          <ref role="3cqZAo" node="3$EgSSy1fk_" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175j" />
                         </node>
                         <node concept="37vLTw" id="3$EgSSy1fKz" role="3uHU7B">
                           <ref role="3cqZAo" node="3$EgSSy1fkz" resolve="total" />
@@ -16325,9 +16325,9 @@
                     <property role="TrG5h" value="total" />
                     <node concept="10Oyi0" id="3$EgSSy1fsq" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="3$EgSSy1fk_" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175j" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3$EgSSy1fkA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175k" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="3cmrfG" id="3$EgSSy1fr1" role="1MDeny">
@@ -16435,21 +16435,21 @@
                                   <node concept="1rXfSq" id="3tZgM5CPUfZ" role="3uHU7w">
                                     <ref role="37wK5l" node="1WlYLwX3UOV" resolve="isNodePartiallyCovered" />
                                     <node concept="37vLTw" id="3tZgM5CPVp$" role="37wK5m">
-                                      <ref role="3cqZAo" node="3$EgSSy0Ecf" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8175l" />
                                     </node>
                                   </node>
                                   <node concept="1rXfSq" id="3$EgSSy0Ecd" role="3uHU7B">
                                     <ref role="37wK5l" node="1WlYLwX3McV" resolve="isNodeCovered" />
                                     <node concept="37vLTw" id="3$EgSSy0Ece" role="37wK5m">
-                                      <ref role="3cqZAo" node="3$EgSSy0Ecf" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8175l" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3$EgSSy0Ecf" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8175l" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3$EgSSy0Ecg" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8175m" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -16570,7 +16570,7 @@
                         <node concept="3fqX7Q" id="3xi1F8S2Yi6" role="3uHU7w">
                           <node concept="2OqwBi" id="3xi1F8S2Yi8" role="3fr31v">
                             <node concept="37vLTw" id="3xi1F8S2Yi9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3$EgSSy1cE$" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175n" />
                             </node>
                             <node concept="1mIQ4w" id="3xi1F8S2Yia" role="2OqNvi">
                               <node concept="chp4Y" id="3xi1F8S2Yib" role="cj9EA">
@@ -16583,7 +16583,7 @@
                           <node concept="3fqX7Q" id="3$EgSSy1cEv" role="3uHU7B">
                             <node concept="2OqwBi" id="3$EgSSy1cEw" role="3fr31v">
                               <node concept="37vLTw" id="3$EgSSy1cEx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3$EgSSy1cE$" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175n" />
                               </node>
                               <node concept="1mIQ4w" id="3$EgSSy1cEy" role="2OqNvi">
                                 <node concept="chp4Y" id="3$EgSSy1cEz" role="cj9EA">
@@ -16595,7 +16595,7 @@
                           <node concept="3fqX7Q" id="3$EgSSy1cEq" role="3uHU7w">
                             <node concept="2OqwBi" id="3$EgSSy1cEr" role="3fr31v">
                               <node concept="37vLTw" id="3$EgSSy1cEs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3$EgSSy1cE$" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175n" />
                               </node>
                               <node concept="1mIQ4w" id="3$EgSSy1cEt" role="2OqNvi">
                                 <node concept="chp4Y" id="3$EgSSy1cEu" role="cj9EA">
@@ -16608,9 +16608,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3$EgSSy1cE$" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175n" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3$EgSSy1cE_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175o" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -16660,7 +16660,7 @@
                           <ref role="37wK5l" node="5DizcGOb6ar" resolve="getNodeCoverage" />
                           <ref role="1Pybhc" node="4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="1ly2$GYp0Q0" role="37wK5m">
-                            <ref role="3cqZAo" node="1ly2$GYp0lf" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8175p" />
                           </node>
                         </node>
                       </node>
@@ -16696,9 +16696,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1ly2$GYp0lf" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175p" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1ly2$GYp0lg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -18068,15 +18068,15 @@
                               <node concept="liA8E" id="7ezRWquoMTm" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                 <node concept="37vLTw" id="7ezRWquoMTn" role="37wK5m">
-                                  <ref role="3cqZAo" node="7ezRWquoMTo" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8175r" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7ezRWquoMTo" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8175r" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7ezRWquoMTp" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8175s" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -18138,7 +18138,7 @@
                     <node concept="3fqX7Q" id="6SpoPQgxnfd" role="3clFbG">
                       <node concept="2OqwBi" id="6SpoPQgxnPN" role="3fr31v">
                         <node concept="37vLTw" id="6SpoPQgxn_O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6SpoPQgvcO3" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175t" />
                         </node>
                         <node concept="liA8E" id="6SpoPQgxoiK" role="2OqNvi">
                           <ref role="37wK5l" node="6SpoPQg9EIA" resolve="isComplete" />
@@ -18147,9 +18147,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6SpoPQgvcO3" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175t" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6SpoPQgvcO4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175u" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -18173,7 +18173,7 @@
                     <node concept="3fqX7Q" id="7ezRWqupsBW" role="3clFbG">
                       <node concept="2OqwBi" id="7ezRWqupsBX" role="3fr31v">
                         <node concept="37vLTw" id="7ezRWqupsBY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7ezRWqupsC0" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175v" />
                         </node>
                         <node concept="liA8E" id="7ezRWqupsBZ" role="2OqNvi">
                           <ref role="37wK5l" node="6SpoPQg9EIA" resolve="isComplete" />
@@ -18182,9 +18182,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7ezRWqupsC0" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175v" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7ezRWqupsC1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175w" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -18245,7 +18245,7 @@
                       </node>
                       <node concept="3EllGN" id="7ezRWqupT1t" role="33vP2m">
                         <node concept="37vLTw" id="7ezRWqupT1u" role="3ElVtu">
-                          <ref role="3cqZAo" node="7ezRWqupT1F" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175x" />
                         </node>
                         <node concept="37vLTw" id="7ezRWqupT1v" role="3ElQJh">
                           <ref role="3cqZAo" node="7ezRWqukLIn" resolve="visitedConcepts" />
@@ -18266,7 +18266,7 @@
                           <node concept="1pGfFk" id="7ezRWqupT1B" role="2ShVmc">
                             <ref role="37wK5l" node="6SpoPQgawRU" resolve="DefaultCoverageAnalyzer.ConceptData" />
                             <node concept="37vLTw" id="7ezRWqupT1C" role="37wK5m">
-                              <ref role="3cqZAo" node="7ezRWqupT1F" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175x" />
                             </node>
                           </node>
                         </node>
@@ -18279,9 +18279,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7ezRWqupT1F" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175x" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7ezRWqupT1G" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -18521,14 +18521,14 @@
                         <node concept="1rXfSq" id="7ezRWqus_xN" role="3clFbG">
                           <ref role="37wK5l" node="1WlYLwX1YJg" resolve="hasNodeCoverage" />
                           <node concept="37vLTw" id="7ezRWqus_xO" role="37wK5m">
-                            <ref role="3cqZAo" node="7ezRWqus_xP" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8175z" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7ezRWqus_xP" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8175z" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7ezRWqus_xQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8175$" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -19159,9 +19159,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7ezRWquxKzj" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175_" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7ezRWquxKzk" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175A" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19255,16 +19255,16 @@
                       <node concept="2Zo12i" id="7ezRWqux78k" role="2OqNvi">
                         <node concept="25Kdxt" id="7ezRWqux78l" role="2Zo12j">
                           <node concept="37vLTw" id="7ezRWqux78m" role="25KhWn">
-                            <ref role="3cqZAo" node="7ezRWqux78n" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8175B" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7ezRWqux78n" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175B" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7ezRWqux78o" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175C" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19378,16 +19378,16 @@
                         <node concept="2Zo12i" id="7ezRWquzgxC" role="2OqNvi">
                           <node concept="25Kdxt" id="7ezRWquzgxD" role="2Zo12j">
                             <node concept="37vLTw" id="7ezRWquzgxE" role="25KhWn">
-                              <ref role="3cqZAo" node="7ezRWquzgxF" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175D" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7ezRWquzgxF" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175D" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7ezRWquzgxG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175E" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -20177,15 +20177,15 @@
                         <node concept="3clFbF" id="7zqxZ9Kkkuq" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9KkkBg" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9Kkkup" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7zqxZ9Kkkq4" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175F" />
                             </node>
                             <node concept="2yIwOk" id="7zqxZ9KkkIM" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7zqxZ9Kkkq4" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8175F" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7zqxZ9Kkkq5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8175G" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -20429,7 +20429,7 @@
                           <node concept="2OqwBi" id="CrzyxmAR11" role="25WWJ7">
                             <node concept="2OqwBi" id="CrzyxmwJL8" role="2Oq$k0">
                               <node concept="37vLTw" id="CrzyxmwJvV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="CrzyxmwJe4" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175H" />
                               </node>
                               <node concept="2qgKlT" id="CrzyxmwK2L" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
@@ -20441,9 +20441,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="CrzyxmwJe4" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175H" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="CrzyxmwJe5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175I" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -20493,7 +20493,7 @@
                           <node concept="2OqwBi" id="5s_Nuat8VKA" role="25WWJ7">
                             <node concept="2OqwBi" id="5s_Nuat8VKB" role="2Oq$k0">
                               <node concept="37vLTw" id="5s_Nuat8VKC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5s_Nuat7xva" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175J" />
                               </node>
                               <node concept="2qgKlT" id="5s_Nuat8VKD" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
@@ -20505,9 +20505,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5s_Nuat7xva" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175J" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5s_Nuat7xvb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175K" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -20723,7 +20723,7 @@
                         <node concept="3clFbF" id="58jTitRqpwC" role="3cqZAp">
                           <node concept="2OqwBi" id="58jTitRqwh3" role="3clFbG">
                             <node concept="37vLTw" id="58jTitRqpwB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="58jTitRqprJ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175L" />
                             </node>
                             <node concept="3TrcHB" id="58jTitRqAVm" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -20731,9 +20731,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="58jTitRqprJ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8175L" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="58jTitRqprK" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8175M" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -20749,7 +20749,7 @@
                           <node concept="3clFbF" id="58jTitRq3dM" role="3cqZAp">
                             <node concept="2OqwBi" id="58jTitRq7m0" role="3clFbG">
                               <node concept="37vLTw" id="58jTitRq3dL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="58jTitRq2ZP" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175N" />
                               </node>
                               <node concept="3TrcHB" id="58jTitRqc6B" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -20757,9 +20757,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="58jTitRq2ZP" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8175N" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="58jTitRq2ZQ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8175O" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -20955,16 +20955,16 @@
                           </node>
                           <node concept="3JPx81" id="4XlPKepad0j" role="2OqNvi">
                             <node concept="37vLTw" id="4XlPKepad0k" role="25WWJ7">
-                              <ref role="3cqZAo" node="4XlPKepad0l" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175P" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4XlPKepad0l" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175P" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4XlPKepad0m" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175Q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -21019,16 +21019,16 @@
                           </node>
                           <node concept="3JPx81" id="5s_NuasTldb" role="2OqNvi">
                             <node concept="37vLTw" id="5s_NuasTldc" role="25WWJ7">
-                              <ref role="3cqZAo" node="5s_NuasTldd" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175R" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5s_NuasTldd" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8175R" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5s_NuasTlde" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8175S" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -21081,7 +21081,7 @@
                         <node concept="3clFbF" id="7zqxZ9KlmN0" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9Kln31" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9KlmMZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7zqxZ9Klmz_" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175T" />
                             </node>
                             <node concept="liA8E" id="7zqxZ9Klnh_" role="2OqNvi">
                               <ref role="37wK5l" node="7zqxZ9KkaYF" resolve="heterogeneity" />
@@ -21089,9 +21089,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7zqxZ9Klmz_" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8175T" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7zqxZ9KlmzA" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8175U" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="7zqxZ9KlmzB" role="2S7zOq">
@@ -21148,7 +21148,7 @@
                         <node concept="3clFbF" id="7zqxZ9Klupb" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9Klupc" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9Klupd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7zqxZ9Klupf" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8175V" />
                             </node>
                             <node concept="liA8E" id="7zqxZ9Klupe" role="2OqNvi">
                               <ref role="37wK5l" node="7zqxZ9KkaYF" resolve="heterogeneity" />
@@ -21156,9 +21156,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7zqxZ9Klupf" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8175V" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7zqxZ9Klupg" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8175W" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="7zqxZ9Kluph" role="2S7zOq">
@@ -21699,7 +21699,7 @@
                     <node concept="22lmx$" id="Crzyxmxyy1" role="3clFbG">
                       <node concept="2OqwBi" id="Crzyxmxs6l" role="3uHU7B">
                         <node concept="37vLTw" id="Crzyxmxs6m" role="2Oq$k0">
-                          <ref role="3cqZAo" node="CrzyxmxvLg" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175X" />
                         </node>
                         <node concept="liA8E" id="Crzyxmxs6n" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -21710,15 +21710,15 @@
                           <ref role="3uigEE" to="c17a:~SInterfaceConcept" resolve="SInterfaceConcept" />
                         </node>
                         <node concept="37vLTw" id="CrzyxmxsXV" role="2ZW6bz">
-                          <ref role="3cqZAo" node="CrzyxmxvLg" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8175X" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="CrzyxmxvLg" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8175X" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="CrzyxmxvLh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8175Y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -21756,7 +21756,7 @@
                             </node>
                             <node concept="2OqwBi" id="Crzyxm_MT0" role="10QFUP">
                               <node concept="37vLTw" id="Crzyxm_MT1" role="2Oq$k0">
-                                <ref role="3cqZAo" node="CrzyxmwQA$" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8175Z" />
                               </node>
                               <node concept="liA8E" id="Crzyxm_MT2" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SLanguage.getConcepts()" resolve="getConcepts" />
@@ -21766,9 +21766,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="CrzyxmwQA$" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8175Z" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="CrzyxmwQA_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX81760" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -21788,30 +21788,30 @@
                                 <node concept="3fqX7Q" id="Crzyxmx9dr" role="3clFbG">
                                   <node concept="2OqwBi" id="Crzyxmx9dt" role="3fr31v">
                                     <node concept="37vLTw" id="Crzyxmx9du" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="Crzyxmx0cg" resolve="c" />
+                                      <ref role="3cqZAo" node="4z0AnX81763" />
                                     </node>
                                     <node concept="liA8E" id="Crzyxmx9dv" role="2OqNvi">
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                       <node concept="37vLTw" id="Crzyxmx9dw" role="37wK5m">
-                                        <ref role="3cqZAo" node="Crzyxmx8lh" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX81761" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="Crzyxmx8lh" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX81761" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="Crzyxmx8li" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX81762" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Crzyxmx0cg" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81763" role="1bW2Oz">
                     <property role="TrG5h" value="c" />
-                    <node concept="2jxLKc" id="Crzyxmx0ch" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81764" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -21844,7 +21844,7 @@
                     <node concept="3fqX7Q" id="5s_NuasVGlX" role="3clFbG">
                       <node concept="2OqwBi" id="5s_NuasVLdi" role="3fr31v">
                         <node concept="37vLTw" id="5s_NuasVGoa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5s_NuasVAj4" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81765" />
                         </node>
                         <node concept="liA8E" id="5s_NuasVRAG" role="2OqNvi">
                           <ref role="37wK5l" node="4XlPKepacYB" resolve="isComplete" />
@@ -21853,9 +21853,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5s_NuasVAj4" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81765" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5s_NuasVAj5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81766" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -21903,7 +21903,7 @@
                       </node>
                       <node concept="3EllGN" id="4XlPKepbC7I" role="33vP2m">
                         <node concept="37vLTw" id="4XlPKepbC7J" role="3ElVtu">
-                          <ref role="3cqZAo" node="4XlPKepbC7W" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81767" />
                         </node>
                         <node concept="37vLTw" id="4XlPKepbC7K" role="3ElQJh">
                           <ref role="3cqZAo" node="4XlPKepbqg6" resolve="visitedConcepts" />
@@ -21929,7 +21929,7 @@
                               <node concept="1pGfFk" id="4XlPKepbC7S" role="2ShVmc">
                                 <ref role="37wK5l" node="4XlPKepacXn" resolve="StructuralCoverageAnalyzer.StructureData" />
                                 <node concept="37vLTw" id="4XlPKepbC7T" role="37wK5m">
-                                  <ref role="3cqZAo" node="4XlPKepbC7W" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX81767" />
                                 </node>
                                 <node concept="37vLTw" id="CrzyxmA_za" role="37wK5m">
                                   <ref role="3cqZAo" node="CrzyxmA_6y" resolve="allRelevantConcepts" />
@@ -21942,7 +21942,7 @@
                           </node>
                           <node concept="3EllGN" id="5s_NuasWruK" role="37vLTJ">
                             <node concept="37vLTw" id="5s_NuasWrHC" role="3ElVtu">
-                              <ref role="3cqZAo" node="4XlPKepbC7W" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81767" />
                             </node>
                             <node concept="37vLTw" id="5s_NuasWr38" role="3ElQJh">
                               <ref role="3cqZAo" node="4XlPKepbqg6" resolve="visitedConcepts" />
@@ -21958,9 +21958,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4XlPKepbC7W" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81767" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4XlPKepbC7X" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81768" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -22269,7 +22269,7 @@
                         <node concept="3clFbF" id="74u6qanTl5$" role="3cqZAp">
                           <node concept="2OqwBi" id="74u6qanTlsg" role="3clFbG">
                             <node concept="37vLTw" id="74u6qanTl5z" role="2Oq$k0">
-                              <ref role="3cqZAo" node="74u6qanTkT1" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81769" />
                             </node>
                             <node concept="2qgKlT" id="74u6qanTlS0" role="2OqNvi">
                               <ref role="37wK5l" node="14gxgpJfXC0" resolve="shouldBeSubstituted" />
@@ -22277,9 +22277,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="74u6qanTkT1" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX81769" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="74u6qanTkT2" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8176a" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -22290,7 +22290,7 @@
                       <node concept="3clFbF" id="1xFBUnx0cEC" role="3cqZAp">
                         <node concept="2OqwBi" id="1xFBUnx0cED" role="3clFbG">
                           <node concept="37vLTw" id="1xFBUnx0cEE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1xFBUnx0cEG" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176b" />
                           </node>
                           <node concept="2qgKlT" id="1xFBUnx0cEF" role="2OqNvi">
                             <ref role="37wK5l" node="5GL30CqMVFo" resolve="getISSVariable" />
@@ -22298,9 +22298,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1xFBUnx0cEG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176b" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1xFBUnx0cEH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176c" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -22725,7 +22725,7 @@
                       <node concept="3clFbF" id="7VuYlCR4CbW" role="3cqZAp">
                         <node concept="2OqwBi" id="7VuYlCR4Cp_" role="3clFbG">
                           <node concept="37vLTw" id="7VuYlCR4CbV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7VuYlCR4CbJ" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176d" />
                           </node>
                           <node concept="2qgKlT" id="7VuYlCR4C_C" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -22733,9 +22733,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7VuYlCR4CbJ" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176d" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7VuYlCR4CbK" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176e" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -23135,7 +23135,7 @@
                             <ref role="cht4Q" to="hm2y:6JZACDWQJu4" resolve="ILiteral" />
                           </node>
                           <node concept="37vLTw" id="YcTL0uDGT" role="1m5AlR">
-                            <ref role="3cqZAo" node="YcTL0uCyA" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176f" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="3T40JVg5CS$" role="2OqNvi">
@@ -23144,7 +23144,7 @@
                       </node>
                       <node concept="2OqwBi" id="YcTL0uCOb" role="3uHU7B">
                         <node concept="37vLTw" id="YcTL0uCDA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="YcTL0uCyA" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176f" />
                         </node>
                         <node concept="1mIQ4w" id="YcTL0uCUD" role="2OqNvi">
                           <node concept="chp4Y" id="YcTL0uD2c" role="cj9EA">
@@ -23155,9 +23155,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="YcTL0uCyA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8176f" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="YcTL0uCyB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8176g" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -25631,7 +25631,7 @@
                     <node concept="3clFbF" id="6WstIz8HR3Z" role="3cqZAp">
                       <node concept="2OqwBi" id="6WstIz8HRje" role="3clFbG">
                         <node concept="37vLTw" id="6WstIz8HR3Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6WstIz8HQTK" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176h" />
                         </node>
                         <node concept="2qgKlT" id="6WstIz8HRDr" role="2OqNvi">
                           <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -25639,9 +25639,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6WstIz8HQTK" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176h" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6WstIz8HQTL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176i" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -26332,7 +26332,7 @@
                       <node concept="3clFbF" id="6SrPpX93C9I" role="3cqZAp">
                         <node concept="2OqwBi" id="6SrPpX93C9J" role="3clFbG">
                           <node concept="37vLTw" id="6SrPpX93C9K" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6SrPpX93C9M" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176j" />
                           </node>
                           <node concept="2qgKlT" id="6SrPpX93C9L" role="2OqNvi">
                             <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -26340,9 +26340,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6SrPpX93C9M" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176j" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6SrPpX93C9N" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176k" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -26458,7 +26458,7 @@
                             <node concept="3clFbC" id="jqB9UbF3rk" role="3clFbG">
                               <node concept="2OqwBi" id="jqB9UbF3rl" role="3uHU7B">
                                 <node concept="37vLTw" id="jqB9UbF3rm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="jqB9UbF3rp" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8176l" />
                                 </node>
                                 <node concept="1mfA1w" id="jqB9UbF3rn" role="2OqNvi" />
                               </node>
@@ -26466,9 +26466,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="jqB9UbF3rp" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8176l" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="jqB9UbF3rq" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8176m" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -26614,7 +26614,7 @@
                             <node concept="3clFbC" id="jqB9UdsEf6" role="3clFbG">
                               <node concept="2OqwBi" id="jqB9UdsEf7" role="3uHU7B">
                                 <node concept="37vLTw" id="jqB9UdsEf8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="jqB9UdsEfb" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8176n" />
                                 </node>
                                 <node concept="1mfA1w" id="jqB9UdsEf9" role="2OqNvi" />
                               </node>
@@ -26622,9 +26622,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="jqB9UdsEfb" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8176n" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="jqB9UdsEfc" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8176o" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
index 5d2feafbeb..3856bd61c6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
@@ -65,7 +65,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -92,6 +92,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -144,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -155,7 +156,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="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" />
@@ -242,7 +242,7 @@
                       <node concept="3clFbF" id="1F1F0IUZ_Y4" role="3cqZAp">
                         <node concept="2OqwBi" id="1F1F0IUZ_Y5" role="3clFbG">
                           <node concept="37vLTw" id="1F1F0IUZ_Y6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1F1F0IUZ_Y8" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176p" />
                           </node>
                           <node concept="2qgKlT" id="1F1F0IUZ_Y7" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:5ye9uPrkFwU" resolve="findTheSomeQueries" />
@@ -250,9 +250,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZ_Y8" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176p" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZ_Y9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176q" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -741,7 +741,7 @@
                         <node concept="3fqX7Q" id="1F1F0IUZ_Tq" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ_Tr" role="3fr31v">
                             <node concept="37vLTw" id="1F1F0IUZ_Ts" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1F1F0IUZ_Tv" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8176r" />
                             </node>
                             <node concept="1mIQ4w" id="1F1F0IUZ_Tt" role="2OqNvi">
                               <node concept="chp4Y" id="1F1F0IUZ_Tu" role="cj9EA">
@@ -752,9 +752,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZ_Tv" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176r" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZ_Tw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176s" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index 0b7d49ba9b..56840269c0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -56,7 +56,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -163,15 +163,15 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
@@ -214,14 +214,14 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7597241200646296619" name="jetbrains.mps.lang.editor.structure.QueryFunction_SNode" flags="in" index="3k4GqP" />
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -264,7 +264,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" />
@@ -282,7 +282,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -336,7 +336,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">
@@ -382,7 +382,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -445,7 +445,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -465,7 +465,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">
@@ -478,6 +478,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -507,7 +508,7 @@
       </concept>
       <concept id="8207263695491691232" name="com.mbeddr.mpsutil.grammarcells.structure.SubconceptExpression" flags="ng" index="2EmZKS" />
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
@@ -625,7 +626,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -655,7 +656,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -2135,7 +2135,7 @@
                                   <node concept="3clFbF" id="12WRc294xzS" role="3cqZAp">
                                     <node concept="2OqwBi" id="12WRc294xzT" role="3clFbG">
                                       <node concept="37vLTw" id="12WRc294xzU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="12WRc294xzW" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8176t" />
                                       </node>
                                       <node concept="3TrcHB" id="12WRc294xzV" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2143,9 +2143,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="12WRc294xzW" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8176t" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="12WRc294xzX" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8176u" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2181,7 +2181,7 @@
                                       <node concept="3clFbF" id="3kdFyLXe9Y9" role="3cqZAp">
                                         <node concept="2OqwBi" id="3kdFyLXeaqL" role="3clFbG">
                                           <node concept="37vLTw" id="3kdFyLXe9Y8" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3kdFyLXe8Iw" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX8176v" />
                                           </node>
                                           <node concept="3TrcHB" id="3kdFyLXecOp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2189,9 +2189,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="3kdFyLXe8Iw" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8176v" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="3kdFyLXe8Ix" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8176w" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3671,14 +3671,14 @@
                           <ref role="37wK5l" to="pbu6:1WlYLwX1YJg" resolve="hasNodeCoverage" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="3$EgSSxSMI1" role="37wK5m">
-                            <ref role="3cqZAo" node="3$EgSSxSMI2" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176x" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3$EgSSxSMI2" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8176x" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3$EgSSxSMI3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8176y" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3708,7 +3708,7 @@
                         <node concept="3clFbF" id="3$EgSSxSzG9" role="3cqZAp">
                           <node concept="2OqwBi" id="3$EgSSxS$2U" role="3clFbG">
                             <node concept="37vLTw" id="3$EgSSxSzG8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3$EgSSxSzgV" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8176z" />
                             </node>
                             <node concept="2qgKlT" id="3$EgSSxS$ER" role="2OqNvi">
                               <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -3716,9 +3716,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3$EgSSxSzgV" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8176z" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3$EgSSxSzgW" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8176$" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3801,7 +3801,7 @@
                     <node concept="3clFbF" id="Om1N8U02gD" role="3cqZAp">
                       <node concept="2OqwBi" id="Om1N8U02gE" role="3clFbG">
                         <node concept="37vLTw" id="Om1N8U02gF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Om1N8U02gH" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176_" />
                         </node>
                         <node concept="2qgKlT" id="Om1N8U02gG" role="2OqNvi">
                           <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -3809,9 +3809,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Om1N8U02gH" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Om1N8U02gI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176A" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3879,7 +3879,7 @@
                           <ref role="37wK5l" to="pbu6:1WlYLwX3YKL" resolve="isNodeNotCovered" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="Om1N8UbkHU" role="37wK5m">
-                            <ref role="3cqZAo" node="Om1N8U05qo" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8176B" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="Om1N8UboFd" role="3uHU7B">
@@ -3889,7 +3889,7 @@
                               <ref role="cht4Q" to="3673:5IKJrJHNBNb" resolve="ICanHaveTestCoverage" />
                             </node>
                             <node concept="37vLTw" id="Om1N8Ubm$F" role="1m5AlR">
-                              <ref role="3cqZAo" node="Om1N8U05qo" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8176B" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="Om1N8UbpCr" role="2OqNvi">
@@ -3899,9 +3899,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Om1N8U05qo" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176B" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Om1N8U05qp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176C" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6382,16 +6382,16 @@
                                   </node>
                                   <node concept="3JPx81" id="43wAXFpM0aE" role="2OqNvi">
                                     <node concept="37vLTw" id="43wAXFpM0aF" role="25WWJ7">
-                                      <ref role="3cqZAo" node="43wAXFpLWbr" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8176D" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="43wAXFpLWbr" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8176D" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="43wAXFpLWbs" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8176E" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -6457,14 +6457,14 @@
                         <ref role="37wK5l" to="pbu6:1WlYLwX3YKL" resolve="isNodeNotCovered" />
                         <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                         <node concept="37vLTw" id="2B_XTD72PHq" role="37wK5m">
-                          <ref role="3cqZAo" node="2B_XTD71cjV" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176F" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2B_XTD71cjV" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176F" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2B_XTD71cjW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176G" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
index 79e5b504d9..c40ab334ff 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
@@ -165,6 +165,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -305,7 +306,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -588,7 +588,7 @@
                     <node concept="3clFbF" id="7_$HJtBtOwl" role="3cqZAp">
                       <node concept="2OqwBi" id="7_$HJtBtOwm" role="3clFbG">
                         <node concept="37vLTw" id="7_$HJtBtOwn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7_$HJtBtOwp" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176H" />
                         </node>
                         <node concept="2qgKlT" id="7_$HJtBtOwo" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:7_$HJtBs0P$" resolve="isSynthesized" />
@@ -596,9 +596,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7_$HJtBtOwp" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176H" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7_$HJtBtOwq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176I" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -657,7 +657,7 @@
                     <node concept="3clFbF" id="69zaTr1W0aA" role="3cqZAp">
                       <node concept="2OqwBi" id="69zaTr1W0zH" role="3clFbG">
                         <node concept="37vLTw" id="69zaTr1W0a_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="69zaTr1W086" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176J" />
                         </node>
                         <node concept="2qgKlT" id="69zaTr1W0Ed" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:69zaTr1W0u$" resolve="isGeneric" />
@@ -665,9 +665,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="69zaTr1W086" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176J" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="69zaTr1W087" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176K" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1884,7 +1884,7 @@
                     <node concept="2ShNRf" id="1PoRi1pB9Yy" role="2Oq$k0">
                       <node concept="1pGfFk" id="1PoRi1pBbWD" role="2ShVmc">
                         <property role="373rjd" value="true" />
-                        <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                        <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="ContainmentContext.Builder" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1PoRi1pBcfZ" role="2OqNvi">
@@ -1933,7 +1933,7 @@
                     <node concept="2ShNRf" id="1PoRi1pBj92" role="2Oq$k0">
                       <node concept="1pGfFk" id="1PoRi1pBjx3" role="2ShVmc">
                         <property role="373rjd" value="true" />
-                        <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                        <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1PoRi1pBjTR" role="2OqNvi">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
index b4035b1897..b5eb5c38e0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -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>
@@ -96,12 +96,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" />
@@ -173,7 +174,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -255,7 +256,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" />
     </language>
   </registry>
   <node concept="3SyAh_" id="xG0f0hk3Yf">
@@ -13063,7 +13063,7 @@
                             <node concept="37vLTI" id="5Iz9nTHJecv" role="3clFbG">
                               <node concept="2OqwBi" id="5Iz9nTHJtDh" role="37vLTx">
                                 <node concept="37vLTw" id="5Iz9nTHJlNT" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5HOQcpHJZ0i" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJAs3" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:24Fec4173Ut" resolve="optionValue" />
@@ -13071,7 +13071,7 @@
                               </node>
                               <node concept="2OqwBi" id="5Iz9nTHIVJ3" role="37vLTJ">
                                 <node concept="37vLTw" id="5Iz9nTHIOnm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5HOQcpHJZ0i" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJ2M4" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
@@ -13084,7 +13084,7 @@
                               <node concept="10Nm6u" id="5Iz9nTHJMge" role="37vLTx" />
                               <node concept="2OqwBi" id="5Iz9nTHJIsV" role="37vLTJ">
                                 <node concept="37vLTw" id="5Iz9nTHJIsW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5HOQcpHJZ0i" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJM3e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:24Fec4173Ut" resolve="optionValue" />
@@ -13097,7 +13097,7 @@
                           <node concept="10Nm6u" id="7759dY8XFmS" role="3uHU7w" />
                           <node concept="2OqwBi" id="7759dY8XE$o" role="3uHU7B">
                             <node concept="37vLTw" id="7759dY8XEj1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5HOQcpHJZ0i" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8177f" />
                             </node>
                             <node concept="3TrEf2" id="7759dY8XF6s" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
@@ -13106,9 +13106,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5HOQcpHJZ0i" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8177f" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5HOQcpHJZ0j" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8177g" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
index 7ec4269bc1..468400a2a0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
@@ -2,13 +2,13 @@
 <model ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="-1" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="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="-1" />
@@ -100,7 +100,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -240,7 +240,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -269,7 +269,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">
@@ -327,6 +327,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
       </concept>
@@ -444,7 +445,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">
@@ -504,7 +505,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -5228,7 +5228,7 @@
                   <node concept="3clFbF" id="5bElvpNid68" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNie9a" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNiegH" role="3K4E3e">
-                        <ref role="3cqZAo" node="5bElvpNicmT" resolve="next" />
+                        <ref role="3cqZAo" node="4z0AnX8177h" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNienQ" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNicmR" resolve="min" />
@@ -5236,7 +5236,7 @@
                       <node concept="1rXfSq" id="5bElvpNid67" role="3K4Cdx">
                         <ref role="37wK5l" node="2NHHcg2EXov" resolve="less" />
                         <node concept="37vLTw" id="5bElvpNidvP" role="37wK5m">
-                          <ref role="3cqZAo" node="5bElvpNicmT" resolve="next" />
+                          <ref role="3cqZAo" node="4z0AnX8177h" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNidKr" role="37wK5m">
                           <ref role="3cqZAo" node="5bElvpNicmR" resolve="min" />
@@ -5249,9 +5249,9 @@
                   <property role="TrG5h" value="min" />
                   <node concept="17QB3L" id="5bElvpNicFT" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="5bElvpNicmT" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8177h" role="1bW2Oz">
                   <property role="TrG5h" value="next" />
-                  <node concept="2jxLKc" id="5bElvpNicmU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8177i" role="1tU5fm" />
                 </node>
               </node>
               <node concept="37vLTw" id="3tudP_AbjPj" role="1MDeny">
@@ -5288,7 +5288,7 @@
                   <node concept="3clFbF" id="5bElvpNify_" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNifyA" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNifyB" role="3K4E3e">
-                        <ref role="3cqZAo" node="5bElvpNifyI" resolve="next" />
+                        <ref role="3cqZAo" node="4z0AnX8177j" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNifyC" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNifyG" resolve="min" />
@@ -5296,7 +5296,7 @@
                       <node concept="1rXfSq" id="5bElvpNifyD" role="3K4Cdx">
                         <ref role="37wK5l" node="2NHHcg2F6z3" resolve="greater" />
                         <node concept="37vLTw" id="5bElvpNifyE" role="37wK5m">
-                          <ref role="3cqZAo" node="5bElvpNifyI" resolve="next" />
+                          <ref role="3cqZAo" node="4z0AnX8177j" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNifyF" role="37wK5m">
                           <ref role="3cqZAo" node="5bElvpNifyG" resolve="min" />
@@ -5309,9 +5309,9 @@
                   <property role="TrG5h" value="min" />
                   <node concept="17QB3L" id="5bElvpNifyH" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="5bElvpNifyI" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8177j" role="1bW2Oz">
                   <property role="TrG5h" value="next" />
-                  <node concept="2jxLKc" id="5bElvpNifyJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8177k" role="1tU5fm" />
                 </node>
               </node>
               <node concept="37vLTw" id="3tudP_AbjPT" role="1MDeny">
@@ -5348,7 +5348,7 @@
                   <node concept="3clFbF" id="5bElvpNhVHi" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNhXxi" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNhXFT" role="3K4E3e">
-                        <ref role="3cqZAo" node="5bElvpNhV9E" resolve="next" />
+                        <ref role="3cqZAo" node="4z0AnX8177l" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNhXQf" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNhV9C" resolve="max" />
@@ -5358,7 +5358,7 @@
                           <ref role="3cqZAo" node="5bElvpNhV9C" resolve="max" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNhVHh" role="3uHU7B">
-                          <ref role="3cqZAo" node="5bElvpNhV9E" resolve="next" />
+                          <ref role="3cqZAo" node="4z0AnX8177l" />
                         </node>
                       </node>
                     </node>
@@ -5368,9 +5368,9 @@
                   <property role="TrG5h" value="max" />
                   <node concept="10Oyi0" id="5bElvpNhVsg" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="5bElvpNhV9E" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8177l" role="1bW2Oz">
                   <property role="TrG5h" value="next" />
-                  <node concept="2jxLKc" id="5bElvpNhV9F" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8177m" role="1tU5fm" />
                 </node>
               </node>
               <node concept="3cmrfG" id="5bElvpNhVdG" role="1MDeny">
@@ -11211,7 +11211,7 @@
                             <node concept="2OqwBi" id="5I_8B5uitzu" role="3uHU7B">
                               <node concept="2OqwBi" id="5I_8B5uisz3" role="2Oq$k0">
                                 <node concept="37vLTw" id="5I_8B5uisfp" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2nByCcxZWOU" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8177n" />
                                 </node>
                                 <node concept="3TrEf2" id="5I_8B5uit0i" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11227,7 +11227,7 @@
                               <node concept="2OqwBi" id="5I_8B5uioBI" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5I_8B5uinCx" role="2Oq$k0">
                                   <node concept="37vLTw" id="5I_8B5uinko" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2nByCcxZWOU" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8177n" />
                                   </node>
                                   <node concept="3TrEf2" id="5I_8B5uio42" role="2OqNvi">
                                     <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11240,7 +11240,7 @@
                                   <node concept="2OqwBi" id="5I_8B5uiyEJ" role="25KhWn">
                                     <node concept="2OqwBi" id="5I_8B5uixe_" role="2Oq$k0">
                                       <node concept="37vLTw" id="5I_8B5uiwLG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2nByCcxZWOU" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8177n" />
                                       </node>
                                       <node concept="1mfA1w" id="5I_8B5uiy0$" role="2OqNvi" />
                                     </node>
@@ -11252,9 +11252,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2nByCcxZWOU" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177n" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2nByCcxZWOV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177o" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11331,7 +11331,7 @@
                           <node concept="2OqwBi" id="5I_8B5uimz2" role="3clFbG">
                             <node concept="2OqwBi" id="5I_8B5uimz3" role="2Oq$k0">
                               <node concept="37vLTw" id="5I_8B5uimz4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5I_8B5uimz7" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8177p" />
                               </node>
                               <node concept="2NL2c5" id="4llm6dDWJPh" role="2OqNvi" />
                             </node>
@@ -11341,9 +11341,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5I_8B5uimz7" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177p" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5I_8B5uimz8" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177q" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11421,7 +11421,7 @@
                             <node concept="2OqwBi" id="5I_8B5ui00L" role="3fr31v">
                               <node concept="2OqwBi" id="5I_8B5ui00M" role="2Oq$k0">
                                 <node concept="37vLTw" id="5I_8B5ui00N" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5I_8B5ui00R" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8177r" />
                                 </node>
                                 <node concept="1mfA1w" id="5I_8B5ui00O" role="2OqNvi" />
                               </node>
@@ -11434,9 +11434,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5I_8B5ui00R" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177r" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5I_8B5ui00S" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177s" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11513,7 +11513,7 @@
                           <node concept="2OqwBi" id="6VfJ$$eJWm_" role="3clFbG">
                             <node concept="2OqwBi" id="6VfJ$$eJWmA" role="2Oq$k0">
                               <node concept="37vLTw" id="6VfJ$$eJWmB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6VfJ$$eJWmF" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8177t" />
                               </node>
                               <node concept="3TrEf2" id="6VfJ$$eJWmC" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11527,9 +11527,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6VfJ$$eJWmF" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177t" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6VfJ$$eJWmG" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177u" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11606,7 +11606,7 @@
                           <node concept="2OqwBi" id="2nByCcy04EG" role="3clFbG">
                             <node concept="2OqwBi" id="2nByCcy04EH" role="2Oq$k0">
                               <node concept="37vLTw" id="2nByCcy04EI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2nByCcy04EM" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8177v" />
                               </node>
                               <node concept="3TrEf2" id="2nByCcy04EJ" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11620,9 +11620,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2nByCcy04EM" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177v" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2nByCcy04EN" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177w" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11699,7 +11699,7 @@
                           <node concept="2OqwBi" id="2nByCcy055m" role="3clFbG">
                             <node concept="2OqwBi" id="2nByCcy055n" role="2Oq$k0">
                               <node concept="37vLTw" id="2nByCcy055o" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2nByCcy055s" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8177x" />
                               </node>
                               <node concept="3TrEf2" id="2nByCcy055p" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11713,9 +11713,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2nByCcy055s" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177x" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2nByCcy055t" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177y" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -11833,7 +11833,7 @@
                         <node concept="3clFbF" id="73INLerZ8hK" role="3cqZAp">
                           <node concept="2OqwBi" id="73INLerZ8hL" role="3clFbG">
                             <node concept="37vLTw" id="73INLerZ8hM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="73INLerZ8hO" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8177z" />
                             </node>
                             <node concept="liA8E" id="73INLerZ8hN" role="2OqNvi">
                               <ref role="37wK5l" node="73INLerZ8i4" resolve="getPriorityLevel" />
@@ -11841,9 +11841,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="73INLerZ8hO" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177z" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="73INLerZ8hP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177$" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="73INLerZ8hQ" role="2S7zOq">
@@ -12778,7 +12778,7 @@
                       <node concept="3clFbF" id="UwUtc1okwd" role="3cqZAp">
                         <node concept="2OqwBi" id="UwUtc1okwe" role="3clFbG">
                           <node concept="37vLTw" id="UwUtc1okwf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="UwUtc1okwj" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8177_" />
                           </node>
                           <node concept="liA8E" id="UwUtc1okwg" role="2OqNvi">
                             <ref role="37wK5l" node="UwUtc1ny1F" resolve="proposals" />
@@ -12792,9 +12792,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="UwUtc1okwj" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8177_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="UwUtc1okwk" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8177A" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -12804,13 +12804,13 @@
                   <node concept="3clFbS" id="UwUtc1okwn" role="1bW5cS">
                     <node concept="3clFbF" id="UwUtc1okwo" role="3cqZAp">
                       <node concept="37vLTw" id="UwUtc1okwq" role="3clFbG">
-                        <ref role="3cqZAo" node="UwUtc1okws" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8177B" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="UwUtc1okws" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8177B" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="UwUtc1okwt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8177C" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="UwUtc1okwu" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index cec2ed8f9f..f23beb989d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -65,7 +65,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.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index 6ccb6b868a..0974341dfb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:80cf2246-750c-4158-9056-a619ebcf894c(org.iets3.core.expr.base.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
@@ -48,7 +48,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -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 id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <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="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -195,6 +195,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -427,7 +428,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -475,7 +476,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -3061,7 +3061,7 @@
                         <node concept="TSZUe" id="5aHkq2w3izl" role="2OqNvi">
                           <node concept="2OqwBi" id="5aHkq2w3izm" role="25WWJ7">
                             <node concept="37vLTw" id="5aHkq2w3izn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5aHkq2w3izp" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8176L" />
                             </node>
                             <node concept="3TrEf2" id="5aHkq2w3izo" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:69zaTr1V8fI" resolve="expr" />
@@ -3071,9 +3071,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5aHkq2w3izp" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176L" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5aHkq2w3izq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176M" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3216,7 +3216,7 @@
                                           <node concept="TSZUe" id="5aHkq2wa6L2" role="2OqNvi">
                                             <node concept="2OqwBi" id="5aHkq2wa8uE" role="25WWJ7">
                                               <node concept="37vLTw" id="5aHkq2wa7su" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5aHkq2wa22E" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8176N" />
                                               </node>
                                               <node concept="1$rogu" id="5aHkq2wa95T" role="2OqNvi" />
                                             </node>
@@ -3224,9 +3224,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5aHkq2wa22E" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8176N" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5aHkq2wa22F" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8176O" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3847,7 +3847,7 @@
                           <node concept="3fqX7Q" id="7ZvWWnqM20L" role="3clFbG">
                             <node concept="2OqwBi" id="7ZvWWnqM20M" role="3fr31v">
                               <node concept="37vLTw" id="7ZvWWnqM20N" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ZvWWnqM20Q" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8176P" />
                               </node>
                               <node concept="1mIQ4w" id="7ZvWWnqM20O" role="2OqNvi">
                                 <node concept="chp4Y" id="7ZvWWnqM20P" role="cj9EA">
@@ -3858,9 +3858,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7ZvWWnqM20Q" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8176P" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ZvWWnqM20R" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8176Q" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3970,7 +3970,7 @@
                     <node concept="3clFbF" id="7ZvWWnqLX0Z" role="3cqZAp">
                       <node concept="2OqwBi" id="7ZvWWnqLXc8" role="3clFbG">
                         <node concept="37vLTw" id="7ZvWWnqLX0Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7ZvWWnqLWW7" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8176R" />
                         </node>
                         <node concept="1mIQ4w" id="7ZvWWnqLXiQ" role="2OqNvi">
                           <node concept="chp4Y" id="7ZvWWnqLXq$" role="cj9EA">
@@ -3980,9 +3980,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7ZvWWnqLWW7" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8176R" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7ZvWWnqLWW8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8176S" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4040,7 +4040,7 @@
                           <node concept="3clFbF" id="12WRc28WT7l" role="3cqZAp">
                             <node concept="2OqwBi" id="12WRc28WUYc" role="3clFbG">
                               <node concept="37vLTw" id="12WRc28WTWg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="12WRc28WSXM" resolve="existing" />
+                                <ref role="3cqZAo" node="4z0AnX8176T" />
                               </node>
                               <node concept="2qgKlT" id="12WRc28WVg9" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:69zaTr1Z8aS" resolve="isSameAs" />
@@ -4061,9 +4061,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="12WRc28WSXM" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8176T" role="1bW2Oz">
                           <property role="TrG5h" value="existing" />
-                          <node concept="2jxLKc" id="12WRc28WSXN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8176U" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4120,7 +4120,7 @@
                           <node concept="3fqX7Q" id="6bG6MAG5yIF" role="3clFbG">
                             <node concept="2OqwBi" id="6bG6MAG5yIH" role="3fr31v">
                               <node concept="37vLTw" id="6bG6MAG5yII" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6bG6MAG5wH6" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8176V" />
                               </node>
                               <node concept="1mIQ4w" id="6bG6MAG5yIJ" role="2OqNvi">
                                 <node concept="chp4Y" id="6bG6MAG5yIK" role="cj9EA">
@@ -4131,9 +4131,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6bG6MAG5wH6" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8176V" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6bG6MAG5wH7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8176W" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4228,7 +4228,7 @@
                   <node concept="3clFbF" id="12WRc28W_pu" role="3cqZAp">
                     <node concept="2OqwBi" id="12WRc28W_sX" role="3clFbG">
                       <node concept="37vLTw" id="12WRc28W_pt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="12WRc28W_mV" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8176X" />
                       </node>
                       <node concept="1mIQ4w" id="12WRc28W_wB" role="2OqNvi">
                         <node concept="chp4Y" id="12WRc28W_$1" role="cj9EA">
@@ -4238,9 +4238,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="12WRc28W_mV" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8176X" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="12WRc28W_mW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8176Y" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4324,7 +4324,7 @@
                                   <ref role="cht4Q" to="hm2y:7VuYlCQZ3ll" resolve="JoinType" />
                                 </node>
                                 <node concept="37vLTw" id="bA6f$pFc_c" role="1m5AlR">
-                                  <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX81771" />
                                 </node>
                               </node>
                               <node concept="3Tsc0h" id="bA6f$pFc_d" role="2OqNvi">
@@ -4343,7 +4343,7 @@
                     </node>
                     <node concept="2OqwBi" id="bA6f$py8y1" role="3clFbw">
                       <node concept="37vLTw" id="bA6f$py8y2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX81771" />
                       </node>
                       <node concept="1mIQ4w" id="bA6f$py8y3" role="2OqNvi">
                         <node concept="chp4Y" id="bA6f$py8y4" role="cj9EA">
@@ -4380,7 +4380,7 @@
                                     <ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
                                   </node>
                                   <node concept="37vLTw" id="bA6f$pDcy$" role="1m5AlR">
-                                    <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX81771" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="bA6f$pGoiP" role="2OqNvi">
@@ -4412,7 +4412,7 @@
                       </node>
                       <node concept="2OqwBi" id="bA6f$pBynU" role="3eO9$A">
                         <node concept="37vLTw" id="bA6f$pBynV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81771" />
                         </node>
                         <node concept="1mIQ4w" id="bA6f$pBynW" role="2OqNvi">
                           <node concept="chp4Y" id="bA6f$pBynX" role="cj9EA">
@@ -4432,7 +4432,7 @@
                                 </node>
                                 <node concept="TSZUe" id="bA6f$pyhQ_" role="2OqNvi">
                                   <node concept="37vLTw" id="bA6f$pyhQA" role="25WWJ7">
-                                    <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX81771" />
                                   </node>
                                 </node>
                               </node>
@@ -4449,20 +4449,20 @@
                                     <node concept="3clFbF" id="bA6f$pyhQH" role="3cqZAp">
                                       <node concept="2OqwBi" id="bA6f$pyhQM" role="3clFbG">
                                         <node concept="37vLTw" id="bA6f$pyhQN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="bA6f$pyhQP" resolve="t" />
+                                          <ref role="3cqZAo" node="4z0AnX8176Z" />
                                         </node>
                                         <node concept="2qgKlT" id="bA6f$pL_pv" role="2OqNvi">
                                           <ref role="37wK5l" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
                                           <node concept="37vLTw" id="bA6f$pLC3g" role="37wK5m">
-                                            <ref role="3cqZAo" node="bA6f$py8yb" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX81771" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="bA6f$pyhQP" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX8176Z" role="1bW2Oz">
                                     <property role="TrG5h" value="t" />
-                                    <node concept="2jxLKc" id="bA6f$pyhQQ" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX81770" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -4473,9 +4473,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="bA6f$py8yb" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81771" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="bA6f$py8yc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX81772" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5041,7 +5041,7 @@
                             <node concept="1rXfSq" id="KoRsm$peAf" role="3clFbG">
                               <ref role="37wK5l" node="KoRsm$oTxn" resolve="areTypesComparable" />
                               <node concept="37vLTw" id="KoRsm$peAg" role="37wK5m">
-                                <ref role="3cqZAo" node="KoRsm$peAj" resolve="joined" />
+                                <ref role="3cqZAo" node="4z0AnX81773" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$peAh" role="37wK5m">
                                 <ref role="3cqZAo" node="7KDVkAErx_$" resolve="rightType" />
@@ -5052,9 +5052,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="KoRsm$peAj" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX81773" role="1bW2Oz">
                           <property role="TrG5h" value="joined" />
-                          <node concept="2jxLKc" id="KoRsm$peAk" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX81774" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -5239,7 +5239,7 @@
                                 <ref role="3cqZAo" node="7KDVkAErvHj" resolve="leftType" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$pwLD" role="37wK5m">
-                                <ref role="3cqZAo" node="KoRsm$pwLF" resolve="joined" />
+                                <ref role="3cqZAo" node="4z0AnX81775" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$pwLE" role="37wK5m">
                                 <ref role="3cqZAo" node="7KDVkAErzPC" resolve="isPrimitiveTypeComparable" />
@@ -5247,9 +5247,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="KoRsm$pwLF" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX81775" role="1bW2Oz">
                           <property role="TrG5h" value="joined" />
-                          <node concept="2jxLKc" id="KoRsm$pwLG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX81776" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -8297,15 +8297,15 @@
                                 <ref role="2Gs0qQ" node="7VuYlCR5J9z" resolve="tt" />
                               </node>
                               <node concept="37vLTw" id="7VuYlCR5Rc1" role="37wK5m">
-                                <ref role="3cqZAo" node="7VuYlCR5Rc2" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX81777" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7VuYlCR5Rc2" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX81777" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7VuYlCR5Rc3" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX81778" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8909,7 +8909,7 @@
                       <node concept="10Nm6u" id="37t_e$LfDpj" role="3uHU7w" />
                       <node concept="2OqwBi" id="37t_e$LfAg9" role="3uHU7B">
                         <node concept="37vLTw" id="37t_e$Lf_MW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="37t_e$Lf__s" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX81779" />
                         </node>
                         <node concept="3TrEf2" id="37t_e$LfBaZ" role="2OqNvi">
                           <ref role="3Tt5mk" to="4kwy:cJpacq40jC" resolve="optionalName" />
@@ -8918,9 +8918,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="37t_e$Lf__s" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX81779" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="37t_e$Lf__t" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8177a" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10655,7 +10655,7 @@
                         </node>
                         <node concept="TSZUe" id="2V2blxGMIvo" role="2OqNvi">
                           <node concept="37vLTw" id="2V2blxGMJSz" role="25WWJ7">
-                            <ref role="3cqZAo" node="2V2blxGLmcZ" resolve="elementType" />
+                            <ref role="3cqZAo" node="4z0AnX8177b" />
                           </node>
                         </node>
                       </node>
@@ -10668,7 +10668,7 @@
                         <node concept="X8dFx" id="2V2blxGMOzA" role="2OqNvi">
                           <node concept="2OqwBi" id="2V2blxGLmcW" role="25WWJ7">
                             <node concept="37vLTw" id="2V2blxGLmcX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2V2blxGLmcZ" resolve="elementType" />
+                              <ref role="3cqZAo" node="4z0AnX8177b" />
                             </node>
                             <node concept="2qgKlT" id="2V2blxGLmcY" role="2OqNvi">
                               <ref role="37wK5l" to="pbu6:4Q4DxjDsh$t" resolve="allSupertypes" />
@@ -10683,9 +10683,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2V2blxGLmcZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8177b" role="1bW2Oz">
                     <property role="TrG5h" value="elementType" />
-                    <node concept="2jxLKc" id="2V2blxGLmd0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8177c" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10719,7 +10719,7 @@
                             <ref role="2pIpSl" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
                             <node concept="36biLy" id="2V2blxGLvXM" role="28nt2d">
                               <node concept="37vLTw" id="2V2blxGLw9G" role="36biLW">
-                                <ref role="3cqZAo" node="2V2blxGLtl$" resolve="types" />
+                                <ref role="3cqZAo" node="4z0AnX8177d" />
                               </node>
                             </node>
                           </node>
@@ -10729,9 +10729,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="2V2blxGLtl$" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX8177d" role="1bW2Oz">
                 <property role="TrG5h" value="types" />
-                <node concept="2jxLKc" id="2V2blxGLtl_" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX8177e" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl
index 5464ecb3c5..c7efe28b02 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
@@ -29,6 +28,7 @@
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">6c563085-e123-4aaf-be88-fb88e02f8282(io.netty)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
+    <dependency reexport="false">8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -42,7 +42,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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" />
@@ -72,7 +72,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
@@ -123,6 +123,7 @@
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
+    <module reference="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="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps
index 67acf95735..ec81f4794a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps
@@ -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.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
index fead2b9dd1..87f95314a7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
@@ -136,7 +136,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -149,7 +149,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -161,6 +161,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" />
@@ -253,7 +254,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -288,7 +289,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -2874,7 +2874,7 @@
                       <node concept="TSZUe" id="4_KMC82Eb$w" role="2OqNvi">
                         <node concept="2OqwBi" id="4_KMC82Eb$x" role="25WWJ7">
                           <node concept="37vLTw" id="4_KMC82Eb$y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4_KMC82Eb$H" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8177D" />
                           </node>
                           <node concept="3TrEf2" id="4_KMC82Eb$z" role="2OqNvi">
                             <ref role="3Tt5mk" to="700h:7kYh9WszdHE" resolve="key" />
@@ -2891,7 +2891,7 @@
                       <node concept="TSZUe" id="4_KMC82Eb$B" role="2OqNvi">
                         <node concept="2OqwBi" id="4_KMC82Eb$C" role="25WWJ7">
                           <node concept="37vLTw" id="4_KMC82Eb$D" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4_KMC82Eb$H" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8177D" />
                           </node>
                           <node concept="3TrEf2" id="4_KMC82Eb$E" role="2OqNvi">
                             <ref role="3Tt5mk" to="700h:7kYh9WszdHG" resolve="val" />
@@ -2906,9 +2906,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4_KMC82Eb$H" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8177D" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4_KMC82Eb$I" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8177E" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps
index 93608de364..bc364d41ff 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps
@@ -84,7 +84,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -194,7 +194,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps
index 79b3496333..873c4a57e9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps
@@ -68,7 +68,7 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -78,7 +78,7 @@
       <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
         <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -101,7 +101,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" />
@@ -114,7 +114,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_">
@@ -161,7 +161,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" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -186,7 +186,7 @@
       </concept>
       <concept id="8207263695491691232" name="com.mbeddr.mpsutil.grammarcells.structure.SubconceptExpression" flags="ng" index="2EmZKS" />
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -222,7 +222,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.collections/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/intentions.mps
index 0cbd9a381e..988ceee32d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/intentions.mps
@@ -124,7 +124,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.collections/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/migration.mps
index 230c0f1103..b0681ad4d2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/migration.mps
@@ -10,7 +10,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.collections/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/plugin.mps
index 766216da53..bd5a7d4fd5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/plugin.mps
@@ -28,7 +28,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" />
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps
index a64d8841f0..b611ec8d87 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps
@@ -64,7 +64,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
index 00dfeb299f..b8251f0523 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,7 +129,7 @@
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785112" name="jetbrains.mps.lang.quotation.structure.Antiquotation" flags="ng" index="2c44te" />
@@ -296,7 +296,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl
index add28d14d6..022911fe08 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
@@ -37,7 +36,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps
index 03f87e016e..b925a0323f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps
@@ -96,7 +96,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>
@@ -107,7 +107,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" />
@@ -187,7 +187,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps
index bff0f308f0..1722e3b282 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps
@@ -43,7 +43,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
index c842933a9e..1f2fc3d91c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
@@ -72,7 +72,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -98,7 +98,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -197,7 +197,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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" />
@@ -226,7 +227,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
@@ -309,7 +310,7 @@
       <concept id="1397920687867564204" name="de.slisson.mps.tables.structure.QueryParameter_ColumnIndex" flags="ng" index="2rSBBp" />
       <concept id="4032373061957737357" name="de.slisson.mps.tables.structure.Parameter_Index" flags="ng" index="10bopy" />
       <concept id="4032373061957735279" name="de.slisson.mps.tables.structure.HeaderQuery_InsertNew" flags="ig" index="10boU0" />
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
@@ -373,7 +374,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -393,7 +394,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -550,7 +550,7 @@
                                 <node concept="2OqwBi" id="5hullqu1Knj" role="2Oq$k0">
                                   <node concept="2OqwBi" id="5hullqu1Knk" role="2Oq$k0">
                                     <node concept="37vLTw" id="5hullqu1Knl" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5hullqu1KnF" resolve="row" />
+                                      <ref role="3cqZAo" node="4z0AnX8177K" />
                                     </node>
                                     <node concept="3Tsc0h" id="cPLa7FpZwu" role="2OqNvi">
                                       <ref role="3TtcxE" to="e9k1:cPLa7FpcRm" resolve="cells" />
@@ -566,7 +566,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="5hullqu1Knt" role="3uHU7B">
                                               <node concept="37vLTw" id="5hullqu1Knu" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5hullqu1Knw" resolve="c" />
+                                                <ref role="3cqZAo" node="4z0AnX8177G" />
                                               </node>
                                               <node concept="3TrEf2" id="cPLa7FpZXy" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -575,9 +575,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="5hullqu1Knw" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8177G" role="1bW2Oz">
                                         <property role="TrG5h" value="c" />
-                                        <node concept="2jxLKc" id="5hullqu1Knx" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8177H" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -588,24 +588,24 @@
                                       <node concept="3clFbF" id="5hullqu1Kn_" role="3cqZAp">
                                         <node concept="2OqwBi" id="5hullqu1KnA" role="3clFbG">
                                           <node concept="37vLTw" id="5hullqu1KnB" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5hullqu1KnD" resolve="c" />
+                                            <ref role="3cqZAo" node="4z0AnX8177I" />
                                           </node>
                                           <node concept="3YRAZt" id="5hullqu1KnC" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5hullqu1KnD" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8177I" role="1bW2Oz">
                                       <property role="TrG5h" value="c" />
-                                      <node concept="2jxLKc" id="5hullqu1KnE" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8177J" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5hullqu1KnF" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8177K" role="1bW2Oz">
                             <property role="TrG5h" value="row" />
-                            <node concept="2jxLKc" id="5hullqu1KnG" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8177L" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -816,7 +816,7 @@
                             </node>
                             <node concept="2OqwBi" id="4_sn_QHl$rY" role="3uHU7B">
                               <node concept="37vLTw" id="4_sn_QHl$by" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4_sn_QHl$29" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8177M" />
                               </node>
                               <node concept="3TrEf2" id="cPLa7Fqhd2" role="2OqNvi">
                                 <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -825,9 +825,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4_sn_QHl$29" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8177M" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4_sn_QHl$2a" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8177N" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -923,7 +923,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5yPljRY0Pmi" role="3uHU7B">
                                     <node concept="37vLTw" id="5yPljRY0Pmj" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5yPljRY0Pml" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8177O" />
                                     </node>
                                     <node concept="3TrEf2" id="5yPljRY0Pmk" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -932,9 +932,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5yPljRY0Pml" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8177O" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5yPljRY0Pmm" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8177P" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
index 7b819c3365..6f3882d09e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -61,7 +61,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -70,12 +70,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -136,7 +137,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -158,7 +159,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -236,7 +236,7 @@
                           <node concept="2OqwBi" id="2OsjbbtceDo" role="3clFbG">
                             <node concept="2OqwBi" id="2Osjbbtce0F" role="2Oq$k0">
                               <node concept="37vLTw" id="2OsjbbtcdCh" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2Osjbbtcdx8" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX81780" />
                               </node>
                               <node concept="3TrEf2" id="2OsjbbtcemI" role="2OqNvi">
                                 <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
@@ -246,9 +246,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2Osjbbtcdx8" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX81780" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2Osjbbtcdx9" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX81781" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -266,7 +266,7 @@
                                 <node concept="36biLy" id="2Osjbbtchld" role="28nt2d">
                                   <node concept="2OqwBi" id="2OsjbbtchMu" role="36biLW">
                                     <node concept="37vLTw" id="2Osjbbtchqb" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2OsjbbtcfM_" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX81782" />
                                     </node>
                                     <node concept="3TrEf2" id="2Osjbbtcif2" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
@@ -278,7 +278,7 @@
                           </node>
                           <node concept="2OqwBi" id="2Osjbbtcg59" role="37vLTJ">
                             <node concept="37vLTw" id="2OsjbbtcfRF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2OsjbbtcfM_" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81782" />
                             </node>
                             <node concept="3TrEf2" id="2Osjbbtcg$o" role="2OqNvi">
                               <ref role="3Tt5mk" to="e9k1:7F9023_Orfu" resolve="col" />
@@ -291,7 +291,7 @@
                           <node concept="10Nm6u" id="2OsjbbtcjPM" role="37vLTx" />
                           <node concept="2OqwBi" id="2OsjbbtcivV" role="37vLTJ">
                             <node concept="37vLTw" id="2Osjbbtcis9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2OsjbbtcfM_" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX81782" />
                             </node>
                             <node concept="3TrEf2" id="2Osjbbtcj3e" role="2OqNvi">
                               <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
@@ -300,9 +300,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2OsjbbtcfM_" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX81782" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2OsjbbtcfMA" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX81783" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps
index 28232375e8..54fb930c8a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps
@@ -48,7 +48,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.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
index cdbb6de780..acda62fb09 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
@@ -78,7 +78,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,6 +90,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -235,7 +236,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -254,7 +255,6 @@
         <child id="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="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -360,7 +360,7 @@
                       <node concept="2OqwBi" id="4PRpvcZvBVD" role="2MkoU_">
                         <node concept="2OqwBi" id="4PRpvcZvBxb" role="2Oq$k0">
                           <node concept="37vLTw" id="4PRpvcZvBlZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4PRpvcZvBhc" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8177Q" />
                           </node>
                           <node concept="3TrEf2" id="4PRpvcZvBFF" role="2OqNvi">
                             <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -377,7 +377,7 @@
                       </node>
                       <node concept="2OqwBi" id="4PRpvcZw7qS" role="1urrMF">
                         <node concept="37vLTw" id="4PRpvcZvD72" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4PRpvcZvBhc" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8177Q" />
                         </node>
                         <node concept="3TrEf2" id="4PRpvcZw7_B" role="2OqNvi">
                           <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -385,9 +385,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4PRpvcZvBhc" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8177Q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4PRpvcZvBhd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8177R" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -478,11 +478,11 @@
                                     <node concept="1Wc70l" id="2KRUNf1mG2W" role="3clFbG">
                                       <node concept="17R0WA" id="2KRUNf1mG2X" role="3uHU7w">
                                         <node concept="37vLTw" id="2KRUNf1mG2Y" role="3uHU7w">
-                                          <ref role="3cqZAo" node="2KRUNf1mG3b" resolve="col" />
+                                          <ref role="3cqZAo" node="4z0AnX8177U" />
                                         </node>
                                         <node concept="2OqwBi" id="2KRUNf1mG2Z" role="3uHU7B">
                                           <node concept="37vLTw" id="2KRUNf1mG30" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2KRUNf1mG38" resolve="row" />
+                                            <ref role="3cqZAo" node="4z0AnX8177S" />
                                           </node>
                                           <node concept="3TrEf2" id="2KRUNf1mG31" role="2OqNvi">
                                             <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -492,7 +492,7 @@
                                       <node concept="2OqwBi" id="2KRUNf1mG32" role="3uHU7B">
                                         <node concept="2OqwBi" id="2KRUNf1mG33" role="2Oq$k0">
                                           <node concept="37vLTw" id="2KRUNf1mG34" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2KRUNf1mG38" resolve="row" />
+                                            <ref role="3cqZAo" node="4z0AnX8177S" />
                                           </node>
                                           <node concept="3TrEf2" id="2KRUNf1mG35" role="2OqNvi">
                                             <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -507,9 +507,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2KRUNf1mG38" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8177S" role="1bW2Oz">
                                   <property role="TrG5h" value="row" />
-                                  <node concept="2jxLKc" id="2KRUNf1mG39" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8177T" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -518,9 +518,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2KRUNf1mG3b" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8177U" role="1bW2Oz">
                       <property role="TrG5h" value="col" />
-                      <node concept="2jxLKc" id="2KRUNf1mG3c" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8177V" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -541,7 +541,7 @@
                           <node concept="2OqwBi" id="2KRUNf1mNSP" role="3clFbG">
                             <node concept="2OqwBi" id="2KRUNf1mMwl" role="2Oq$k0">
                               <node concept="37vLTw" id="2KRUNf1mL8f" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2KRUNf1mHhI" resolve="defaultValues" />
+                                <ref role="3cqZAo" node="4z0AnX8177Y" />
                               </node>
                               <node concept="7r0gD" id="2KRUNf1mNvp" role="2OqNvi">
                                 <node concept="3cmrfG" id="2KRUNf1mND7" role="7T0AP">
@@ -557,13 +557,13 @@
                                       <property role="Xl_RC" value="only one empty input value per column is allowed." />
                                     </node>
                                     <node concept="37vLTw" id="2KRUNf1mR8t" role="1urrMF">
-                                      <ref role="3cqZAo" node="2KRUNf1mOcx" resolve="def" />
+                                      <ref role="3cqZAo" node="4z0AnX8177W" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="2KRUNf1mOcx" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8177W" role="1bW2Oz">
                                   <property role="TrG5h" value="def" />
-                                  <node concept="2jxLKc" id="2KRUNf1mOcy" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8177X" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -576,16 +576,16 @@
                         </node>
                         <node concept="2OqwBi" id="2KRUNf1mIsD" role="3uHU7B">
                           <node concept="37vLTw" id="2KRUNf1mHlr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2KRUNf1mHhI" resolve="defaultValues" />
+                            <ref role="3cqZAo" node="4z0AnX8177Y" />
                           </node>
                           <node concept="34oBXx" id="2KRUNf1mJG3" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2KRUNf1mHhI" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8177Y" role="1bW2Oz">
                     <property role="TrG5h" value="defaultValues" />
-                    <node concept="2jxLKc" id="2KRUNf1mHhJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8177Z" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl
index f0aa11d730..cc5c0ded69 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">7e450f4e-1ac3-41ef-a851-4598161bdb94(de.slisson.mps.tables)</dependency>
@@ -33,7 +32,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -54,7 +53,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
index 8aa485fee2..2e244e4987 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
@@ -118,7 +118,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,7 +131,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -139,6 +139,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" />
@@ -223,7 +224,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -245,7 +246,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -679,11 +679,11 @@
                                 <node concept="3clFbF" id="2vkvJYSR2su" role="3cqZAp">
                                   <node concept="3clFbC" id="2vkvJYSR2sv" role="3clFbG">
                                     <node concept="37vLTw" id="2vkvJYSR2sw" role="3uHU7w">
-                                      <ref role="3cqZAo" node="2vkvJYSQVKc" resolve="p" />
+                                      <ref role="3cqZAo" node="4z0AnX81786" />
                                     </node>
                                     <node concept="2OqwBi" id="2vkvJYSR2sx" role="3uHU7B">
                                       <node concept="37vLTw" id="2vkvJYSR2sy" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2vkvJYSR2s$" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX81784" />
                                       </node>
                                       <node concept="3TrEf2" id="2vkvJYSR2sz" role="2OqNvi">
                                         <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
@@ -692,9 +692,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2vkvJYSR2s$" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX81784" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2vkvJYSR2s_" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX81785" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -702,9 +702,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2vkvJYSQVKc" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX81786" role="1bW2Oz">
                     <property role="TrG5h" value="p" />
-                    <node concept="2jxLKc" id="2vkvJYSQVKd" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX81787" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -901,7 +901,7 @@
                   <node concept="3clFbF" id="2nByCcxAqyQ" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxAqHg" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxAqyP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2nByCcxAqwz" resolve="ipr" />
+                        <ref role="3cqZAo" node="4z0AnX8178a" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxArcZ" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxArhv" role="1P9ThW">
@@ -927,7 +927,7 @@
                                             <node concept="2OqwBi" id="2nByCcxAEwb" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxCr36" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxCcrS" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2nByCcxAqwz" resolve="ipr" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178a" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxCr_f" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:4YhD5cZsmN4" resolve="port" />
@@ -939,7 +939,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxACcb" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxABUf" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2nByCcxABH$" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX81788" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxACEG" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -948,9 +948,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2nByCcxABH$" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX81788" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2nByCcxABH_" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX81789" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -963,9 +963,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nByCcxAqwz" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178a" role="1bW2Oz">
                   <property role="TrG5h" value="ipr" />
-                  <node concept="2jxLKc" id="2nByCcxAqw$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178b" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -997,7 +997,7 @@
                   <node concept="3clFbF" id="2nByCcxAFlo" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxAFlp" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxAFlq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2nByCcxAFlL" resolve="pr" />
+                        <ref role="3cqZAo" node="4z0AnX8178e" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxAFlr" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxAFls" role="1P9ThW">
@@ -1023,7 +1023,7 @@
                                             <node concept="2OqwBi" id="2nByCcxAFlD" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxCAL_" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxCc9W" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2nByCcxAFlL" resolve="pr" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178e" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxCE7u" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:2vkvJYSMWJA" resolve="param" />
@@ -1035,7 +1035,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxAFlG" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxAFlH" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2nByCcxAFlJ" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8178c" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxAFlI" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1044,9 +1044,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2nByCcxAFlJ" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8178c" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2nByCcxAFlK" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8178d" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1059,9 +1059,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nByCcxAFlL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178e" role="1bW2Oz">
                   <property role="TrG5h" value="pr" />
-                  <node concept="2jxLKc" id="2nByCcxAFlM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178f" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1716,7 +1716,7 @@
                   <node concept="3clFbF" id="2nByCcxUvdy" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxUvdz" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxUvd$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2nByCcxUvdX" resolve="ipr" />
+                        <ref role="3cqZAo" node="4z0AnX8178i" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxUvd_" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxUvdA" role="1P9ThW">
@@ -1742,7 +1742,7 @@
                                             <node concept="2OqwBi" id="2nByCcxUvdN" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxUvdO" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxUvdP" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2nByCcxUvdX" resolve="ipr" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178i" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxUvdQ" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:4YhD5cZsmN4" resolve="port" />
@@ -1754,7 +1754,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxUvdS" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxUvdT" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2nByCcxUvdV" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8178g" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxUvdU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1763,9 +1763,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2nByCcxUvdV" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8178g" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2nByCcxUvdW" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8178h" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1778,9 +1778,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nByCcxUvdX" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178i" role="1bW2Oz">
                   <property role="TrG5h" value="ipr" />
-                  <node concept="2jxLKc" id="2nByCcxUvdY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178j" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1812,7 +1812,7 @@
                   <node concept="3clFbF" id="2nByCcxUveb" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxUvec" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxUved" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2nByCcxUveA" resolve="pr" />
+                        <ref role="3cqZAo" node="4z0AnX8178m" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxUvee" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxUvef" role="1P9ThW">
@@ -1838,7 +1838,7 @@
                                             <node concept="2OqwBi" id="2nByCcxUves" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxUvet" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxUveu" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2nByCcxUveA" resolve="pr" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178m" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxUvev" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:2vkvJYSMWJA" resolve="param" />
@@ -1850,7 +1850,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxUvex" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxUvey" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2nByCcxUve$" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8178k" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxUvez" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1859,9 +1859,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="2nByCcxUve$" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8178k" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="2nByCcxUve_" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8178l" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1874,9 +1874,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nByCcxUveA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178m" role="1bW2Oz">
                   <property role="TrG5h" value="pr" />
-                  <node concept="2jxLKc" id="2nByCcxUveB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178n" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1924,7 +1924,7 @@
                       <node concept="3clFbF" id="2vkvJYTf3Z9" role="3cqZAp">
                         <node concept="2OqwBi" id="2vkvJYTf3Za" role="3clFbG">
                           <node concept="37vLTw" id="2vkvJYTf3Zb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2vkvJYTf3Ze" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8178o" />
                           </node>
                           <node concept="2qgKlT" id="2vkvJYTf3Zc" role="2OqNvi">
                             <ref role="37wK5l" node="5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -1935,9 +1935,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2vkvJYTf3Ze" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8178o" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2vkvJYTf3Zf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8178p" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2009,7 +2009,7 @@
                               </node>
                               <node concept="2OqwBi" id="2nByCcxISTN" role="3uHU7B">
                                 <node concept="37vLTw" id="2nByCcxIS_t" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2nByCcxISmE" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8178q" />
                                 </node>
                                 <node concept="3TrcHB" id="2nByCcxITH4" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2018,9 +2018,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2nByCcxISmE" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8178q" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2nByCcxISmF" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8178r" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2182,7 +2182,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="2nByCcxTyMW" role="3uHU7B">
                                     <node concept="37vLTw" id="2nByCcxTysP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2nByCcxTy8Q" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8178s" />
                                     </node>
                                     <node concept="3TrEf2" id="2nByCcxTzgA" role="2OqNvi">
                                       <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
@@ -2191,9 +2191,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2nByCcxTy8Q" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8178s" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2nByCcxTy8R" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8178t" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2246,7 +2246,7 @@
                         <node concept="3clFbF" id="2vkvJYTf_OK" role="3cqZAp">
                           <node concept="2OqwBi" id="2vkvJYTf_OL" role="3clFbG">
                             <node concept="37vLTw" id="2vkvJYTf_OM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2vkvJYTf_OQ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX8178u" />
                             </node>
                             <node concept="2qgKlT" id="2vkvJYTf_ON" role="2OqNvi">
                               <ref role="37wK5l" node="5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -2260,9 +2260,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2vkvJYTf_OQ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX8178u" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2vkvJYTf_OR" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX8178v" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/constraints.mps
index 52286ac7ca..94cd5c3bc6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
index 61bb1a2e62..7361029ca0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
@@ -70,7 +70,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -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" />
@@ -206,7 +206,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -225,6 +225,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -235,7 +236,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -298,7 +299,7 @@
         <reference id="3155126767689025691" name="linkDeclaration" index="aDKIf" />
       </concept>
       <concept id="3462102746004176270" name="de.itemis.mps.editor.diagram.structure.DeleteHandler" flags="ig" index="2fs66k" />
-      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ng" index="ljJFv">
+      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ngI" index="ljJFv">
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
         <child id="8587703283523592242" name="endpointTo" index="1PN8qh" />
       </concept>
@@ -316,7 +317,7 @@
         <reference id="7464726264117677938" name="shape" index="2xQOue" />
         <child id="3454709602159778495" name="parameterValues" index="1xbcaF" />
       </concept>
-      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ng" index="HB_m5">
+      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ngI" index="HB_m5">
         <child id="3155126767688717334" name="contentList" index="aCds2" />
       </concept>
       <concept id="7890587897031726207" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery" flags="ng" index="2M4AIt">
@@ -405,7 +406,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">
@@ -425,7 +426,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -1087,7 +1087,7 @@
                                           <node concept="17R0WA" id="3_milxHPcFW" role="3clFbG">
                                             <node concept="2OqwBi" id="3_milxHPb7f" role="3uHU7B">
                                               <node concept="37vLTw" id="3_milxHPaSw" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3_milxHPaK6" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8178w" />
                                               </node>
                                               <node concept="3TrcHB" id="3_milxHPbGU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1102,9 +1102,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="3_milxHPaK6" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8178w" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="3_milxHPaK7" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8178x" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1247,7 +1247,7 @@
                                           <node concept="17R0WA" id="3_milxHPdxm" role="3clFbG">
                                             <node concept="2OqwBi" id="3_milxHPdxn" role="3uHU7B">
                                               <node concept="37vLTw" id="3_milxHPdxo" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3_milxHPdxt" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8178y" />
                                               </node>
                                               <node concept="3TrcHB" id="3_milxHPdxp" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1262,9 +1262,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="3_milxHPdxt" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX8178y" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="3_milxHPdxu" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX8178z" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1388,7 +1388,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3_milxHOACM" role="3uHU7B">
                                     <node concept="37vLTw" id="3_milxHOAhq" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3_milxHO_Xa" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8178$" />
                                     </node>
                                     <node concept="3TrcHB" id="3_milxHOBGd" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1397,9 +1397,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3_milxHO_Xa" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8178$" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3_milxHO_Xb" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8178_" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1446,7 +1446,7 @@
                                 <node concept="3clFbF" id="2nByCcxyQw3" role="3cqZAp">
                                   <node concept="2OqwBi" id="2nByCcxyQT5" role="3clFbG">
                                     <node concept="37vLTw" id="2nByCcxyQw2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2nByCcxyQ49" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8178A" />
                                     </node>
                                     <node concept="2qgKlT" id="2nByCcxyRtj" role="2OqNvi">
                                       <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -1465,9 +1465,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2nByCcxyQ49" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8178A" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2nByCcxyQ4a" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8178B" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1543,7 +1543,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="2nByCcxzicC" role="3uHU7B">
                                       <node concept="37vLTw" id="2nByCcxzicD" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2nByCcxzicF" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8178C" />
                                       </node>
                                       <node concept="3TrcHB" id="2nByCcxzicE" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1552,9 +1552,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2nByCcxzicF" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8178C" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2nByCcxzicG" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8178D" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1593,7 +1593,7 @@
                                 <node concept="3clFbF" id="2nByCcxzlY_" role="3cqZAp">
                                   <node concept="2OqwBi" id="2nByCcxzlYA" role="3clFbG">
                                     <node concept="37vLTw" id="2nByCcxzlYB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2nByCcxzlYF" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8178E" />
                                     </node>
                                     <node concept="2qgKlT" id="2nByCcxzlYC" role="2OqNvi">
                                       <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -1607,9 +1607,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2nByCcxzlYF" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8178E" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2nByCcxzlYG" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8178F" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1917,7 +1917,7 @@
                       <node concept="3clFbF" id="30L$xlcesJh" role="3cqZAp">
                         <node concept="2OqwBi" id="30L$xlcesUF" role="3clFbG">
                           <node concept="37vLTw" id="30L$xlcesJg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="30L$xlcesCL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8178G" />
                           </node>
                           <node concept="2qgKlT" id="30L$xlcet9v" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:30L$xlcejQ2" resolve="connectsToInstance" />
@@ -1926,9 +1926,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="30L$xlcesCL" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8178G" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="30L$xlcesCM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8178H" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1939,15 +1939,15 @@
                     <node concept="3clFbF" id="30L$xlceuKv" role="3cqZAp">
                       <node concept="2OqwBi" id="30L$xlceuUD" role="3clFbG">
                         <node concept="37vLTw" id="30L$xlceuKu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="30L$xlceuID" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8178I" />
                         </node>
                         <node concept="3YRAZt" id="30L$xlcevpA" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="30L$xlceuID" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8178I" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="30L$xlceuIE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8178J" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/intentions.mps
index e1ad64760b..712b73c736 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/intentions.mps
@@ -52,7 +52,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,7 +90,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/structure.mps
index 51e4e4f869..1550db44c7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/structure.mps
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
index c6a6466c31..e90cbc3201 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,6 +82,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -186,7 +187,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -290,7 +290,7 @@
                       <node concept="3clFbF" id="5Q9FzcI57n0" role="3cqZAp">
                         <node concept="2OqwBi" id="5Q9FzcI57n1" role="3clFbG">
                           <node concept="37vLTw" id="5Q9FzcI57n2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5Q9FzcI57n5" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8178K" />
                           </node>
                           <node concept="2qgKlT" id="5Q9FzcI57n3" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -301,9 +301,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5Q9FzcI57n5" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8178K" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5Q9FzcI57n6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8178L" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -401,7 +401,7 @@
                       <node concept="3clFbF" id="5Q9FzcI6uoY" role="3cqZAp">
                         <node concept="2OqwBi" id="5Q9FzcI6uoZ" role="3clFbG">
                           <node concept="37vLTw" id="5Q9FzcI6up0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5Q9FzcI6up4" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8178M" />
                           </node>
                           <node concept="2qgKlT" id="5Q9FzcI6up1" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -415,9 +415,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5Q9FzcI6up4" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8178M" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5Q9FzcI6up5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8178N" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/org.iets3.core.expr.dataflow.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/org.iets3.core.expr.dataflow.mpl
index 282aee01ca..03fe83f18b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/org.iets3.core.expr.dataflow.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/org.iets3.core.expr.dataflow.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
index 3c18a8c54a..6c2ce1b783 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/behavior.mps
@@ -115,7 +115,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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">
@@ -193,7 +193,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/constraints.mps
index 5ff2f1e561..fd393b1905 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/constraints.mps
@@ -33,7 +33,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps
index 6d4ca12847..190d465c65 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps
@@ -41,7 +41,7 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -55,7 +55,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -88,7 +88,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -101,7 +101,7 @@
       <concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n">
         <child id="8207263695491670784" name="priority" index="2EmURo" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -124,7 +124,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.datetime/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/migration.mps
index a4f3a48be7..944755cf82 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/migration.mps
@@ -11,7 +11,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.datetime/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/structure.mps
index 643f239d9e..bbb432b218 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/typesystem.mps
index 5ae7fcf6b4..08c8e15914 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/typesystem.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -202,7 +202,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.datetime/org.iets3.core.expr.datetime.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/org.iets3.core.expr.datetime.mpl
index 2e92072c46..6e1ab094a1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/org.iets3.core.expr.datetime.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/org.iets3.core.expr.datetime.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.doc/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/actions.mps
index 99b955d027..dc0371d466 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/actions.mps
@@ -70,7 +70,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/behavior.mps
index 76bdf0979b..a01fc02833 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/behavior.mps
@@ -113,7 +113,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
@@ -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.iets3.opensource/languages/org.iets3.core.expr.doc/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/constraints.mps
index 693500227e..c6f4b32c7a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/constraints.mps
@@ -42,7 +42,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps
index 7cd5c65961..f68311920c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps
@@ -73,7 +73,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" />
@@ -96,7 +96,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -176,7 +176,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>
@@ -193,7 +193,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" />
@@ -219,7 +219,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
     </language>
@@ -248,7 +248,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.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
index 68e959b442..e3bbf2ef52 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
@@ -51,7 +51,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -64,6 +64,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -137,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -159,7 +160,6 @@
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="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="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -229,7 +229,7 @@
                   <node concept="3clFbF" id="2c2AzQcAh15" role="3cqZAp">
                     <node concept="2OqwBi" id="2c2AzQcAhf0" role="3clFbG">
                       <node concept="37vLTw" id="2c2AzQcAh14" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2c2AzQcAgUT" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8178Q" />
                       </node>
                       <node concept="2qgKlT" id="2c2AzQcAhF3" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2c2AzQc_YDC" resolve="takeScreenshot" />
@@ -237,9 +237,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2c2AzQcAgUT" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178Q" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2c2AzQcAgUU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178R" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -383,15 +383,15 @@
                       <node concept="3clFbF" id="2c2AzQddjhu" role="3cqZAp">
                         <node concept="2OqwBi" id="2c2AzQddjGg" role="3clFbG">
                           <node concept="37vLTw" id="2c2AzQddjht" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2c2AzQddiZm" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8178S" />
                           </node>
                           <node concept="1$rogu" id="2c2AzQddkqI" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2c2AzQddiZm" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8178S" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2c2AzQddiZn" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8178T" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -426,7 +426,7 @@
                     <node concept="3clFbF" id="5AlTalNHAPI" role="3cqZAp">
                       <node concept="2OqwBi" id="5AlTalNHAPJ" role="3clFbG">
                         <node concept="37vLTw" id="5AlTalNHAPK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5AlTalNHAPN" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8178U" />
                         </node>
                         <node concept="1mIQ4w" id="5AlTalNHAPL" role="2OqNvi">
                           <node concept="chp4Y" id="5AlTalNHAPM" role="cj9EA">
@@ -436,9 +436,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5AlTalNHAPN" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8178U" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5AlTalNHAPO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8178V" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -561,7 +561,7 @@
                   <node concept="3clFbF" id="5AlTalNHBc8" role="3cqZAp">
                     <node concept="2OqwBi" id="5AlTalNHBc9" role="3clFbG">
                       <node concept="37vLTw" id="5AlTalNHBca" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5AlTalNHBcd" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8178W" />
                       </node>
                       <node concept="1mIQ4w" id="5AlTalNHBcb" role="2OqNvi">
                         <node concept="chp4Y" id="5AlTalNHBcc" role="cj9EA">
@@ -571,9 +571,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5AlTalNHBcd" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178W" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5AlTalNHBce" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178X" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -668,7 +668,7 @@
                   <node concept="3clFbF" id="C_BpXjS3OP" role="3cqZAp">
                     <node concept="2OqwBi" id="C_BpXjS3OR" role="3clFbG">
                       <node concept="37vLTw" id="C_BpXjS3OS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="C_BpXjS3Jl" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8178Y" />
                       </node>
                       <node concept="2qgKlT" id="C_BpXjS3OT" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2c2AzQc_YDC" resolve="takeScreenshot" />
@@ -676,9 +676,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="C_BpXjS3Jl" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8178Y" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="C_BpXjS3Jm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8178Z" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/structure.mps
index ce0ae17bbf..a7444b28cb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/structure.mps
@@ -58,7 +58,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/typesystem.mps
index 42ded3447d..ca0a2509fe 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/typesystem.mps
@@ -60,7 +60,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.doc/org.iets3.core.expr.doc.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/org.iets3.core.expr.doc.mpl
index b70525a02a..51da6a8fb1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/org.iets3.core.expr.doc.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/org.iets3.core.expr.doc.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
index ae53595256..25660b1fb1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
@@ -184,7 +184,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -215,7 +215,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -280,7 +280,7 @@
       <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="2880994019885263148" name="jetbrains.mps.lang.generator.structure.LoopMacroNamespaceAccessor" flags="ng" index="$GB7w">
@@ -342,6 +342,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
       </concept>
@@ -461,7 +462,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -491,7 +492,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -10958,7 +10958,7 @@
                                         <node concept="2OqwBi" id="4VwmaR3wuMs" role="3clFbG">
                                           <node concept="2OqwBi" id="4VwmaR3wxuZ" role="2Oq$k0">
                                             <node concept="37vLTw" id="4VwmaR3wute" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4VwmaR3wub2" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX81791" />
                                             </node>
                                             <node concept="3TrEf2" id="4VwmaR3wxRo" role="2OqNvi">
                                               <ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
@@ -10972,9 +10972,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4VwmaR3wub2" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX81791" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4VwmaR3wub3" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX81792" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -13419,7 +13419,7 @@
                                                 <node concept="2OqwBi" id="1URTIF$SSau" role="3clFbG">
                                                   <node concept="2OqwBi" id="1URTIF$SSav" role="2Oq$k0">
                                                     <node concept="37vLTw" id="1URTIF$SSaw" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="1URTIF$SSaz" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX81793" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1URTIF$SSax" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -13429,9 +13429,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="1URTIF$SSaz" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX81793" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="1URTIF$SSa$" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX81794" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -13737,7 +13737,7 @@
                                                 <node concept="2OqwBi" id="1URTIF$SHGH" role="3clFbG">
                                                   <node concept="2OqwBi" id="1URTIF$SA$p" role="2Oq$k0">
                                                     <node concept="37vLTw" id="1URTIF$S$qD" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="1URTIF$Sw5C" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX81795" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1URTIF$SD3$" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -13747,9 +13747,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="1URTIF$Sw5C" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX81795" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="1URTIF$Sw5D" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX81796" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -14129,7 +14129,7 @@
                                                 <node concept="2OqwBi" id="66if2wb6c79" role="3clFbG">
                                                   <node concept="2OqwBi" id="66if2wb6c7a" role="2Oq$k0">
                                                     <node concept="37vLTw" id="66if2wb6c7b" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="66if2wb6c7e" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX81797" />
                                                     </node>
                                                     <node concept="3TrEf2" id="66if2wb6c7c" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -14139,9 +14139,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="66if2wb6c7e" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX81797" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="66if2wb6c7f" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX81798" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -14463,7 +14463,7 @@
                                                 <node concept="2OqwBi" id="66if2wb6qSn" role="3clFbG">
                                                   <node concept="2OqwBi" id="66if2wb6qSo" role="2Oq$k0">
                                                     <node concept="37vLTw" id="66if2wb6qSp" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="66if2wb6qSs" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX81799" />
                                                     </node>
                                                     <node concept="3TrEf2" id="66if2wb6qSq" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -14473,9 +14473,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="66if2wb6qSs" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX81799" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="66if2wb6qSt" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX8179a" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -19197,12 +19197,12 @@
                   <node concept="3clFbF" id="6WstIz8LVtF" role="3cqZAp">
                     <node concept="2OqwBi" id="6WstIz8LVCb" role="3clFbG">
                       <node concept="37vLTw" id="6WstIz8LVtE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6WstIz8LVrq" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX8179b" />
                       </node>
                       <node concept="1P9Npp" id="6WstIz8LW1Q" role="2OqNvi">
                         <node concept="2OqwBi" id="6WstIz8LWfz" role="1P9ThW">
                           <node concept="37vLTw" id="6WstIz8LW4B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6WstIz8LVrq" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8179b" />
                           </node>
                           <node concept="2qgKlT" id="6WstIz8LWuj" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4CksDrmwwdX" resolve="reduce" />
@@ -19212,9 +19212,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6WstIz8LVrq" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8179b" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6WstIz8LVrr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8179c" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -19649,7 +19649,7 @@
                                     <node concept="2OqwBi" id="TA$XW2qqzk" role="2Oq$k0">
                                       <node concept="2OqwBi" id="TA$XW2qn8N" role="2Oq$k0">
                                         <node concept="37vLTw" id="TA$XW2qmNj" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="TA$XW2qlZz" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8179f" />
                                         </node>
                                         <node concept="2z74zc" id="TA$XW2qp0y" role="2OqNvi" />
                                       </node>
@@ -19659,15 +19659,15 @@
                                             <node concept="3clFbF" id="TA$XW2rJOj" role="3cqZAp">
                                               <node concept="2OqwBi" id="TA$XW2rJOk" role="3clFbG">
                                                 <node concept="37vLTw" id="TA$XW2rJOl" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="TA$XW2rJOn" resolve="n" />
+                                                  <ref role="3cqZAo" node="4z0AnX8179d" />
                                                 </node>
                                                 <node concept="2ZHEkA" id="TA$XW2rJOm" role="2OqNvi" />
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="Rh6nW" id="TA$XW2rJOn" role="1bW2Oz">
+                                          <node concept="gl6BB" id="4z0AnX8179d" role="1bW2Oz">
                                             <property role="TrG5h" value="n" />
-                                            <node concept="2jxLKc" id="TA$XW2rJOo" role="1tU5fm" />
+                                            <node concept="2jxLKc" id="4z0AnX8179e" role="1tU5fm" />
                                           </node>
                                         </node>
                                       </node>
@@ -19680,9 +19680,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="TA$XW2qlZz" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8179f" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="TA$XW2qlZ$" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8179g" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl
index 62ffb22edc..596dfb8415 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl
@@ -43,7 +43,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -120,7 +120,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
@@ -131,7 +130,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
index 32ff9456ef..031c41861d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
@@ -76,7 +76,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,7 +106,7 @@
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -137,6 +137,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" />
@@ -164,7 +165,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>
@@ -183,7 +184,6 @@
       <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
         <child id="1176906787974" name="rightExpression" index="576Qk" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -431,7 +431,7 @@
                               <node concept="3fqX7Q" id="kKmKqgh5Sl" role="3clFbG">
                                 <node concept="2OqwBi" id="kKmKqgh6dy" role="3fr31v">
                                   <node concept="37vLTw" id="kKmKqgh5Sy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="kKmKqgh5qo" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8179i" />
                                   </node>
                                   <node concept="3TrcHB" id="kKmKqgh7zd" role="2OqNvi">
                                     <ref role="3TsBF5" to="1mpc:lH$PujNZqX" resolve="warning" />
@@ -440,9 +440,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="kKmKqgh5qo" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8179i" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="kKmKqgh5qp" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8179j" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -461,7 +461,7 @@
                               <node concept="3clFbF" id="kKmKqghioP" role="3cqZAp">
                                 <node concept="2OqwBi" id="kKmKqghiEL" role="3clFbG">
                                   <node concept="37vLTw" id="kKmKqghioO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="kKmKqghi7Y" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8179k" />
                                   </node>
                                   <node concept="3TrcHB" id="kKmKqghjJF" role="2OqNvi">
                                     <ref role="3TsBF5" to="1mpc:lH$PujNZqX" resolve="warning" />
@@ -469,9 +469,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="kKmKqghi7Y" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8179k" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="kKmKqghi7Z" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8179l" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/editor.mps
index 143def6382..f9fd1a6ab8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/editor.mps
@@ -30,7 +30,7 @@
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -47,7 +47,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.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/structure.mps
index 57720d787b..9188aa098e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/typesystem.mps
index 2614ef9870..3a68fe33aa 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/models/typesystem.mps
@@ -99,7 +99,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl
index 66b46e6088..493877c095 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl
@@ -32,7 +32,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -66,12 +66,11 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
index f088c514fa..5ca2902fd9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
@@ -113,7 +113,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -130,7 +130,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -169,7 +169,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -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" />
@@ -289,7 +290,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -318,7 +319,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -707,7 +707,7 @@
                                           <node concept="30H73N" id="4NOdIlYzz$y" role="3uHU7w" />
                                           <node concept="2OqwBi" id="4NOdIlYzz$z" role="3uHU7B">
                                             <node concept="37vLTw" id="4NOdIlYzz$$" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4NOdIlYzz$A" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8179m" />
                                             </node>
                                             <node concept="3TrEf2" id="4NOdIlYzz$_" role="2OqNvi">
                                               <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -716,9 +716,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4NOdIlYzz$A" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8179m" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4NOdIlYzz$B" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8179n" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl
index bc6123aa94..0d0008de76 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl
@@ -34,7 +34,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -98,12 +98,11 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/generator/template/org.iets3.core.expr.genjava.datetime@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/generator/template/org.iets3.core.expr.genjava.datetime@generator.mps
index d3a48adedf..dc10bbe250 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/generator/template/org.iets3.core.expr.genjava.datetime@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/generator/template/org.iets3.core.expr.genjava.datetime@generator.mps
@@ -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>
@@ -120,7 +120,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -232,7 +232,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl
index 7c4a7be5cb..ca8aa0e8d2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl
@@ -38,7 +38,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -103,7 +103,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
@@ -112,7 +111,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
index 54b1ee9e37..504955c786 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
@@ -95,7 +95,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>
@@ -112,7 +112,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -152,7 +152,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -203,6 +203,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -282,7 +283,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>
@@ -290,7 +291,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
       </concept>
@@ -625,7 +625,7 @@
                       <node concept="3clFbF" id="5LerK4rhf0N" role="3cqZAp">
                         <node concept="2OqwBi" id="5LerK4rhf0O" role="3clFbG">
                           <node concept="37vLTw" id="5LerK4rhf0P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5LerK4rhf0R" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8179o" />
                           </node>
                           <node concept="3TrcHB" id="5LerK4rhf0Q" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -633,9 +633,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5LerK4rhf0R" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8179o" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5LerK4rhf0S" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8179p" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/org.iets3.core.expr.genjava.messages.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/org.iets3.core.expr.genjava.messages.mpl
index 9f4dc7a043..ebe07a97a1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/org.iets3.core.expr.genjava.messages.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/org.iets3.core.expr.genjava.messages.mpl
@@ -35,7 +35,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" />
@@ -101,7 +101,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -109,7 +108,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
index a83519324c..beae9aafab 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
@@ -11,7 +11,7 @@
     <import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="rw5i" ref="r:4243557f-1c7a-4d6b-953a-807576e4bee7(org.iets3.core.expr.genjava.base@generator)" />
-    <import index="wfax" ref="r:5d67e954-7960-4214-97d1-8f5d3823a964(org.iets3.core.expr.genjava.simpleTypes.rt.rt)" />
+    <import index="wfax" ref="r:5d67e954-7960-4214-97d1-8f5d3823a964(org.iets3.core.expr.collections.rt.rt)" />
     <import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
@@ -42,7 +42,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -88,7 +88,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -145,7 +145,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -167,7 +167,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -210,7 +210,7 @@
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -243,6 +243,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" />
@@ -336,7 +337,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -355,7 +356,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="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" />
@@ -4236,7 +4236,7 @@
                                           <node concept="2OqwBi" id="4ZjVa_SdrJ_" role="3uHU7w">
                                             <node concept="2OqwBi" id="4ZjVa_Sdk3K" role="2Oq$k0">
                                               <node concept="37vLTw" id="4ZjVa_SdiXc" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4ZjVa_Sd0Jx" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX8179q" />
                                               </node>
                                               <node concept="2qgKlT" id="4ZjVa_SdoVg" role="2OqNvi">
                                                 <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -4246,7 +4246,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="4ZjVa_Sd6$7" role="3uHU7B">
                                             <node concept="37vLTw" id="4ZjVa_Sd5sB" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4ZjVa_Sd0Jx" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8179q" />
                                             </node>
                                             <node concept="1mIQ4w" id="4ZjVa_SdbpA" role="2OqNvi">
                                               <node concept="chp4Y" id="4ZjVa_SddKT" role="cj9EA">
@@ -4257,9 +4257,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4ZjVa_Sd0Jx" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8179q" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4ZjVa_Sd0Jy" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8179r" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl
index 3baaf0722e..020a77d13c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl
@@ -39,7 +39,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -105,7 +105,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
@@ -115,7 +114,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/generator/template/main@generator.mps
index 5a3b417d08..52b9b5d969 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/generator/template/main@generator.mps
@@ -24,7 +24,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -107,7 +107,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,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" />
@@ -156,7 +156,7 @@
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -237,7 +237,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.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/editor.mps
index 30d5ee894f..0329f4ab02 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/editor.mps
@@ -44,7 +44,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -73,7 +73,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/structure.mps
index e380b23775..f8e5f6bc2a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/structure.mps
@@ -36,7 +36,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/typesystem.mps
index f8d507bcfc..dd789bb4b4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/models/typesystem.mps
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl
index b417580fd1..a2d780924a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl
@@ -32,7 +32,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -90,7 +90,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -101,7 +100,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/models/org.iets3.core.expr.genjava.stateMachineExample.runtime.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/models/org.iets3.core.expr.genjava.stateMachineExample.runtime.mps
index b12fbe6593..3bd5c2083e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/models/org.iets3.core.expr.genjava.stateMachineExample.runtime.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/models/org.iets3.core.expr.genjava.stateMachineExample.runtime.mps
@@ -77,7 +77,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>
@@ -94,7 +94,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -102,7 +102,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/org.iets3.core.expr.genjava.stateMachineExample.runtime.msd b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/org.iets3.core.expr.genjava.stateMachineExample.runtime.msd
index a902f9f61c..e6e73a171c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/org.iets3.core.expr.genjava.stateMachineExample.runtime.msd
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/org.iets3.core.expr.genjava.stateMachineExample.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.stateMachineExample.runtime" uuid="c49c312b-d054-42ac-9d93-44ec8758c28b" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.stateMachineExample.runtime" uuid="c49c312b-d054-42ac-9d93-44ec8758c28b" 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:f2801650-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.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/models/org.iets3.core.expr.genjava.stateMachineExample.sandbox.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/models/org.iets3.core.expr.genjava.stateMachineExample.sandbox.mps
index 88fa929019..2d9b4e0680 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/models/org.iets3.core.expr.genjava.stateMachineExample.sandbox.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/models/org.iets3.core.expr.genjava.stateMachineExample.sandbox.mps
@@ -51,7 +51,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd
index 913188f650..496a1093e5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.stateMachineExample.sandbox" uuid="6b5eff48-8eaa-4e24-9818-9fbfa6c3532c" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.stateMachineExample.sandbox" uuid="6b5eff48-8eaa-4e24-9818-9fbfa6c3532c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -22,7 +21,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/generator/templates/org.iets3.core.expr.genjava.stringvalidation.generator.templates@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/generator/templates/org.iets3.core.expr.genjava.stringvalidation.generator.templates@generator.mps
index d563178350..2464c83383 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/generator/templates/org.iets3.core.expr.genjava.stringvalidation.generator.templates@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/generator/templates/org.iets3.core.expr.genjava.stringvalidation.generator.templates@generator.mps
@@ -68,7 +68,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -79,7 +79,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -147,7 +147,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/org.iets3.core.expr.genjava.stringvalidation.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/org.iets3.core.expr.genjava.stringvalidation.mpl
index 9878320f3f..c6c6945b29 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/org.iets3.core.expr.genjava.stringvalidation.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.stringvalidation/org.iets3.core.expr.genjava.stringvalidation.mpl
@@ -35,7 +35,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" />
@@ -100,7 +100,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
   </dependencies>
@@ -108,7 +107,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps
index a11b6abe73..e601cbf473 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps
@@ -132,7 +132,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -149,7 +149,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">
@@ -293,7 +293,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl
index 921924317a..b3b278b900 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl
@@ -42,7 +42,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +111,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</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.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
index b6b1bcee7a..79af0eed9b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
@@ -54,7 +54,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -153,7 +153,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -176,7 +176,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">
@@ -213,7 +213,7 @@
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="7473026166162297915" name="jetbrains.mps.lang.generator.structure.DropAttributeRule" flags="lg" index="CY16f">
@@ -265,6 +265,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" />
@@ -309,7 +310,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>
@@ -378,7 +379,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -401,7 +402,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -545,7 +545,7 @@
                               <node concept="3fqX7Q" id="1Ds3skyz5bd" role="3clFbG">
                                 <node concept="2OqwBi" id="1Ds3skyz5SZ" role="3fr31v">
                                   <node concept="37vLTw" id="1Ds3skyz5bu" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1Ds3skyz4L1" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX8179t" />
                                   </node>
                                   <node concept="1mIQ4w" id="1Ds3skyz75X" role="2OqNvi">
                                     <node concept="chp4Y" id="1Ds3skyz7zb" role="cj9EA">
@@ -556,9 +556,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1Ds3skyz4L1" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX8179t" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1Ds3skyz4L2" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX8179u" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2226,7 +2226,7 @@
                                         <node concept="2OqwBi" id="27xhIwhfIhZ" role="10QFUP">
                                           <node concept="2OqwBi" id="27xhIwhfGYQ" role="2Oq$k0">
                                             <node concept="37vLTw" id="27xhIwhfGuU" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="27xhIwhfvzW" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8179v" />
                                             </node>
                                             <node concept="3TrEf2" id="27xhIwhfHrV" role="2OqNvi">
                                               <ref role="3Tt5mk" to="av4b:6HHp2WmRVXx" resolve="item" />
@@ -2254,7 +2254,7 @@
                                 <node concept="2OqwBi" id="27xhIwhfwO2" role="2Oq$k0">
                                   <node concept="2OqwBi" id="27xhIwhfvTU" role="2Oq$k0">
                                     <node concept="37vLTw" id="27xhIwhfvDU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="27xhIwhfvzW" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8179v" />
                                     </node>
                                     <node concept="3TrEf2" id="27xhIwhfw8C" role="2OqNvi">
                                       <ref role="3Tt5mk" to="av4b:6HHp2WmRVXx" resolve="item" />
@@ -2273,9 +2273,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="27xhIwhfvzW" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX8179v" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="27xhIwhfvzX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX8179w" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
index c908a16277..a6ceba9ade 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
@@ -38,7 +38,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-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" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
@@ -121,7 +120,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
index 000be4b3eb..4cd5810d6e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
@@ -73,7 +73,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">
@@ -205,7 +205,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -229,7 +229,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -298,7 +298,7 @@
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="2880994019885263148" name="jetbrains.mps.lang.generator.structure.LoopMacroNamespaceAccessor" flags="ng" index="$GB7w">
@@ -359,6 +359,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" />
@@ -473,7 +474,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -513,7 +514,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>
@@ -2759,7 +2759,7 @@
                                         <node concept="2OqwBi" id="441I_tWCz6S" role="3clFbG">
                                           <node concept="2OqwBi" id="441I_tWCvdw" role="2Oq$k0">
                                             <node concept="37vLTw" id="441I_tWCuAM" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="441I_tWCtNG" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8179x" />
                                             </node>
                                             <node concept="3TrEf2" id="441I_tWCxip" role="2OqNvi">
                                               <ref role="3Tt5mk" to="tpee:h9B3oxE" resolve="visibility" />
@@ -2773,9 +2773,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="441I_tWCtNG" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8179x" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="441I_tWCtNH" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8179y" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -2843,7 +2843,7 @@
                                         <node concept="2OqwBi" id="2cnTPpTo0Wt" role="3clFbG">
                                           <node concept="2OqwBi" id="2cnTPpT$fUv" role="2Oq$k0">
                                             <node concept="37vLTw" id="2cnTPpT$fDo" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2cnTPpTnQko" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX8179z" />
                                             </node>
                                             <node concept="3TrEf2" id="2cnTPpT$gdk" role="2OqNvi">
                                               <ref role="3Tt5mk" to="yv47:4ptnK4jbqZQ" resolve="field" />
@@ -2853,9 +2853,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="2cnTPpTnQko" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX8179z" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="2cnTPpTnQkp" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX8179$" role="1tU5fm" />
                                     </node>
                                   </node>
                                   <node concept="1nlBCl" id="2cnTPpTnQkq" role="2S7zOq">
@@ -2949,7 +2949,7 @@
                       <node concept="3clFbF" id="2cnTPpTnunO" role="3cqZAp">
                         <node concept="2OqwBi" id="2cnTPpTnuTz" role="3clFbG">
                           <node concept="37vLTw" id="2cnTPpTnunN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2cnTPpTnu2o" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8179_" />
                           </node>
                           <node concept="1mIQ4w" id="2cnTPpTnvTQ" role="2OqNvi">
                             <node concept="chp4Y" id="2cnTPpTnwct" role="cj9EA">
@@ -2959,9 +2959,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2cnTPpTnu2o" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8179_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2cnTPpTnu2p" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8179A" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7432,7 +7432,7 @@
                           <node concept="2OqwBi" id="oj24_oaDOY" role="3uHU7B">
                             <node concept="2OqwBi" id="oj24_oa$_w" role="2Oq$k0">
                               <node concept="37vLTw" id="oj24_oa$lw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="oj24_oa$fo" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8179B" />
                               </node>
                               <node concept="3Tsc0h" id="oj24_oa$YI" role="2OqNvi">
                                 <ref role="3TtcxE" to="yv47:15mJ3JeHVgR" resolve="setters" />
@@ -7443,9 +7443,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="oj24_oa$fo" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8179B" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="oj24_oa$fp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8179C" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7693,7 +7693,7 @@
                           <node concept="2OqwBi" id="oj24_oclfD" role="3uHU7B">
                             <node concept="2OqwBi" id="oj24_oclfE" role="2Oq$k0">
                               <node concept="37vLTw" id="oj24_oclfF" role="2Oq$k0">
-                                <ref role="3cqZAo" node="oj24_oclfI" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX8179D" />
                               </node>
                               <node concept="3Tsc0h" id="oj24_oclfG" role="2OqNvi">
                                 <ref role="3TtcxE" to="yv47:15mJ3JeHVgR" resolve="setters" />
@@ -7707,9 +7707,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="oj24_oclfI" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX8179D" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="oj24_oclfJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX8179E" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -9493,14 +9493,14 @@
                     <node concept="2OqwBi" id="7rdMSLlhUw_" role="3clFbG">
                       <node concept="2OqwBi" id="7rdMSLlhU1K" role="2Oq$k0">
                         <node concept="37vLTw" id="7rdMSLlhTRT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7rdMSLlhTOg" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8179F" />
                         </node>
                         <node concept="1mfA1w" id="7rdMSLlhUea" role="2OqNvi" />
                       </node>
                       <node concept="1P9Npp" id="7rdMSLlhUC8" role="2OqNvi">
                         <node concept="2OqwBi" id="7rdMSLlhURZ" role="1P9ThW">
                           <node concept="37vLTw" id="7rdMSLlhUF3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7rdMSLlhTOg" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX8179F" />
                           </node>
                           <node concept="2qgKlT" id="7rdMSLlhV5p" role="2OqNvi">
                             <ref role="37wK5l" to="nu60:4CksDrmwwdX" resolve="reduce" />
@@ -9510,9 +9510,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7rdMSLlhTOg" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX8179F" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7rdMSLlhTOh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX8179G" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -10419,7 +10419,7 @@
                                   <node concept="2OqwBi" id="Wka9OVqY9o" role="3uHU7B">
                                     <node concept="2OqwBi" id="Wka9OVqY9p" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVqY9q" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Wka9OVqY9$" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8179H" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVqY9r" role="2OqNvi" />
                                     </node>
@@ -10432,7 +10432,7 @@
                                   <node concept="2OqwBi" id="Wka9OVqY9u" role="3uHU7w">
                                     <node concept="2OqwBi" id="Wka9OVqY9v" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVqY9w" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Wka9OVqY9$" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8179H" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVqY9x" role="2OqNvi" />
                                     </node>
@@ -10445,9 +10445,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="Wka9OVqY9$" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8179H" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="Wka9OVqY9_" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8179I" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -10599,7 +10599,7 @@
                                   <node concept="2OqwBi" id="Wka9OVsPNC" role="3uHU7w">
                                     <node concept="2OqwBi" id="Wka9OVsPND" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVsPNE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Wka9OVsPNO" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8179J" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVsPNF" role="2OqNvi" />
                                     </node>
@@ -10612,7 +10612,7 @@
                                   <node concept="2OqwBi" id="Wka9OVsPNI" role="3uHU7B">
                                     <node concept="2OqwBi" id="Wka9OVsPNJ" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVsPNK" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Wka9OVsPNO" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8179J" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVsPNL" role="2OqNvi" />
                                     </node>
@@ -10625,9 +10625,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="Wka9OVsPNO" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8179J" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="Wka9OVsPNP" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8179K" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -10717,7 +10717,7 @@
                                 <node concept="2OqwBi" id="6XE8Bc$gE4H" role="3clFbG">
                                   <node concept="2OqwBi" id="6XE8Bc$gE4I" role="2Oq$k0">
                                     <node concept="37vLTw" id="6XE8Bc$gE4J" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6XE8Bc$gE4N" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8179L" />
                                     </node>
                                     <node concept="3JvlWi" id="6XE8Bc$gE4K" role="2OqNvi" />
                                   </node>
@@ -10729,9 +10729,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6XE8Bc$gE4N" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX8179L" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6XE8Bc$gE4O" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX8179M" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
index 8c486d5d81..f8bf8e9079 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
@@ -43,7 +43,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -117,7 +117,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false" scope="generate-into">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
@@ -129,7 +128,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
index 2d88ca085c..4f59bb6f9a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
@@ -77,7 +77,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -197,7 +197,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>
@@ -231,7 +231,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" />
@@ -259,6 +259,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" />
@@ -341,7 +342,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -365,7 +366,7 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJij" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
     </language>
@@ -388,7 +389,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -644,7 +644,7 @@
                                     <node concept="2OqwBi" id="4kfjPBKftU6" role="3clFbG">
                                       <node concept="2OqwBi" id="4kfjPBKftU7" role="2Oq$k0">
                                         <node concept="37vLTw" id="4kfjPBKftU8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4kfjPBKftUb" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX8179O" />
                                         </node>
                                         <node concept="3Tsc0h" id="4kfjPBKftU9" role="2OqNvi">
                                           <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -654,9 +654,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4kfjPBKftUb" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8179O" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4kfjPBKftUc" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8179P" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -706,7 +706,7 @@
                                 <node concept="3clFbF" id="6hYPZtwti06" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hYPZtwtig0" role="3clFbG">
                                     <node concept="37vLTw" id="6hYPZtwti05" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6hYPZtwthNh" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8179Q" />
                                     </node>
                                     <node concept="1mIQ4w" id="6hYPZtwtiRx" role="2OqNvi">
                                       <node concept="chp4Y" id="6hYPZtwtj54" role="cj9EA">
@@ -716,9 +716,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hYPZtwthNh" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8179Q" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6hYPZtwthNi" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8179R" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -950,7 +950,7 @@
                                 <node concept="3clFbF" id="4FiaYBCEewC" role="3cqZAp">
                                   <node concept="2OqwBi" id="4FiaYBCEewD" role="3clFbG">
                                     <node concept="37vLTw" id="4FiaYBCEewE" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4FiaYBCEewH" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8179S" />
                                     </node>
                                     <node concept="1mIQ4w" id="4FiaYBCEewF" role="2OqNvi">
                                       <node concept="chp4Y" id="4FiaYBCEewG" role="cj9EA">
@@ -960,9 +960,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4FiaYBCEewH" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8179S" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4FiaYBCEewI" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8179T" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1136,7 +1136,7 @@
                                   <node concept="3clFbF" id="4FiaYBCECtI" role="3cqZAp">
                                     <node concept="2OqwBi" id="4FiaYBCECKf" role="3clFbG">
                                       <node concept="37vLTw" id="4FiaYBCECtH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4FiaYBCECbP" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX8179U" />
                                       </node>
                                       <node concept="2qgKlT" id="4FiaYBCEExE" role="2OqNvi">
                                         <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
@@ -1144,9 +1144,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4FiaYBCECbP" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX8179U" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4FiaYBCECbQ" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX8179V" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1180,7 +1180,7 @@
                                 <node concept="3clFbF" id="4FiaYBCF4cp" role="3cqZAp">
                                   <node concept="2OqwBi" id="4FiaYBCF4qz" role="3clFbG">
                                     <node concept="37vLTw" id="4FiaYBCF4co" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4FiaYBCF41G" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX8179W" />
                                     </node>
                                     <node concept="2qgKlT" id="4FiaYBCF5RH" role="2OqNvi">
                                       <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
@@ -1188,9 +1188,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4FiaYBCF41G" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX8179W" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4FiaYBCF41H" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX8179X" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/editor.mps
index 46c01ae20f..dacc229409 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/editor.mps
@@ -41,7 +41,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/structure.mps
index 97414b1813..76c2b116d3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/models/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl
index 5bfe674de4..002c0333f5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl
@@ -41,7 +41,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -114,7 +114,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false" scope="generate-into">9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)</dependency>
@@ -123,7 +122,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
index 32252e2616..3e2edcc8cc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
@@ -64,7 +64,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">
@@ -159,7 +159,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -177,7 +177,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -198,6 +198,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -315,7 +316,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">
@@ -378,7 +379,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -919,7 +919,7 @@
                     <node concept="3clFbF" id="5L2mTKmAgKi" role="3cqZAp">
                       <node concept="2OqwBi" id="5L2mTKmAgXS" role="3clFbG">
                         <node concept="37vLTw" id="5L2mTKmAgKh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5L2mTKmAgwO" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX8179Y" />
                         </node>
                         <node concept="2qgKlT" id="5L2mTKmAhfh" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
@@ -935,7 +935,7 @@
                             <node concept="34jXtK" id="5L2mTKmAq8U" role="2OqNvi">
                               <node concept="2OqwBi" id="5L2mTKmAq_m" role="25WWJ7">
                                 <node concept="37vLTw" id="5L2mTKmAqoc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5L2mTKmAgwO" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX8179Y" />
                                 </node>
                                 <node concept="2bSWHS" id="5L2mTKmAr2E" role="2OqNvi" />
                               </node>
@@ -945,9 +945,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5L2mTKmAgwO" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX8179Y" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5L2mTKmAgwP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX8179Z" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1038,7 +1038,7 @@
                     <node concept="3clFbF" id="7S4tmubEVvT" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEVIc" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEVvS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubEVmq" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817a0" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEVWA" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -1046,9 +1046,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubEVmq" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817a0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubEVmr" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817a1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1480,7 +1480,7 @@
                           </node>
                           <node concept="3EllGN" id="dsAFRkcOWL" role="37vLTJ">
                             <node concept="37vLTw" id="dsAFRkcPhO" role="3ElVtu">
-                              <ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817a2" />
                             </node>
                             <node concept="37vLTw" id="dsAFRkcNEs" role="3ElQJh">
                               <ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
@@ -1491,7 +1491,7 @@
                       <node concept="3clFbF" id="49WTic8eCyZ" role="3cqZAp">
                         <node concept="2OqwBi" id="49WTic8eCA1" role="3clFbG">
                           <node concept="37vLTw" id="49WTic8eCyY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" />
                           </node>
                           <node concept="1P9Npp" id="49WTic8eCFh" role="2OqNvi">
                             <node concept="37vLTw" id="dsAFRkcN1G" role="1P9ThW">
@@ -1505,7 +1505,7 @@
                       <node concept="2OqwBi" id="7cphKbKZSbM" role="3uHU7w">
                         <node concept="2OqwBi" id="7cphKbKZRrI" role="2Oq$k0">
                           <node concept="37vLTw" id="7cphKbKZR93" role="2Oq$k0">
-                            <ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" />
                           </node>
                           <node concept="2Xjw5R" id="7cphKbKZRGP" role="2OqNvi">
                             <node concept="1xMEDy" id="7cphKbKZRGR" role="1xVPHs">
@@ -1523,7 +1523,7 @@
                         </node>
                         <node concept="2OqwBi" id="6ITtBskTCMh" role="3uHU7B">
                           <node concept="37vLTw" id="6ITtBskTCAp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" />
                           </node>
                           <node concept="2Xjw5R" id="6ITtBskTDpX" role="2OqNvi">
                             <node concept="1xMEDy" id="6ITtBskTDpZ" role="1xVPHs">
@@ -1537,9 +1537,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="49WTic8eCwS" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817a2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="49WTic8eCwT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817a3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1839,7 +1839,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RIvadv2InN" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817a4" />
                       </node>
                       <node concept="3TrEf2" id="RIvadv2IRA" role="2OqNvi">
                         <ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
@@ -1847,9 +1847,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="RIvadv2InN" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817a4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="RIvadv2InO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817a5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2070,7 +2070,7 @@
                               <node concept="2OqwBi" id="3E_uh2jovMZ" role="3uHU7w">
                                 <node concept="2OqwBi" id="3E_uh2jouHE" role="2Oq$k0">
                                   <node concept="37vLTw" id="3E_uh2joufI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3E_uh2joqjK" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817a6" />
                                   </node>
                                   <node concept="3TrEf2" id="3E_uh2jovym" role="2OqNvi">
                                     <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -2083,7 +2083,7 @@
                               <node concept="3cpWs3" id="3E_uh2josO4" role="3uHU7B">
                                 <node concept="2OqwBi" id="3E_uh2joqIQ" role="3uHU7B">
                                   <node concept="37vLTw" id="3E_uh2joqk5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3E_uh2joqjK" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817a6" />
                                   </node>
                                   <node concept="3TrcHB" id="3E_uh2jornx" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2096,9 +2096,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3E_uh2joqjK" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817a6" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3E_uh2joqjL" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817a7" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2154,7 +2154,7 @@
                                 <node concept="3clFbF" id="4zsmO3KQbN9" role="3cqZAp">
                                   <node concept="2OqwBi" id="4zsmO3KQcfn" role="3clFbG">
                                     <node concept="37vLTw" id="4zsmO3KQbN8" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4zsmO3KQbtB" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817a8" />
                                     </node>
                                     <node concept="2qgKlT" id="4zsmO3KQnAi" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:7NyyyjNtbn2" resolve="getTreeNode" />
@@ -2165,9 +2165,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4zsmO3KQbtB" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817a8" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4zsmO3KQbtC" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817a9" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2448,7 +2448,7 @@
                       <node concept="3fqX7Q" id="5YygIlaVSU_" role="3uHU7w">
                         <node concept="2OqwBi" id="5YygIlaVTih" role="3fr31v">
                           <node concept="37vLTw" id="5YygIlaVT4Q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="18$bUx58eYL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817aa" />
                           </node>
                           <node concept="1mIQ4w" id="5YygIlaVTEh" role="2OqNvi">
                             <node concept="chp4Y" id="5YygIlaVTSf" role="cj9EA">
@@ -2460,7 +2460,7 @@
                       <node concept="3fqX7Q" id="18$bUx58f5p" role="3uHU7B">
                         <node concept="2OqwBi" id="18$bUx58fil" role="3fr31v">
                           <node concept="37vLTw" id="18$bUx58f8f" role="2Oq$k0">
-                            <ref role="3cqZAo" node="18$bUx58eYL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817aa" />
                           </node>
                           <node concept="1mIQ4w" id="18$bUx58fzB" role="2OqNvi">
                             <node concept="chp4Y" id="18$bUx58fIN" role="cj9EA">
@@ -2472,9 +2472,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="18$bUx58eYL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817aa" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="18$bUx58eYM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ab" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2768,7 +2768,7 @@
                     <node concept="3fqX7Q" id="44yGPKlmayZ" role="3clFbG">
                       <node concept="2OqwBi" id="44yGPKlmaVo" role="3fr31v">
                         <node concept="37vLTw" id="44yGPKlmaz6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="44yGPKlmajI" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ac" />
                         </node>
                         <node concept="1mIQ4w" id="44yGPKlmbxr" role="2OqNvi">
                           <node concept="chp4Y" id="44yGPKlmbNh" role="cj9EA">
@@ -2779,9 +2779,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="44yGPKlmajI" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ac" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="44yGPKlmajJ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ad" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3471,7 +3471,7 @@
                           <node concept="3clFbF" id="6o_i6GxnZcf" role="3cqZAp">
                             <node concept="2OqwBi" id="6o_i6GxnZcg" role="3clFbG">
                               <node concept="37vLTw" id="6o_i6GxnZch" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6o_i6GxnZck" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817ae" />
                               </node>
                               <node concept="1mIQ4w" id="6o_i6GxnZci" role="2OqNvi">
                                 <node concept="chp4Y" id="6o_i6GxnZcj" role="cj9EA">
@@ -3481,9 +3481,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6o_i6GxnZck" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ae" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6o_i6GxnZcl" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817af" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3494,7 +3494,7 @@
                         <node concept="3clFbF" id="6o_i6GxnZcp" role="3cqZAp">
                           <node concept="2OqwBi" id="6o_i6GxnZcq" role="3clFbG">
                             <node concept="37vLTw" id="6o_i6GxnZcr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6o_i6GxnZct" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ag" />
                             </node>
                             <node concept="3TrEf2" id="6o_i6GxnZcs" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3502,9 +3502,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6o_i6GxnZct" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817ag" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6o_i6GxnZcu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817ah" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3721,7 +3721,7 @@
                               <node concept="3clFbF" id="74u6qanU7x2" role="3cqZAp">
                                 <node concept="2OqwBi" id="74u6qanU7MJ" role="3clFbG">
                                   <node concept="37vLTw" id="74u6qanU7x1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="74u6qanU7d5" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817ai" />
                                   </node>
                                   <node concept="1mIQ4w" id="74u6qanU8kC" role="2OqNvi">
                                     <node concept="chp4Y" id="74u6qanU8Fd" role="cj9EA">
@@ -3731,9 +3731,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="74u6qanU7d5" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817ai" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="74u6qanU7d6" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817aj" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3746,7 +3746,7 @@
                                 <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                                 <node concept="2OqwBi" id="74u6qanUbPk" role="37wK5m">
                                   <node concept="37vLTw" id="74u6qanUbkN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="74u6qanUabH" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817ak" />
                                   </node>
                                   <node concept="3TrEf2" id="74u6qanUc89" role="2OqNvi">
                                     <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3755,9 +3755,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="74u6qanUabH" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817ak" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="74u6qanUabI" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817al" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4215,7 +4215,7 @@
                     <node concept="3clFbF" id="7S4tmubEBqN" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEBD6" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEBqM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubEBhx" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817am" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEBRg" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -4223,9 +4223,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubEBhx" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817am" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubEBhy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817an" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4734,7 +4734,7 @@
                     <node concept="2OqwBi" id="6NpHfQ5HXCa" role="3clFbG">
                       <node concept="2OqwBi" id="6NpHfQ5HU2y" role="2Oq$k0">
                         <node concept="37vLTw" id="6NpHfQ5HTOn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6NpHfQ5HTKh" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ao" />
                         </node>
                         <node concept="1mfA1w" id="6NpHfQ5HUiy" role="2OqNvi" />
                       </node>
@@ -4746,9 +4746,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6NpHfQ5HTKh" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ao" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6NpHfQ5HTKi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ap" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4792,7 +4792,7 @@
                       <node concept="2OqwBi" id="6NpHfQ5I9oM" role="3fr31v">
                         <node concept="2OqwBi" id="6NpHfQ5I9oN" role="2Oq$k0">
                           <node concept="37vLTw" id="6NpHfQ5I9oO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6NpHfQ5I7BU" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817aq" />
                           </node>
                           <node concept="1mfA1w" id="6NpHfQ5I9oP" role="2OqNvi" />
                         </node>
@@ -4805,9 +4805,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6NpHfQ5I7BU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817aq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6NpHfQ5I7BV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ar" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5110,7 +5110,7 @@
                     <node concept="3clFbF" id="7S4tmubEJUp" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEK6B" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEJUo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubEJN0" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817as" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEKkQ" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -5118,9 +5118,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubEJN0" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817as" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubEJN1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817at" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
index 4f7df44b6e..fa5d71feba 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
@@ -81,7 +81,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,6 +119,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -178,7 +179,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">
@@ -204,7 +205,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
     </language>
   </registry>
@@ -369,7 +369,7 @@
                     <node concept="3clFbF" id="6b_jefnKy$L" role="3cqZAp">
                       <node concept="2OqwBi" id="6b_jefnKy$M" role="3clFbG">
                         <node concept="37vLTw" id="6b_jefnKy$N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6b_jefnKy$Q" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817au" />
                         </node>
                         <node concept="1mIQ4w" id="6b_jefnKy$O" role="2OqNvi">
                           <node concept="chp4Y" id="6b_jefnKy$P" role="cj9EA">
@@ -379,9 +379,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6b_jefnKy$Q" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817au" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6b_jefnKy$R" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817av" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -733,7 +733,7 @@
                                 <node concept="2OqwBi" id="4U5vykej9IO" role="3clFbG">
                                   <node concept="2OqwBi" id="4U5vykej9IP" role="2Oq$k0">
                                     <node concept="37vLTw" id="4U5vykej9IQ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4U5vykej9IU" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817aw" />
                                     </node>
                                     <node concept="3Tsc0h" id="4U5vykej9IR" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
@@ -747,9 +747,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4U5vykej9IU" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817aw" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4U5vykej9IV" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817ax" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -967,7 +967,7 @@
                         <node concept="2OqwBi" id="1VmWkC0H$gv" role="3clFbG">
                           <node concept="2OqwBi" id="1VmWkC0HwZj" role="2Oq$k0">
                             <node concept="37vLTw" id="1VmWkC0Hw$V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1VmWkC0Hwq0" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ay" />
                             </node>
                             <node concept="3Tsc0h" id="1VmWkC0HxR8" role="2OqNvi">
                               <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
@@ -981,9 +981,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1VmWkC0Hwq0" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ay" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1VmWkC0Hwq1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817az" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps
index 0797e06970..3127294a0a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps
@@ -109,10 +109,10 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -141,14 +141,14 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7597241200646296619" name="jetbrains.mps.lang.editor.structure.QueryFunction_SNode" flags="in" index="3k4GqP" />
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -174,7 +174,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" />
@@ -186,7 +186,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -265,7 +265,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>
@@ -284,7 +284,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -335,7 +335,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
index f930a93cf3..7d70567f05 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
@@ -64,7 +64,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,6 +80,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -168,7 +169,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -178,7 +179,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -332,7 +332,7 @@
                         </node>
                         <node concept="2OqwBi" id="8xLOUtasQp" role="3uHU7B">
                           <node concept="37vLTw" id="8xLOUtasGn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="8xLOUtaswo" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817a$" />
                           </node>
                           <node concept="3TrEf2" id="8xLOUtat2K" role="2OqNvi">
                             <ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
@@ -341,9 +341,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="8xLOUtaswo" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817a$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="8xLOUtaswp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817a_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -354,7 +354,7 @@
                   <node concept="3clFbF" id="49WTic8eOGk" role="3cqZAp">
                     <node concept="2OqwBi" id="49WTic8eOJm" role="3clFbG">
                       <node concept="37vLTw" id="49WTic8eOGj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="49WTic8eOEL" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817aA" />
                       </node>
                       <node concept="1P9Npp" id="49WTic8eOP2" role="2OqNvi">
                         <node concept="2pJPEk" id="49WTic8eOYX" role="1P9ThW">
@@ -366,9 +366,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="49WTic8eOEL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817aA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="49WTic8eOEM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817aB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -442,7 +442,7 @@
                           <node concept="2OqwBi" id="4hUtPTIY8QT" role="2Oq$k0">
                             <node concept="2OqwBi" id="4hUtPTIY8QU" role="2Oq$k0">
                               <node concept="37vLTw" id="4hUtPTIY8QV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4hUtPTIY8Rf" resolve="shortLambda" />
+                                <ref role="3cqZAo" node="4z0AnX817aE" />
                               </node>
                               <node concept="2Rf3mk" id="4hUtPTIY8QW" role="2OqNvi">
                                 <node concept="1xMEDy" id="4hUtPTIY8QX" role="1xVPHs">
@@ -468,7 +468,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="4hUtPTIY8R9" role="3uHU7B">
                                         <node concept="37vLTw" id="4hUtPTIY8Ra" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4hUtPTIY8Rc" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817aC" />
                                         </node>
                                         <node concept="3TrEf2" id="4hUtPTIY8Rb" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
@@ -477,9 +477,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4hUtPTIY8Rc" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817aC" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4hUtPTIY8Rd" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817aD" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -488,9 +488,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4hUtPTIY8Rf" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817aE" role="1bW2Oz">
                       <property role="TrG5h" value="shortLambda" />
-                      <node concept="2jxLKc" id="4hUtPTIY8Rg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817aF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/migration.mps
index f5f61ee7c2..2060b41aea 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/migration.mps
@@ -33,7 +33,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" />
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
index 3bd20005fc..3bad46595b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:51edfe99-0380-475c-a3e9-1d4425eac12f(org.iets3.core.expr.lambda.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -34,7 +34,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -128,7 +128,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="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>
@@ -146,7 +146,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">
@@ -164,6 +164,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -235,7 +236,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -277,7 +278,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -451,7 +451,7 @@
                     <node concept="3clFbF" id="22hm_0zJCvx" role="3cqZAp">
                       <node concept="2OqwBi" id="22hm_0zJCvy" role="3clFbG">
                         <node concept="37vLTw" id="22hm_0zJCvz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="22hm_0zJCv_" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817aY" />
                         </node>
                         <node concept="2qgKlT" id="22hm_0zJCv$" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:22hm_0zJBUZ" resolve="targetStateIsMutable" />
@@ -459,9 +459,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="22hm_0zJCv_" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817aY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="22hm_0zJCvA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817aZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -991,7 +991,7 @@
                           </node>
                           <node concept="3EllGN" id="6ITtBskYEkp" role="3uHU7B">
                             <node concept="37vLTw" id="6ITtBskYEkq" role="3ElVtu">
-                              <ref role="3cqZAo" node="6ITtBskYEks" resolve="key" />
+                              <ref role="3cqZAo" node="4z0AnX817b0" />
                             </node>
                             <node concept="37vLTw" id="6ITtBskYEkr" role="3ElQJh">
                               <ref role="3cqZAo" node="dsAFRk0GB0" resolve="mapping" />
@@ -1000,9 +1000,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6ITtBskYEks" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817b0" role="1bW2Oz">
                       <property role="TrG5h" value="key" />
-                      <node concept="2jxLKc" id="6ITtBskYEkt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817b1" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1140,7 +1140,7 @@
                               </node>
                               <node concept="3EllGN" id="6ITtBskXoUd" role="3uHU7B">
                                 <node concept="37vLTw" id="6ITtBskXoUe" role="3ElVtu">
-                                  <ref role="3cqZAo" node="6ITtBskXoUg" resolve="key" />
+                                  <ref role="3cqZAo" node="4z0AnX817b2" />
                                 </node>
                                 <node concept="37vLTw" id="6ITtBskXoUf" role="3ElQJh">
                                   <ref role="3cqZAo" node="dsAFRk4B7x" resolve="shortLambdaMapping" />
@@ -1149,9 +1149,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6ITtBskXoUg" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817b2" role="1bW2Oz">
                           <property role="TrG5h" value="key" />
-                          <node concept="2jxLKc" id="6ITtBskXoUh" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817b3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1267,7 +1267,7 @@
                                     <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                     <node concept="2OqwBi" id="dsAFRk6FhD" role="37wK5m">
                                       <node concept="37vLTw" id="dsAFRk6ESX" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="dsAFRk6CI8" resolve="mapping" />
+                                        <ref role="3cqZAo" node="4z0AnX817b4" />
                                       </node>
                                       <node concept="3AV6Ez" id="dsAFRka_Qp" role="2OqNvi" />
                                     </node>
@@ -1282,7 +1282,7 @@
                                           <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                           <node concept="2OqwBi" id="dsAFRk6ImD" role="37wK5m">
                                             <node concept="37vLTw" id="dsAFRk6I05" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="dsAFRk6CI8" resolve="mapping" />
+                                              <ref role="3cqZAo" node="4z0AnX817b4" />
                                             </node>
                                             <node concept="3AY5_j" id="dsAFRkaAEM" role="2OqNvi" />
                                           </node>
@@ -1293,9 +1293,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="dsAFRk6CI8" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817b4" role="1bW2Oz">
                                 <property role="TrG5h" value="mapping" />
-                                <node concept="2jxLKc" id="dsAFRk6CI9" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817b5" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1326,11 +1326,11 @@
                               <node concept="3clFbF" id="dsAFRk2nFu" role="3cqZAp">
                                 <node concept="3clFbC" id="dsAFRk2r8w" role="3clFbG">
                                   <node concept="37vLTw" id="dsAFRk2spL" role="3uHU7w">
-                                    <ref role="3cqZAo" node="dsAFRk19br" resolve="descendant" />
+                                    <ref role="3cqZAo" node="4z0AnX817b8" />
                                   </node>
                                   <node concept="3EllGN" id="dsAFRk2q08" role="3uHU7B">
                                     <node concept="37vLTw" id="dsAFRk2qrp" role="3ElVtu">
-                                      <ref role="3cqZAo" node="dsAFRk2nau" resolve="key" />
+                                      <ref role="3cqZAo" node="4z0AnX817b6" />
                                     </node>
                                     <node concept="37vLTw" id="dsAFRk2p1B" role="3ElQJh">
                                       <ref role="3cqZAo" node="dsAFRk0GB0" resolve="mapping" />
@@ -1339,9 +1339,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="dsAFRk2nau" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817b6" role="1bW2Oz">
                               <property role="TrG5h" value="key" />
-                              <node concept="2jxLKc" id="dsAFRk2nav" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817b7" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1369,14 +1369,14 @@
                       <ref role="37wK5l" to="pbu6:1WlYLwX3McV" resolve="isNodeCovered" />
                       <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                       <node concept="37vLTw" id="230vOq3ig5J" role="37wK5m">
-                        <ref role="3cqZAo" node="dsAFRk19br" resolve="descendant" />
+                        <ref role="3cqZAo" node="4z0AnX817b8" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="dsAFRk19br" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817b8" role="1bW2Oz">
                   <property role="TrG5h" value="descendant" />
-                  <node concept="2jxLKc" id="dsAFRk19bs" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817b9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2196,7 +2196,7 @@
                           <node concept="liA8E" id="$yb$20ldT9" role="2OqNvi">
                             <ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
                             <node concept="37vLTw" id="$yb$20ldTa" role="37wK5m">
-                              <ref role="3cqZAo" node="$yb$20ldTc" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ba" />
                             </node>
                             <node concept="37vLTw" id="$yb$20ldTb" role="37wK5m">
                               <ref role="3cqZAo" node="$yb$20laHc" resolve="context" />
@@ -2212,9 +2212,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="$yb$20ldTc" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ba" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="$yb$20ldTd" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817bb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/refactorings.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/refactorings.mps
index 4f507fa410..5df04635a2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/refactorings.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/refactorings.mps
@@ -31,7 +31,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -63,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.iets3.opensource/languages/org.iets3.core.expr.lambda/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/structure.mps
index fe83a86452..0ebea9c99b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/structure.mps
@@ -64,7 +64,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
index 18b1191ca5..ee533a833d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
@@ -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>
@@ -129,6 +129,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -274,7 +275,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -308,7 +309,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1316,7 +1316,7 @@
                           <node concept="2OqwBi" id="49WTic8hsct" role="25WWJ7">
                             <node concept="2OqwBi" id="49WTic8htyS" role="2Oq$k0">
                               <node concept="37vLTw" id="49WTic8hs25" role="2Oq$k0">
-                                <ref role="3cqZAo" node="49WTic8hqof" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817aG" />
                               </node>
                               <node concept="3TrEf2" id="49WTic8htKR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -1328,9 +1328,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="49WTic8hqof" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817aG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="49WTic8hqog" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817aH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1810,9 +1810,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2rOWEwsAJEe" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817aI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2rOWEwsAJEf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817aJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1929,7 +1929,7 @@
                         <node concept="2OqwBi" id="KaZMgydRvC" role="3clFbG">
                           <node concept="2OqwBi" id="KaZMgydRvD" role="2Oq$k0">
                             <node concept="37vLTw" id="KaZMgydRvE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KaZMgydRvU" resolve="e" />
+                              <ref role="3cqZAo" node="4z0AnX817aM" />
                             </node>
                             <node concept="2Rf3mk" id="KaZMgydRvF" role="2OqNvi">
                               <node concept="1xMEDy" id="KaZMgydRvG" role="1xVPHs">
@@ -1950,7 +1950,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="KaZMgydRvP" role="3uHU7B">
                                       <node concept="37vLTw" id="KaZMgydRvQ" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="KaZMgydRvS" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817aK" />
                                       </node>
                                       <node concept="3TrEf2" id="KaZMgydRvR" role="2OqNvi">
                                         <ref role="3Tt5mk" to="zzzn:49WTic8iI9_" resolve="val" />
@@ -1959,18 +1959,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="KaZMgydRvS" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817aK" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="KaZMgydRvT" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817aL" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="KaZMgydRvU" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817aM" role="1bW2Oz">
                       <property role="TrG5h" value="e" />
-                      <node concept="2jxLKc" id="KaZMgydRvV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817aN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2046,7 +2046,7 @@
                         <node concept="3clFbF" id="5ipapt3xRG4" role="3cqZAp">
                           <node concept="2OqwBi" id="5ipapt3xRG5" role="3clFbG">
                             <node concept="37vLTw" id="5ipapt3xRG6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5ipapt3xRGa" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817aO" />
                             </node>
                             <node concept="2Rf3mk" id="5ipapt3xRG7" role="2OqNvi">
                               <node concept="1xMEDy" id="5ipapt3xRG8" role="1xVPHs">
@@ -2059,9 +2059,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5ipapt3xRGa" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817aO" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5ipapt3xRGb" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817aP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2076,7 +2076,7 @@
                           </node>
                           <node concept="2OqwBi" id="5ipapt3xRGi" role="3uHU7B">
                             <node concept="37vLTw" id="5ipapt3xRGj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5ipapt3xRGl" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817aQ" />
                             </node>
                             <node concept="3TrEf2" id="5ipapt3xRGk" role="2OqNvi">
                               <ref role="3Tt5mk" to="zzzn:49WTic8iI9_" resolve="val" />
@@ -2085,9 +2085,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5ipapt3xRGl" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817aQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5ipapt3xRGm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817aR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2675,7 +2675,7 @@
                         <node concept="2OqwBi" id="RIvadv3fFu" role="3uHU7B">
                           <node concept="1PxgMI" id="RIvadv3fhj" role="2Oq$k0">
                             <node concept="37vLTw" id="RIvadv3eDk" role="1m5AlR">
-                              <ref role="3cqZAo" node="RIvadv3e$o" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817aS" />
                             </node>
                             <node concept="chp4Y" id="6b_jefnKyD8" role="3oSUPX">
                               <ref role="cht4Q" to="zzzn:49WTic8eSCJ" resolve="IFunctionLike" />
@@ -2688,9 +2688,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="RIvadv3e$o" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817aS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="RIvadv3e$p" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817aT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3558,7 +3558,7 @@
                     <node concept="2OqwBi" id="1VmWkC0ESWh" role="3clFbG">
                       <node concept="2OqwBi" id="1VmWkC0EQcI" role="2Oq$k0">
                         <node concept="37vLTw" id="1VmWkC0EPMu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1VmWkC0EPDb" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817aU" />
                         </node>
                         <node concept="3Tsc0h" id="1VmWkC0EQFg" role="2OqNvi">
                           <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
@@ -3572,9 +3572,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1VmWkC0EPDb" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817aU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1VmWkC0EPDc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817aV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3594,7 +3594,7 @@
                     </node>
                     <node concept="2OqwBi" id="1VmWkC0EXwZ" role="3uHU7B">
                       <node concept="37vLTw" id="1VmWkC0EX8P" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1VmWkC0EWZY" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817aW" />
                       </node>
                       <node concept="3TrcHB" id="1VmWkC0EY35" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3603,9 +3603,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1VmWkC0EWZY" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817aW" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1VmWkC0EWZZ" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817aX" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/org.iets3.core.expr.lambda.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/org.iets3.core.expr.lambda.mpl
index 232f1e45b6..8f351a68f1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/org.iets3.core.expr.lambda.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/org.iets3.core.expr.lambda.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -40,7 +39,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -67,7 +66,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/behavior.mps
index f3b2350f24..3ad209602c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/behavior.mps
@@ -97,7 +97,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="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>
@@ -107,7 +107,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="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
@@ -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.iets3.opensource/languages/org.iets3.core.expr.lookup/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/constraints.mps
index c18960e83d..fc605e4d18 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/constraints.mps
@@ -27,7 +27,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
index c2ce87d22d..daf48cbe94 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
@@ -45,7 +45,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" />
@@ -64,7 +64,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" />
@@ -143,7 +143,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>
@@ -167,6 +167,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" />
@@ -177,7 +178,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
     </language>
@@ -250,7 +251,7 @@
         <child id="8155811638124638371" name="childHeaders" index="18hjfq" />
       </concept>
       <concept id="4032373061970539014" name="de.slisson.mps.tables.structure.QueryParameter_EditorContext" flags="ng" index="1frAZD" />
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
@@ -281,7 +282,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>
@@ -309,7 +310,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -446,7 +446,7 @@
                                   <node concept="3clFbC" id="55lPkJGJtsP" role="3uHU7w">
                                     <node concept="2OqwBi" id="55lPkJGJoY1" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGJohH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="55lPkJGJ5YX" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817bc" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGJpFY" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -459,7 +459,7 @@
                                   <node concept="3clFbC" id="55lPkJGJseZ" role="3uHU7B">
                                     <node concept="2OqwBi" id="55lPkJGJ6tk" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGJ6gy" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="55lPkJGJ5YX" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817bc" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGJ6Py" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -472,9 +472,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="55lPkJGJ5YX" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817bc" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="55lPkJGJ5YY" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817bd" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -548,7 +548,7 @@
                                         <node concept="17R0WA" id="5yPljRY4Koc" role="3uHU7B">
                                           <node concept="2OqwBi" id="5yPljRY4Kod" role="3uHU7B">
                                             <node concept="37vLTw" id="5yPljRY4Koe" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5yPljRY4Kom" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817be" />
                                             </node>
                                             <node concept="3TrEf2" id="5yPljRY4Kof" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -564,7 +564,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="5yPljRY4Koj" role="3uHU7B">
                                             <node concept="37vLTw" id="5yPljRY4Kok" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5yPljRY4Kom" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817be" />
                                             </node>
                                             <node concept="3TrEf2" id="5yPljRY4Kol" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -574,9 +574,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5yPljRY4Kom" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817be" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5yPljRY4Kon" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817bf" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -810,7 +810,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="55lPkJGL2wI" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGL2j8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="55lPkJGL25u" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817bg" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGL2QE" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -819,9 +819,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="55lPkJGL25u" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817bg" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="55lPkJGL25v" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817bh" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -832,15 +832,15 @@
                               <node concept="3clFbF" id="55lPkJGLglo" role="3cqZAp">
                                 <node concept="2OqwBi" id="55lPkJGLgwQ" role="3clFbG">
                                   <node concept="37vLTw" id="55lPkJGLgln" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="55lPkJGLfSN" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817bi" />
                                   </node>
                                   <node concept="3YRAZt" id="55lPkJGLhWi" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="55lPkJGLfSN" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817bi" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="55lPkJGLfSO" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817bj" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -986,7 +986,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="55lPkJGLqQR" role="3uHU7B">
                                         <node concept="37vLTw" id="55lPkJGLqQS" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="55lPkJGLqQU" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817bk" />
                                         </node>
                                         <node concept="3TrEf2" id="55lPkJGLs3L" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -995,9 +995,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="55lPkJGLqQU" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817bk" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="55lPkJGLqQV" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817bl" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1008,15 +1008,15 @@
                                 <node concept="3clFbF" id="55lPkJGLqQZ" role="3cqZAp">
                                   <node concept="2OqwBi" id="55lPkJGLqR0" role="3clFbG">
                                     <node concept="37vLTw" id="55lPkJGLqR1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="55lPkJGLqR3" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817bm" />
                                     </node>
                                     <node concept="3YRAZt" id="55lPkJGLqR2" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="55lPkJGLqR3" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817bm" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="55lPkJGLqR4" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817bn" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/plugin.mps
index 2a98c02173..036c2d253a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/structure.mps
index 7e0da57b75..4c97587168 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/structure.mps
@@ -35,7 +35,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/typesystem.mps
index 0c9c31c044..190f835ced 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/typesystem.mps
@@ -38,7 +38,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -133,7 +133,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl
index e1e7120742..b89dab1b5a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -54,7 +53,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
index df49686c0c..b68a8084b1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
@@ -119,7 +119,7 @@
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -142,7 +142,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">
@@ -166,6 +166,7 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -241,7 +242,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>
@@ -277,7 +278,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="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
@@ -1563,7 +1563,7 @@
                         <ref role="37wK5l" to="7xqi:2aG75lpC1hM" resolve="mapToPowerExpressions" />
                         <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                         <node concept="37vLTw" id="2aG75lpCirv" role="37wK5m">
-                          <ref role="3cqZAo" node="2aG75lpChLY" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817bo" />
                         </node>
                         <node concept="2OqwBi" id="2aG75lpCmQn" role="37wK5m">
                           <node concept="2OqwBi" id="2aG75lpCj9M" role="2Oq$k0">
@@ -1577,9 +1577,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2aG75lpChLY" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bo" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2aG75lpChLZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817bp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
index e9dc79fae7..1028e84d03 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
@@ -57,7 +57,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>
@@ -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" />
@@ -122,7 +123,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +137,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -209,7 +209,7 @@
                           <node concept="3clFbF" id="1F1F0IV2N2_" role="3cqZAp">
                             <node concept="2OqwBi" id="1F1F0IV2N2A" role="3clFbG">
                               <node concept="37vLTw" id="1F1F0IV2N2B" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1F1F0IV2N2E" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bq" />
                               </node>
                               <node concept="1mIQ4w" id="1F1F0IV2N2C" role="2OqNvi">
                                 <node concept="chp4Y" id="1F1F0IV2N2D" role="cj9EA">
@@ -219,9 +219,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1F1F0IV2N2E" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817bq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1F1F0IV2N2F" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817br" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -232,7 +232,7 @@
                         <node concept="3clFbF" id="1F1F0IV2N2J" role="3cqZAp">
                           <node concept="1PxgMI" id="1F1F0IV2N2K" role="3clFbG">
                             <node concept="37vLTw" id="1F1F0IV2N2L" role="1m5AlR">
-                              <ref role="3cqZAo" node="1F1F0IV2N2N" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bs" />
                             </node>
                             <node concept="chp4Y" id="1F1F0IV2N2M" role="3oSUPX">
                               <ref role="cht4Q" to="1qv1:4iu6t1eAYrK" resolve="MathLoopExpr" />
@@ -240,9 +240,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1F1F0IV2N2N" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817bs" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1F1F0IV2N2O" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817bt" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
index 2ea9abc5e2..6df546ecea 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
@@ -61,11 +61,11 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -82,10 +82,10 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -105,7 +105,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -120,7 +120,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -219,7 +219,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -235,7 +235,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -254,6 +254,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -384,7 +385,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -410,7 +411,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -1169,7 +1169,7 @@
                             <node concept="3fqX7Q" id="1eTp1AxLPF8" role="3clFbG">
                               <node concept="2OqwBi" id="1eTp1AxLPF9" role="3fr31v">
                                 <node concept="37vLTw" id="1eTp1AxLPFa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1eTp1AxLPFc" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817bu" />
                                 </node>
                                 <node concept="liA8E" id="1eTp1AxLPFb" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1178,9 +1178,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1eTp1AxLPFc" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817bu" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1eTp1AxLPFd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817bv" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1198,7 +1198,7 @@
                             </node>
                             <node concept="2OqwBi" id="1eTp1AxLPFl" role="3uHU7B">
                               <node concept="37vLTw" id="1eTp1AxLPFm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1eTp1AxLPFo" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bw" />
                               </node>
                               <node concept="liA8E" id="1eTp1AxLPFn" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
@@ -1207,9 +1207,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1eTp1AxLPFo" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817bw" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1eTp1AxLPFp" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817bx" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1390,7 +1390,7 @@
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                 <node concept="2OqwBi" id="61R9vA3NxDQ" role="37wK5m">
                                   <node concept="37vLTw" id="61R9vA3NxDR" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="61R9vA3NxDT" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817by" />
                                   </node>
                                   <node concept="liA8E" id="61R9vA3NxDS" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SAbstractLink.getTargetConcept()" resolve="getTargetConcept" />
@@ -1400,9 +1400,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="61R9vA3NxDT" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817by" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="61R9vA3NxDU" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817bz" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
index 790c2b5863..1117f46a8c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
@@ -18,7 +18,7 @@
     <import index="boxz" ref="r:89e950b9-8c66-4fca-a5c0-614e0548d83a(org.iets3.core.expr.math.behavior)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
-    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.libs/)" />
+    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.collections.libs/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
     <import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
@@ -123,7 +123,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,7 +140,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -154,6 +154,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -261,7 +262,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -313,7 +314,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -489,7 +489,7 @@
                     <node concept="3fqX7Q" id="1yW0h04DHXR" role="3uHU7w">
                       <node concept="2OqwBi" id="1yW0h04DHXT" role="3fr31v">
                         <node concept="37vLTw" id="1yW0h04DHXU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1yW0h04CzsI" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817b$" />
                         </node>
                         <node concept="liA8E" id="1yW0h04DHXV" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -498,7 +498,7 @@
                     </node>
                     <node concept="2OqwBi" id="1yW0h04CzQj" role="3uHU7B">
                       <node concept="37vLTw" id="1yW0h04CzA3" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1yW0h04CzsI" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817b$" />
                       </node>
                       <node concept="2Zo12i" id="1yW0h04C$p_" role="2OqNvi">
                         <node concept="chp4Y" id="1yW0h04C$$k" role="2Zo12j">
@@ -509,9 +509,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1yW0h04CzsI" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817b$" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1yW0h04CzsJ" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817b_" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -634,7 +634,7 @@
                           <node concept="2OqwBi" id="3iWt5efL91z" role="3fr31v">
                             <node concept="2OqwBi" id="3iWt5efL91$" role="2Oq$k0">
                               <node concept="37vLTw" id="3iWt5efL91_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3iWt5efL91D" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bA" />
                               </node>
                               <node concept="3TrEf2" id="3iWt5efL91A" role="2OqNvi">
                                 <ref role="3Tt5mk" to="1qv1:4iu6t1eBdVy" resolve="expr" />
@@ -649,9 +649,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3iWt5efL91D" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817bA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3iWt5efL91E" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817bB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1379,7 +1379,7 @@
                         <node concept="3fqX7Q" id="4wFKMWZd2N0" role="3clFbG">
                           <node concept="2OqwBi" id="4wFKMWZd2N1" role="3fr31v">
                             <node concept="37vLTw" id="4wFKMWZd2N2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4wFKMWZd2N5" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bC" />
                             </node>
                             <node concept="1mIQ4w" id="4wFKMWZd2N3" role="2OqNvi">
                               <node concept="chp4Y" id="4wFKMWZd2N4" role="cj9EA">
@@ -1390,9 +1390,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4wFKMWZd2N5" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817bC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4wFKMWZd2N6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817bD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/structure.mps
index d7660846b5..e2ad53995d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/structure.mps
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
index 85acb99e30..f766ed2073 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
@@ -31,7 +31,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">
@@ -107,7 +107,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -118,7 +118,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -134,6 +134,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" />
@@ -285,7 +286,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -301,7 +302,6 @@
       <concept id="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="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -1633,7 +1633,7 @@
                               <node concept="2OqwBi" id="6q$NxWgeFBI" role="3K4E3e">
                                 <node concept="2OqwBi" id="6q$NxWgeFBJ" role="2Oq$k0">
                                   <node concept="37vLTw" id="6q$NxWgeFBK" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6q$NxWgeFBR" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817bE" />
                                   </node>
                                   <node concept="2yIwOk" id="6q$NxWgeFBL" role="2OqNvi" />
                                 </node>
@@ -1646,16 +1646,16 @@
                               </node>
                               <node concept="2OqwBi" id="6q$NxWgeFBO" role="3K4Cdx">
                                 <node concept="37vLTw" id="6q$NxWgeFBP" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6q$NxWgeFBR" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817bE" />
                                 </node>
                                 <node concept="3x8VRR" id="6q$NxWgeFBQ" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6q$NxWgeFBR" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817bE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6q$NxWgeFBS" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817bF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1890,15 +1890,15 @@
                         <ref role="37wK5l" to="7xqi:4wFKMWZSULn" resolve="canBeChildOfInnerExpression" />
                         <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                         <node concept="37vLTw" id="4wFKMWZT52q" role="37wK5m">
-                          <ref role="3cqZAo" node="4wFKMWZT52r" resolve="expr" />
+                          <ref role="3cqZAo" node="4z0AnX817bG" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4wFKMWZT52r" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817bG" role="1bW2Oz">
                   <property role="TrG5h" value="expr" />
-                  <node concept="2jxLKc" id="4wFKMWZT52s" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817bH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2056,7 +2056,7 @@
                         <node concept="2OqwBi" id="3C0hCYbT693" role="3fr31v">
                           <node concept="2OqwBi" id="3C0hCYbT694" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbT695" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3C0hCYbSAHs" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bI" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbT696" role="2OqNvi">
                               <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2071,9 +2071,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3C0hCYbSAHs" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3C0hCYbSAHt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817bJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2142,7 +2142,7 @@
                         <node concept="2OqwBi" id="3C0hCYbSW79" role="3clFbG">
                           <node concept="2OqwBi" id="3C0hCYbSW7a" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbSW7b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3C0hCYbSW7f" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bK" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbSW7c" role="2OqNvi">
                               <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2156,9 +2156,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3C0hCYbSW7f" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817bK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3C0hCYbSW7g" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817bL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2178,7 +2178,7 @@
                             </node>
                             <node concept="2OqwBi" id="3C0hCYbT2U6" role="1m5AlR">
                               <node concept="37vLTw" id="3C0hCYbSYiG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3C0hCYbSXu4" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bM" />
                               </node>
                               <node concept="3TrEf2" id="3C0hCYbT3jk" role="2OqNvi">
                                 <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2192,9 +2192,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3C0hCYbSXu4" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3C0hCYbSXu5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817bN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2264,15 +2264,15 @@
                           <ref role="37wK5l" to="7xqi:7LghZUctGPf" resolve="isValidMulExpression" />
                           <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                           <node concept="37vLTw" id="7LghZUctVzr" role="37wK5m">
-                            <ref role="3cqZAo" node="3C0hCYbUC0x" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817bO" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3C0hCYbUC0x" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3C0hCYbUC0y" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817bP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2336,7 +2336,7 @@
                         <node concept="2OqwBi" id="3C0hCYbVFGV" role="3uHU7w">
                           <node concept="2OqwBi" id="3C0hCYbVFGW" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbVFGX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3C0hCYbVFH7" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bQ" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbVFGY" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
@@ -2351,7 +2351,7 @@
                         <node concept="2OqwBi" id="3C0hCYbVFH1" role="3uHU7B">
                           <node concept="2OqwBi" id="3C0hCYbVFH2" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbVFH3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3C0hCYbVFH7" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bQ" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbVFH4" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKm" resolve="left" />
@@ -2366,9 +2366,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3C0hCYbVFH7" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3C0hCYbVFH8" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817bR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/org.iets3.core.expr.math.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/org.iets3.core.expr.math.mpl
index a2a0ec0adb..a89e0443a1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/org.iets3.core.expr.math.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/org.iets3.core.expr.math.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0fcee1cf-8f59-441b-b9c7-7ff7bdd6bc97(de.itemis.mps.editor.math.symbols)</dependency>
     <dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
@@ -36,7 +35,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -116,7 +115,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
     <module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
index eb6c36ace5..799c7cc0b0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <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" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -104,7 +104,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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" />
@@ -181,7 +182,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -192,7 +193,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -721,7 +721,7 @@
                             </node>
                             <node concept="2OqwBi" id="1CNpG_h8NWS" role="37wK5m">
                               <node concept="37vLTw" id="1CNpG_h8NWT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1CNpG_h8NWV" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bT" />
                               </node>
                               <node concept="3TrEf2" id="1CNpG_h8NWU" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kelk:3vxfdxblP3X" resolve="type" />
@@ -734,9 +734,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1CNpG_h8NWV" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817bT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1CNpG_h8NWW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817bU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -761,7 +761,7 @@
                             <node concept="2OqwBi" id="1CNpG_h9Z47" role="3uHU7w">
                               <node concept="2OqwBi" id="1CNpG_h8QMF" role="2Oq$k0">
                                 <node concept="37vLTw" id="1CNpG_h8QzW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1CNpG_h8Onf" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817bV" />
                                 </node>
                                 <node concept="3TrEf2" id="1CNpG_h8Reu" role="2OqNvi">
                                   <ref role="3Tt5mk" to="kelk:3vxfdxblP3X" resolve="type" />
@@ -778,9 +778,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1CNpG_h8Onf" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817bV" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1CNpG_h8Ong" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817bW" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/constraints.mps
index 1eca3f59b4..c68aa9e8ca 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/constraints.mps
@@ -63,7 +63,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps
index 0c1cf90e23..7b52215cc4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps
@@ -73,7 +73,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -87,7 +87,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -108,7 +108,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -187,7 +187,7 @@
       <concept id="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>
@@ -207,7 +207,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="484443907672824414" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell_SubstituteCondition" flags="ig" index="3gMsPO" />
@@ -243,7 +243,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.migration.mps
index a7b3976763..dd3c3be864 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/org.iets3.core.expr.messages.migration.mps
@@ -12,7 +12,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/plugin.mps
index bc7af9e0b1..d29f6f155c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/structure.mps
index 47ca055a3a..e4bf079e51 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/structure.mps
@@ -55,7 +55,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/typesystem.mps
index f507e3ed23..9c2409d2c8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/typesystem.mps
@@ -69,7 +69,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -161,7 +161,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl
index 43ba3747df..1c7d01bfe0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -30,7 +29,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -53,7 +52,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
index 30c70726e1..cf66529c8f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -118,7 +118,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -130,7 +130,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -138,6 +138,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" />
@@ -195,7 +196,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -225,7 +226,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1091,7 +1091,7 @@
                             </node>
                             <node concept="2OqwBi" id="3WWvqarxz2e" role="3uHU7B">
                               <node concept="37vLTw" id="3WWvqarxz2f" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3WWvqarxz2h" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817bX" />
                               </node>
                               <node concept="3TrcHB" id="3WWvqarxz2g" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1100,9 +1100,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3WWvqarxz2h" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817bX" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3WWvqarxz2i" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817bY" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1239,16 +1239,16 @@
                           </node>
                           <node concept="3JPx81" id="3WWvqarxRU2" role="2OqNvi">
                             <node concept="37vLTw" id="3WWvqarxRU3" role="25WWJ7">
-                              <ref role="3cqZAo" node="3WWvqarxRU4" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817bZ" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3WWvqarxRU4" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817bZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3WWvqarxRU5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817c0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1266,15 +1266,15 @@
                   <node concept="3clFbF" id="3WWvqarxSNE" role="3cqZAp">
                     <node concept="2OqwBi" id="3WWvqarxT0b" role="3clFbG">
                       <node concept="37vLTw" id="3WWvqarxSND" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3WWvqarxSLP" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817c1" />
                       </node>
                       <node concept="3YRAZt" id="3WWvqarxTxO" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3WWvqarxSLP" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817c1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3WWvqarxSLQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817c2" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/constraints.mps
index 42a18cdef4..20ce4d6cbf 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/constraints.mps
@@ -29,7 +29,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/editor.mps
index a3893af254..9a1dbbc0b6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/editor.mps
@@ -60,7 +60,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -76,7 +76,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -104,7 +104,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
     </language>
@@ -112,7 +112,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
index 74104ae74a..ce4f76bb65 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -103,7 +103,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,13 +120,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -145,7 +146,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +162,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -372,7 +372,7 @@
                       <node concept="2OqwBi" id="5cK3QOdiKgM" role="3clFbG">
                         <node concept="2OqwBi" id="5cK3QOdiKgN" role="2Oq$k0">
                           <node concept="37vLTw" id="5cK3QOdiKgO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5cK3QOdiKgS" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817c3" />
                           </node>
                           <node concept="3TrcHB" id="5cK3QOdiKgP" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -387,9 +387,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5cK3QOdiKgS" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817c3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5cK3QOdiKgT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817c4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -495,7 +495,7 @@
                       <node concept="2OqwBi" id="559q5A2CC9x" role="3clFbG">
                         <node concept="2OqwBi" id="559q5A2CC9y" role="2Oq$k0">
                           <node concept="37vLTw" id="559q5A2CC9z" role="2Oq$k0">
-                            <ref role="3cqZAo" node="559q5A2CC9B" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817c5" />
                           </node>
                           <node concept="3TrcHB" id="559q5A2CC9$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -510,9 +510,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="559q5A2CC9B" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817c5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="559q5A2CC9C" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817c6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/structure.mps
index 65a2aa7cae..014478a2b5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/typesystem.mps
index b87ebd0833..1635a113e0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/typesystem.mps
@@ -60,7 +60,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -139,7 +139,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.metafunction/org.iets3.core.expr.metafunction.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/org.iets3.core.expr.metafunction.mpl
index 389d2a7f9d..edd604bb52 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/org.iets3.core.expr.metafunction.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/org.iets3.core.expr.metafunction.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -53,7 +52,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
index 07a907d07f..16d927d547 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
@@ -124,7 +124,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,13 +136,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" />
@@ -200,7 +201,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -225,7 +226,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -915,7 +915,7 @@
                     <node concept="3clFbF" id="31HpwbwBaPp" role="3cqZAp">
                       <node concept="2OqwBi" id="31HpwbwBb3N" role="3clFbG">
                         <node concept="37vLTw" id="31HpwbwBaPo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="31HpwbwBaFW" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817c7" />
                         </node>
                         <node concept="2qgKlT" id="31HpwbwBbm9" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -923,9 +923,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="31HpwbwBaFW" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817c7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="31HpwbwBaFX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817c8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/constraints.mps
index 7e2f2db068..76be439614 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/constraints.mps
@@ -33,7 +33,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
index 9b45acb8b1..48486503fc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
@@ -27,7 +27,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -53,7 +53,7 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
@@ -106,12 +106,12 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -133,7 +133,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -157,13 +157,13 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="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="6419604448124516209" name="jetbrains.mps.lang.editor.structure.QueryFunction_IsMethodCurrent" flags="in" index="3LVrda" />
@@ -267,7 +267,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>
@@ -284,7 +284,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -303,6 +303,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" />
@@ -316,7 +317,7 @@
       </concept>
       <concept id="2283544813052478257" name="com.mbeddr.mpsutil.grammarcells.structure.GrammarCellsTransformationMenuPart" flags="ng" index="2X7gjp" />
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -326,7 +327,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -392,7 +393,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -403,7 +404,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <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" />
@@ -1467,7 +1467,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817c9" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -1482,7 +1482,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817c9" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
@@ -1490,9 +1490,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="LBlPJUzjy9" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817c9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1P4c1XrzTlB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ca" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1775,7 +1775,7 @@
                       </node>
                       <node concept="2OqwBi" id="5kGo$yLRRiB" role="3uHU7B">
                         <node concept="37vLTw" id="5kGo$yLRR1I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5kGo$yLRQHo" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cb" />
                         </node>
                         <node concept="2OwXpG" id="5kGo$yLRRYy" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -1784,9 +1784,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5kGo$yLRQHo" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cb" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5kGo$yLRQHp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cc" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2292,7 +2292,7 @@
                               <node concept="3clFbF" id="6XMQOZe8nv4" role="3cqZAp">
                                 <node concept="2OqwBi" id="6XMQOZe8nZQ" role="3clFbG">
                                   <node concept="37vLTw" id="6XMQOZe8nv3" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6XMQOZe8nd4" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817cd" />
                                   </node>
                                   <node concept="liA8E" id="6XMQOZe8s8c" role="2OqNvi">
                                     <ref role="37wK5l" to="n9sl:6XMQOZe876T" resolve="canBeUsedWithThisValue" />
@@ -2308,9 +2308,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6XMQOZe8nd4" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817cd" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6XMQOZe8nd5" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817ce" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2354,7 +2354,7 @@
                     <node concept="3clFbF" id="6XMQOZe81JA" role="3cqZAp">
                       <node concept="2OqwBi" id="6XMQOZe81JB" role="3clFbG">
                         <node concept="37vLTw" id="6XMQOZe81JC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6XMQOZe81JE" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cf" />
                         </node>
                         <node concept="2OwXpG" id="6XMQOZe81JD" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -2362,9 +2362,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6XMQOZe81JE" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817cf" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6XMQOZe81JF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817cg" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2454,7 +2454,7 @@
                     <node concept="3clFbF" id="Z4fkwz75Vd" role="3cqZAp">
                       <node concept="2OqwBi" id="Z4fkwz75Ve" role="3clFbG">
                         <node concept="37vLTw" id="Z4fkwz75Vf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Z4fkwz75Vh" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ch" />
                         </node>
                         <node concept="2OwXpG" id="Z4fkwz75Vg" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -2462,9 +2462,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Z4fkwz75Vh" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ch" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Z4fkwz75Vi" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817ci" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/intentions.mps
index db682025a9..d9cc1d25b9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/intentions.mps
@@ -55,7 +55,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/migration.mps
index f9608a1d34..8b1723de5a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/migration.mps
@@ -24,7 +24,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
index 66244a2787..0a89ec1236 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
@@ -38,7 +38,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -160,7 +160,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -182,7 +182,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
@@ -198,6 +198,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -246,7 +247,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -278,7 +279,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="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" />
@@ -1485,7 +1485,7 @@
                     <node concept="2OqwBi" id="Z4fkwz70fS" role="3clFbG">
                       <node concept="2OqwBi" id="Z4fkwz6Zib" role="2Oq$k0">
                         <node concept="37vLTw" id="Z4fkwz6Z18" role="2Oq$k0">
-                          <ref role="3cqZAo" node="Z4fkwz6YN8" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cj" />
                         </node>
                         <node concept="2OwXpG" id="Z4fkwz6Z_$" role="2OqNvi">
                           <ref role="2Oxat5" node="5y3VELftA2d" resolve="name" />
@@ -1500,9 +1500,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="Z4fkwz6YN8" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cj" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="Z4fkwz6YN9" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ck" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4010,7 +4010,7 @@
                             <ref role="37wK5l" node="4IV0h47l1qI" resolve="ContextValue" />
                             <node concept="2OqwBi" id="4IV0h47O$Hk" role="37wK5m">
                               <node concept="37vLTw" id="4IV0h47O$Hl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4IV0h47O$Hr" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817cl" />
                               </node>
                               <node concept="3TrEf2" id="4IV0h47O$Hm" role="2OqNvi">
                                 <ref role="3Tt5mk" to="8lgj:4IV0h47hCXz" resolve="argument" />
@@ -4029,7 +4029,7 @@
                                 <ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
                                 <node concept="2OqwBi" id="4IV0h47O$Ho" role="37wK5m">
                                   <node concept="37vLTw" id="4IV0h47O$Hp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4IV0h47O$Hr" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817cl" />
                                   </node>
                                   <node concept="3TrEf2" id="4IV0h47O$Hq" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8lgj:4IV0h47hCX_" resolve="value" />
@@ -4055,9 +4055,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4IV0h47O$Hr" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cl" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4IV0h47O$Hs" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817cm" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4679,7 +4679,7 @@
                     <node concept="3clFbF" id="4IV0h48ipFa" role="3cqZAp">
                       <node concept="2OqwBi" id="4IV0h48ipFb" role="3clFbG">
                         <node concept="37vLTw" id="4IV0h48ipFc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4IV0h48ipFf" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cn" />
                         </node>
                         <node concept="liA8E" id="4IV0h48ipFd" role="2OqNvi">
                           <ref role="37wK5l" node="4IV0h48f60S" resolve="isAfter" />
@@ -4690,9 +4690,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4IV0h48ipFf" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817cn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4IV0h48ipFg" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817co" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4785,7 +4785,7 @@
                         <node concept="3clFbF" id="5hiN5PkqD5H" role="3cqZAp">
                           <node concept="2OqwBi" id="5hiN5PkqD5I" role="3clFbG">
                             <node concept="37vLTw" id="5hiN5PkqD5J" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5hiN5PkqD5N" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cp" />
                             </node>
                             <node concept="1mIQ4w" id="5hiN5PkqD5K" role="2OqNvi">
                               <node concept="25Kdxt" id="5hiN5PkqD5L" role="cj9EA">
@@ -4797,9 +4797,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5hiN5PkqD5N" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817cp" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5hiN5PkqD5O" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817cq" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/structure.mps
index 03e540a108..4e2e5c964b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/structure.mps
@@ -52,7 +52,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/typesystem.mps
index 3d115c0ef5..13184ccabb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/typesystem.mps
@@ -85,7 +85,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -218,7 +218,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.mutable/org.iets3.core.expr.mutable.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/org.iets3.core.expr.mutable.mpl
index 6bdb29e2eb..027a49fb01 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/org.iets3.core.expr.mutable.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/org.iets3.core.expr.mutable.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
@@ -30,7 +29,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
index a6f22e782d..20a9f850b4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
@@ -78,19 +78,20 @@
       </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" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -122,7 +123,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
         <child id="5232196642625575056" name="fromIndex" index="1eb2uK" />
@@ -206,7 +206,7 @@
                       <node concept="3clFbF" id="5Q45tqZqIty" role="3cqZAp">
                         <node concept="37vLTI" id="5Q45tqZqItz" role="3clFbG">
                           <node concept="37vLTw" id="5Q45tqZqIt$" role="37vLTx">
-                            <ref role="3cqZAo" node="5Q45tqZqItE" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817cs" />
                           </node>
                           <node concept="2OqwBi" id="5Q45tqZqIt_" role="37vLTJ">
                             <node concept="37vLTw" id="5Q45tqZqItA" role="2Oq$k0">
@@ -224,9 +224,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5Q45tqZqItE" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5Q45tqZqItF" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ct" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
index 58aa044b2c..430038b3d9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
@@ -57,7 +57,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>
@@ -89,6 +89,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -147,7 +148,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -161,7 +162,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
         <child id="5232196642625575056" name="fromIndex" index="1eb2uK" />
@@ -300,7 +300,7 @@
                           <node concept="2OqwBi" id="1F1F0IV2N96" role="3uHU7w">
                             <node concept="2OqwBi" id="1F1F0IV2N97" role="2Oq$k0">
                               <node concept="37vLTw" id="1F1F0IV2N98" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1F1F0IV2N9f" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817cu" />
                               </node>
                               <node concept="3CFZ6_" id="1F1F0IV2N99" role="2OqNvi">
                                 <node concept="3CFYIy" id="1F1F0IV2N9a" role="3CFYIz">
@@ -312,7 +312,7 @@
                           </node>
                           <node concept="2OqwBi" id="1F1F0IV2N9c" role="3uHU7B">
                             <node concept="37vLTw" id="1F1F0IV2N9d" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1F1F0IV2N9f" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cu" />
                             </node>
                             <node concept="3TrcHB" id="1F1F0IV2N9e" role="2OqNvi">
                               <ref role="3TsBF5" to="zzzn:2uR5X5azvjH" resolve="ext" />
@@ -321,9 +321,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IV2N9f" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IV2N9g" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817cv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -387,7 +387,7 @@
                                 <node concept="2OqwBi" id="1F1F0IV2NlI" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1F1F0IV2NlJ" role="2Oq$k0">
                                     <node concept="37vLTw" id="1F1F0IV2NlK" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1F1F0IV2NlQ" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817cw" />
                                     </node>
                                     <node concept="3Tsc0h" id="1F1F0IV2NlL" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8eSCZ" resolve="args" />
@@ -406,9 +406,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IV2NlQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IV2NlR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817cx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
index faeb4f298f..28e81f112f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
@@ -28,7 +28,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -60,7 +60,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -99,7 +99,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" />
@@ -136,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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -238,7 +238,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>
@@ -257,7 +257,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" />
@@ -268,6 +268,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -315,7 +316,7 @@
         <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>
@@ -331,7 +332,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -1113,7 +1113,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="ywgKCSJYaD" role="3uHU7B">
                                     <node concept="37vLTw" id="ywgKCSJY7z" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="ywgKCSJY1R" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817cy" />
                                     </node>
                                     <node concept="3TrEf2" id="5Q45tqZsgiU" role="2OqNvi">
                                       <ref role="3Tt5mk" to="1xa4:1u1U5lEZLAq" resolve="param" />
@@ -1122,9 +1122,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="ywgKCSJY1R" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817cy" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="ywgKCSJY1S" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817cz" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/intentions.mps
index 82011e0f97..683f7262c6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/intentions.mps
@@ -69,7 +69,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.natlang/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/plugin.mps
index e8245c15d4..d5c5f7d8a6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:b85249db-2057-4d49-9db5-ae0352c72936(org.iets3.core.expr.natlang.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
   </languages>
   <imports />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/structure.mps
index b14321d657..1cd39995b0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/typesystem.mps
index 3b2ad0e489..96fb5ece4f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/typesystem.mps
@@ -117,7 +117,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl
index c688403aca..19b261093f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -45,7 +44,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
index d815120b90..8d146653b0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/behavior.mps
@@ -73,7 +73,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -83,7 +83,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" />
@@ -113,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/constraints.mps
index 47adc60b28..8e0e4d7d14 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/constraints.mps
@@ -65,7 +65,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/editor.mps
index 75f00a41b0..2bf44b5c19 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/editor.mps
@@ -22,7 +22,7 @@
         <child id="1186403803051" name="query" index="VblUZ" />
       </concept>
       <concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
-      <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>
@@ -33,7 +33,7 @@
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -62,7 +62,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.iets3.opensource/languages/org.iets3.core.expr.path/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/plugin.mps
index f545c150bc..8e9c386f45 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:14d19f45-b1ff-401e-875c-62c48d110e0a(org.iets3.core.expr.path.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -30,7 +30,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/structure.mps
index 37ab65e368..8e99cff93a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/structure.mps
@@ -35,7 +35,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/typesystem.mps
index 64c7e1de82..99a5f80aaf 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/models/typesystem.mps
@@ -60,7 +60,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>
@@ -126,7 +126,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/org.iets3.core.expr.path.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/org.iets3.core.expr.path.mpl
index ffa1d7ac45..b0ee3503d3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/org.iets3.core.expr.path.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.path/org.iets3.core.expr.path.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -42,7 +41,7 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
index 4d60887f7f..8b2eda0497 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
@@ -160,7 +160,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -173,7 +173,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -185,6 +185,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" />
@@ -232,7 +233,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
     </language>
@@ -478,15 +478,15 @@
                       <node concept="liA8E" id="1mDdTFSvNt" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~Collection.contains(java.lang.Object)" resolve="contains" />
                         <node concept="37vLTw" id="1mDdTFSvRG" role="37wK5m">
-                          <ref role="3cqZAo" node="1mDdTFSuIL" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817c$" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1mDdTFSuIL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817c$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1mDdTFSuIM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817c_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -923,7 +923,7 @@
                       <node concept="2OqwBi" id="4IV0h47t3Ap" role="3clFbG">
                         <node concept="2OqwBi" id="4IV0h47t3Aq" role="2Oq$k0">
                           <node concept="37vLTw" id="4IV0h47t3Ar" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4IV0h47t3Av" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817cA" />
                           </node>
                           <node concept="2OwXpG" id="4IV0h47t3As" role="2OqNvi">
                             <ref role="2Oxat5" to="n9sl:4IV0h47l1DZ" resolve="arg" />
@@ -937,9 +937,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4IV0h47t3Av" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817cA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4IV0h47t3Aw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817cB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1338,7 +1338,7 @@
                       <node concept="2OqwBi" id="4IV0h48m1SO" role="3clFbG">
                         <node concept="2OqwBi" id="4IV0h48m1SP" role="2Oq$k0">
                           <node concept="37vLTw" id="4IV0h48m1SQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4IV0h48m1SU" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817cC" />
                           </node>
                           <node concept="2OwXpG" id="4IV0h48m1SR" role="2OqNvi">
                             <ref role="2Oxat5" to="n9sl:4IV0h47l1DZ" resolve="arg" />
@@ -1352,9 +1352,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4IV0h48m1SU" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817cC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4IV0h48m1SV" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817cD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.constraints.mps
index 82e6a3253e..fd6cdb7456 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.constraints.mps
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -120,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps
index 2ea3935ffb..37ab2d3555 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps
@@ -52,7 +52,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -77,7 +77,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.structure.mps
index 32349eafa9..173ae45570 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.typesystem.mps
index 3d6ff8416a..26fe53920a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.typesystem.mps
@@ -69,7 +69,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -187,7 +187,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
index 06aa7d8b3a..341aee5cd9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -52,7 +52,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">
@@ -164,7 +164,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -185,7 +185,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -199,6 +199,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -236,7 +237,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -271,7 +272,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -1337,7 +1337,7 @@
                           <node concept="1rXfSq" id="VApoyDGfeg" role="37wK5m">
                             <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                             <node concept="37vLTw" id="VApoyDGfDl" role="37wK5m">
-                              <ref role="3cqZAo" node="VApoyDGcyH" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cE" />
                             </node>
                             <node concept="2ShNRf" id="VApoyDGfZ3" role="37wK5m">
                               <node concept="1pGfFk" id="VApoyDGfXi" role="2ShVmc">
@@ -1353,9 +1353,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="VApoyDGcyH" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cE" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="VApoyDGcyI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cF" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2199,7 +2199,7 @@
                                 <node concept="1rXfSq" id="1mDdTFSOfR" role="3clFbG">
                                   <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                                   <node concept="37vLTw" id="1mDdTFSOfS" role="37wK5m">
-                                    <ref role="3cqZAo" node="1mDdTFSOfU" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817cG" />
                                   </node>
                                   <node concept="37vLTw" id="1mDdTFSOfT" role="37wK5m">
                                     <ref role="3cqZAo" node="Z4fkwziK1L" resolve="trace" />
@@ -2207,9 +2207,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1mDdTFSOfU" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817cG" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1mDdTFSOfV" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817cH" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2282,7 +2282,7 @@
                                     <node concept="1rXfSq" id="3wXkdMVm9aj" role="3clFbG">
                                       <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                                       <node concept="37vLTw" id="3wXkdMVm9ak" role="37wK5m">
-                                        <ref role="3cqZAo" node="3wXkdMVm9am" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817cI" />
                                       </node>
                                       <node concept="37vLTw" id="3wXkdMVm9al" role="37wK5m">
                                         <ref role="3cqZAo" node="Z4fkwziK1L" resolve="trace" />
@@ -2290,9 +2290,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3wXkdMVm9am" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817cI" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3wXkdMVm9an" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817cJ" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/org.iets3.core.expr.process.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/org.iets3.core.expr.process.mpl
index de6a6deea5..0d055b6da0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/org.iets3.core.expr.process.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/org.iets3.core.expr.process.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -31,7 +30,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -57,7 +56,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.behavior.mps
index f9fb88e5d9..14eb5448e0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.behavior.mps
@@ -66,11 +66,11 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -114,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps
index 3a79a261b9..08ffffdaff 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps
@@ -31,7 +31,7 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -47,7 +47,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -79,7 +79,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.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.intentions.mps
index dd97d19096..a3e49cbb10 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.intentions.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.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.structure.mps
index 2adf42f378..6c7974ed64 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.structure.mps
@@ -35,7 +35,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.typesystem.mps
index 28b90611a7..67951f4f12 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.typesystem.mps
@@ -64,7 +64,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -139,7 +139,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl
index 2a0c055988..6f2c6df9a6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">10e056b2-49fd-40ca-8b64-de69c81163ac(org.iets3.core.expr.query)</dependency>
     <dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</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.iets3.opensource/languages/org.iets3.core.expr.repl/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/generator/template/main@generator.mps
index ba36865c9e..16f703806e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/generator/template/main@generator.mps
@@ -18,7 +18,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
index 6a5e47fe3f..3b8936658d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
@@ -118,7 +118,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +133,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,6 +145,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" />
@@ -283,7 +284,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -306,7 +307,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <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="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" />
@@ -1124,7 +1124,7 @@
                   <node concept="3clFbF" id="5avmkTFRv4s" role="3cqZAp">
                     <node concept="2OqwBi" id="5avmkTFRvkb" role="3clFbG">
                       <node concept="37vLTw" id="5avmkTFRv4r" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5avmkTFRuQC" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817dx" />
                       </node>
                       <node concept="1mIQ4w" id="5avmkTFRvEf" role="2OqNvi">
                         <node concept="25Kdxt" id="5avmkTFRwgh" role="cj9EA">
@@ -1134,9 +1134,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5avmkTFRuQC" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817dx" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5avmkTFRuQD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817dy" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1174,7 +1174,7 @@
                         <node concept="3clFbF" id="5avmkTFRDpq" role="3cqZAp">
                           <node concept="2OqwBi" id="5avmkTFRDpr" role="3clFbG">
                             <node concept="37vLTw" id="5avmkTFRDps" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5avmkTFRDpw" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dz" />
                             </node>
                             <node concept="1mIQ4w" id="5avmkTFRDpt" role="2OqNvi">
                               <node concept="25Kdxt" id="5avmkTFRDpu" role="cj9EA">
@@ -1184,9 +1184,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5avmkTFRDpw" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817dz" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5avmkTFRDpx" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817d$" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1197,15 +1197,15 @@
                       <node concept="3clFbF" id="5avmkTFRE6n" role="3cqZAp">
                         <node concept="2OqwBi" id="5avmkTFREiX" role="3clFbG">
                           <node concept="37vLTw" id="5avmkTFRE6m" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5avmkTFRDZA" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817d_" />
                           </node>
                           <node concept="3YRAZt" id="5avmkTFRE_A" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5avmkTFRDZA" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817d_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5avmkTFRDZB" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dA" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1225,7 +1225,7 @@
                   <node concept="3clFbF" id="5avmkTFR$Mf" role="3cqZAp">
                     <node concept="2OqwBi" id="5avmkTFR$Mg" role="3clFbG">
                       <node concept="37vLTw" id="5avmkTFR$Mh" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5avmkTFR$Ml" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817dB" />
                       </node>
                       <node concept="1mIQ4w" id="5avmkTFR$Mi" role="2OqNvi">
                         <node concept="25Kdxt" id="5avmkTFR$Mj" role="cj9EA">
@@ -1235,9 +1235,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5avmkTFR$Ml" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817dB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5avmkTFR$Mm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817dC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1293,7 +1293,7 @@
                       <node concept="3fqX7Q" id="5avmkTFS_na" role="3clFbG">
                         <node concept="2OqwBi" id="5avmkTFS_nc" role="3fr31v">
                           <node concept="37vLTw" id="5avmkTFS_nd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5avmkTFSe6E" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dD" />
                           </node>
                           <node concept="liA8E" id="5avmkTFS_ne" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1302,9 +1302,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5avmkTFSe6E" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817dD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5avmkTFSe6F" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817dE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1975,7 +1975,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="48DDwlwZ$xM" role="3uHU7B">
                                         <node concept="37vLTw" id="48DDwlwZ$gA" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="48DDwlwZ$6v" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817dF" />
                                         </node>
                                         <node concept="3TrcHB" id="48DDwlwZ$XD" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1984,9 +1984,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="48DDwlwZ$6v" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817dF" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="48DDwlwZ$6w" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817dG" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2073,15 +2073,15 @@
                                       <node concept="3clFbF" id="48DDwlx19_b" role="3cqZAp">
                                         <node concept="2OqwBi" id="48DDwlx19QG" role="3clFbG">
                                           <node concept="37vLTw" id="48DDwlx19_7" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="48DDwlx14WP" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817dH" />
                                           </node>
                                           <node concept="1$rogu" id="48DDwlx1acZ" role="2OqNvi" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="48DDwlx14WP" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817dH" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="48DDwlx14WQ" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817dI" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
index 32816142a7..991a9534dd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
@@ -208,7 +208,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -235,7 +235,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -262,6 +262,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -346,7 +347,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -383,7 +384,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -449,7 +449,7 @@
                     <node concept="3y3z36" id="2HpFPvT8riC" role="3clFbG">
                       <node concept="2OqwBi" id="2HpFPvT8qel" role="3uHU7B">
                         <node concept="37vLTw" id="2HpFPvT8qem" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2HpFPvT8qeo" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cL" />
                         </node>
                         <node concept="2yIwOk" id="2HpFPvT8qen" role="2OqNvi" />
                       </node>
@@ -459,9 +459,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HpFPvT8qeo" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HpFPvT8qep" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cM" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -538,7 +538,7 @@
                         <node concept="3fqX7Q" id="2HpFPvTa_JR" role="3clFbG">
                           <node concept="2OqwBi" id="2HpFPvTa_Uj" role="3fr31v">
                             <node concept="37vLTw" id="2HpFPvTa_JY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2HpFPvTa_$Z" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cN" />
                             </node>
                             <node concept="1mIQ4w" id="2HpFPvTaAgl" role="2OqNvi">
                               <node concept="chp4Y" id="2HpFPvTaAvn" role="cj9EA">
@@ -549,9 +549,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2HpFPvTa_$Z" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2HpFPvTa__0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817cO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1476,7 +1476,7 @@
                     <node concept="3fqX7Q" id="2HpFPvT64XY" role="3clFbG">
                       <node concept="2OqwBi" id="2HpFPvT64Y0" role="3fr31v">
                         <node concept="37vLTw" id="2HpFPvT64Y1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2HpFPvT63TC" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cP" />
                         </node>
                         <node concept="1mIQ4w" id="2HpFPvT64Y2" role="2OqNvi">
                           <node concept="chp4Y" id="2HpFPvT64Y3" role="cj9EA">
@@ -1487,9 +1487,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2HpFPvT63TC" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2HpFPvT63TD" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1932,7 +1932,7 @@
                         <node concept="2OqwBi" id="4Pi6J8Cbqvd" role="3uHU7B">
                           <node concept="2OqwBi" id="4Pi6J8Cbqve" role="2Oq$k0">
                             <node concept="37vLTw" id="4Pi6J8Cbqvf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4Pi6J8Cbqvj" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cR" />
                             </node>
                             <node concept="liA8E" id="4Pi6J8Cbqvg" role="2OqNvi">
                               <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -1946,9 +1946,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4Pi6J8Cbqvj" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817cR" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4Pi6J8Cbqvk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817cS" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1959,7 +1959,7 @@
                   <node concept="3clFbF" id="4Pi6J8Cbqvo" role="3cqZAp">
                     <node concept="2OqwBi" id="4Pi6J8Cbqvp" role="3clFbG">
                       <node concept="37vLTw" id="4Pi6J8Cbqvq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4Pi6J8Cbqvs" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817cT" />
                       </node>
                       <node concept="liA8E" id="4Pi6J8Cbqvr" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -1967,9 +1967,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4Pi6J8Cbqvs" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4Pi6J8Cbqvt" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2289,7 +2289,7 @@
                       </node>
                       <node concept="2OqwBi" id="4nY0kF8p1bO" role="33vP2m">
                         <node concept="37vLTw" id="4nY0kF8p13e" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4nY0kF8p0VT" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817cV" />
                         </node>
                         <node concept="2qgKlT" id="2jITtfD_TC7" role="2OqNvi">
                           <ref role="37wK5l" node="4nY0kF8seDJ" resolve="evaluateEntryWithDownstreamUpdates" />
@@ -2298,9 +2298,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4nY0kF8p0VT" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817cV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4nY0kF8p0VU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817cW" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2342,16 +2342,16 @@
                           </node>
                           <node concept="2OqwBi" id="4nY0kF8oYLk" role="3uHU7B">
                             <node concept="37vLTw" id="4nY0kF8oYLl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4nY0kF8oYLn" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817cX" />
                             </node>
                             <node concept="2bSWHS" id="4nY0kF8oYLm" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4nY0kF8oYLn" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817cX" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4nY0kF8oYLo" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817cY" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2376,7 +2376,7 @@
                     <node concept="2OqwBi" id="4nY0kF8oMxB" role="3clFbG">
                       <node concept="2OqwBi" id="4nY0kF8oIER" role="2Oq$k0">
                         <node concept="37vLTw" id="4nY0kF8oIuG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4nY0kF8oIu$" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817d3" />
                         </node>
                         <node concept="2Rf3mk" id="4nY0kF8oJgA" role="2OqNvi">
                           <node concept="1xMEDy" id="4nY0kF8oJgC" role="1xVPHs">
@@ -2394,7 +2394,7 @@
                                 <node concept="3clFbC" id="4nY0kF8oSDR" role="3uHU7B">
                                   <node concept="2OqwBi" id="4nY0kF8oRNO" role="3uHU7B">
                                     <node concept="37vLTw" id="4nY0kF8oRyV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4nY0kF8oRrU" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817d1" />
                                     </node>
                                     <node concept="3TrEf2" id="4nY0kF8oS7Z" role="2OqNvi">
                                       <ref role="3Tt5mk" to="wtll:2HpFPvT9Hfy" resolve="entry" />
@@ -2405,7 +2405,7 @@
                                 <node concept="2OqwBi" id="4nY0kF8oTzQ" role="3uHU7w">
                                   <node concept="2OqwBi" id="4nY0kF8oTzR" role="2Oq$k0">
                                     <node concept="37vLTw" id="4nY0kF8oTzS" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4nY0kF8oRrU" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817d1" />
                                     </node>
                                     <node concept="2Rf3mk" id="4nY0kF8oTzT" role="2OqNvi">
                                       <node concept="1xMEDy" id="4nY0kF8oTzU" role="1xVPHs">
@@ -2422,7 +2422,7 @@
                                           <node concept="3clFbC" id="4nY0kF8oT$1" role="3clFbG">
                                             <node concept="2OqwBi" id="4nY0kF8oT$2" role="3uHU7B">
                                               <node concept="37vLTw" id="4nY0kF8oT$3" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4nY0kF8oT$6" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817cZ" />
                                               </node>
                                               <node concept="3TrEf2" id="4nY0kF8oT$4" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="wtll:5nEyPbMpXeg" resolve="entry" />
@@ -2432,9 +2432,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="4nY0kF8oT$6" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX817cZ" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="4nY0kF8oT$7" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX817d0" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -2442,18 +2442,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4nY0kF8oRrU" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817d1" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4nY0kF8oRrV" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817d2" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4nY0kF8oIu$" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817d3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4nY0kF8oIu_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817d4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2778,7 +2778,7 @@
                       <node concept="10Nm6u" id="5xEoEMrw83M" role="3uHU7w" />
                       <node concept="2OqwBi" id="5xEoEMrw7m3" role="3uHU7B">
                         <node concept="37vLTw" id="5xEoEMrw7aa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5xEoEMrw75P" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817d5" />
                         </node>
                         <node concept="3TrEf2" id="5xEoEMrw7yM" role="2OqNvi">
                           <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -2787,9 +2787,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5xEoEMrw75P" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817d5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5xEoEMrw75Q" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817d6" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2926,7 +2926,7 @@
                       <node concept="10Nm6u" id="5avmkTFFJeI" role="3uHU7w" />
                       <node concept="2OqwBi" id="5avmkTFFJeJ" role="3uHU7B">
                         <node concept="37vLTw" id="5avmkTFFJeK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5avmkTFFJeM" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817d7" />
                         </node>
                         <node concept="3TrEf2" id="5avmkTFFJeL" role="2OqNvi">
                           <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -2935,9 +2935,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5avmkTFFJeM" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817d7" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5avmkTFFJeN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817d8" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3198,15 +3198,15 @@
                               <node concept="3clFbF" id="7HzLUeHEjNL" role="3cqZAp">
                                 <node concept="2OqwBi" id="7HzLUeHEjNM" role="3clFbG">
                                   <node concept="37vLTw" id="7HzLUeHEjNN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7HzLUeHEjNP" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817d9" />
                                   </node>
                                   <node concept="1$rogu" id="7HzLUeHEjNO" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7HzLUeHEjNP" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817d9" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7HzLUeHEjNQ" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817da" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3344,15 +3344,15 @@
                               <node concept="3clFbF" id="56SqGtkTGK7" role="3cqZAp">
                                 <node concept="2OqwBi" id="56SqGtkTGK8" role="3clFbG">
                                   <node concept="37vLTw" id="56SqGtkTGK9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="56SqGtkTGKb" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817db" />
                                   </node>
                                   <node concept="1$rogu" id="56SqGtkTGKa" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="56SqGtkTGKb" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817db" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="56SqGtkTGKc" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817dc" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
index 318c262d0c..09008ae883 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
@@ -82,7 +82,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,6 +122,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -320,14 +320,14 @@
                             <ref role="3cqZAo" node="1F1F0IUZA$C" resolve="de" />
                           </node>
                           <node concept="37vLTw" id="2QxWJFK_2kG" role="3uHU7B">
-                            <ref role="3cqZAo" node="2QxWJFK_2kH" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dd" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QxWJFK_2kH" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dd" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QxWJFK_2kI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817de" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -353,16 +353,16 @@
                           </node>
                           <node concept="2OqwBi" id="5nEyPbMspdH" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMspdI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5nEyPbMspdK" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817df" />
                             </node>
                             <node concept="2bSWHS" id="5nEyPbMspdJ" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5nEyPbMspdK" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817df" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5nEyPbMspdL" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dg" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -386,7 +386,7 @@
                       <node concept="3clFbF" id="2QxWJFK_3Pw" role="3cqZAp">
                         <node concept="2OqwBi" id="2QxWJFK_RIT" role="3clFbG">
                           <node concept="37vLTw" id="2QxWJFK_RwW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2QxWJFK_3Fv" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dh" />
                           </node>
                           <node concept="2qgKlT" id="2QxWJFK_Swi" role="2OqNvi">
                             <ref role="37wK5l" to="31n1:2QxWJFK_S9T" resolve="isReferenceable" />
@@ -394,9 +394,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2QxWJFK_3Fv" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2QxWJFK_3Fw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817di" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -466,14 +466,14 @@
                             <ref role="3cqZAo" node="5nEyPbMpXLD" resolve="de" />
                           </node>
                           <node concept="37vLTw" id="5nEyPbMpXM4" role="3uHU7B">
-                            <ref role="3cqZAo" node="5nEyPbMpXM5" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dj" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5nEyPbMpXM5" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dj" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5nEyPbMpXM6" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dk" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -499,16 +499,16 @@
                           </node>
                           <node concept="2OqwBi" id="5nEyPbMslcc" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMskUg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5nEyPbMskFl" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dl" />
                             </node>
                             <node concept="2bSWHS" id="5nEyPbMslzQ" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5nEyPbMskFl" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dl" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5nEyPbMskFm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dm" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -533,7 +533,7 @@
                         <node concept="3clFbF" id="5nEyPbMpXMe" role="3cqZAp">
                           <node concept="2OqwBi" id="5nEyPbMpXMf" role="3clFbG">
                             <node concept="37vLTw" id="5nEyPbMpXMg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5nEyPbMpXMi" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dn" />
                             </node>
                             <node concept="2qgKlT" id="5nEyPbMpXMh" role="2OqNvi">
                               <ref role="37wK5l" to="31n1:2QxWJFK_S9T" resolve="isReferenceable" />
@@ -541,9 +541,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5nEyPbMpXMi" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817dn" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5nEyPbMpXMj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817do" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -556,7 +556,7 @@
                           <node concept="10Nm6u" id="5nEyPbMq2i7" role="3uHU7w" />
                           <node concept="2OqwBi" id="5nEyPbMq12T" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMq0MC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5nEyPbMpZMe" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dp" />
                             </node>
                             <node concept="3TrcHB" id="5nEyPbMq1pc" role="2OqNvi">
                               <ref role="3TsBF5" to="wtll:2QxWJFKDebM" resolve="optionalName" />
@@ -565,9 +565,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5nEyPbMpZMe" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dp" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5nEyPbMpZMf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -842,7 +842,7 @@
                       <node concept="3clFbF" id="3pIANU_0L_X" role="3cqZAp">
                         <node concept="2OqwBi" id="3pIANU_0LV2" role="3clFbG">
                           <node concept="37vLTw" id="3pIANU_0L_W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3pIANU_0LpD" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dr" />
                           </node>
                           <node concept="3TrcHB" id="3pIANU_0Mr0" role="2OqNvi">
                             <ref role="3TsBF5" to="wtll:3pIANU_03o9" resolve="template" />
@@ -850,9 +850,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3pIANU_0LpD" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dr" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3pIANU_0LpE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ds" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -931,7 +931,7 @@
                         <node concept="3fqX7Q" id="3pIANU_3nK6" role="3clFbG">
                           <node concept="2OqwBi" id="3pIANU_3nK8" role="3fr31v">
                             <node concept="37vLTw" id="3pIANU_3nK9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pIANU_3npy" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dt" />
                             </node>
                             <node concept="3TrcHB" id="3pIANU_3nKa" role="2OqNvi">
                               <ref role="3TsBF5" to="wtll:3pIANU_03o9" resolve="template" />
@@ -940,9 +940,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3pIANU_3npy" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3pIANU_3npz" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817du" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
index b1d07646e7..d86819e41f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
@@ -43,7 +43,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -116,7 +116,7 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -138,7 +138,7 @@
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -172,7 +172,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -185,7 +185,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6918029743850363447" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_targetNode" flags="ng" index="1NM5Ph" />
@@ -285,7 +285,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -344,7 +344,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -366,7 +366,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -395,6 +395,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" />
@@ -407,7 +408,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G" />
@@ -509,7 +510,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>
@@ -531,7 +532,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -4412,7 +4412,7 @@
                                 <node concept="3clFbF" id="3_Nra3E9qVw" role="3cqZAp">
                                   <node concept="2OqwBi" id="3_Nra3E9rfq" role="3clFbG">
                                     <node concept="37vLTw" id="3_Nra3E9qVv" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3_Nra3E9q_e" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817dv" />
                                     </node>
                                     <node concept="1mIQ4w" id="3_Nra3E9sJo" role="2OqNvi">
                                       <node concept="chp4Y" id="3_Nra3E9tk9" role="cj9EA">
@@ -4422,9 +4422,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3_Nra3E9q_e" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817dv" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3_Nra3E9q_f" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817dw" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/structure.mps
index 8b528ee90b..2773952fc3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/structure.mps
@@ -55,7 +55,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
index 1db3a09b6a..200186e7b7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
@@ -66,7 +66,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">
@@ -113,7 +113,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,6 +131,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" />
@@ -252,7 +253,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -274,7 +275,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -1120,7 +1120,7 @@
                       <node concept="3clFbF" id="48DDwlwVDVw" role="3cqZAp">
                         <node concept="2OqwBi" id="48DDwlwVDVx" role="3clFbG">
                           <node concept="37vLTw" id="48DDwlwVDVy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="48DDwlwVDV$" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dJ" />
                           </node>
                           <node concept="3TrcHB" id="48DDwlwVDVz" role="2OqNvi">
                             <ref role="3TsBF5" to="wtll:48DDwlwUXpx" resolve="result" />
@@ -1128,9 +1128,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="48DDwlwVDV$" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817dJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="48DDwlwVDV_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817dK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/plugin.mps
index 90f82d00f2..5ee06a85cd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -22,7 +22,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 id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/org.iets3.core.expr.repl.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/org.iets3.core.expr.repl.mpl
index 3b9747709b..3fa2a82809 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/org.iets3.core.expr.repl.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/org.iets3.core.expr.repl.mpl
@@ -29,7 +29,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" />
@@ -111,7 +111,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -145,7 +144,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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" />
@@ -172,7 +171,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
index e40f9c40a8..18bd824814 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
@@ -171,7 +171,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -192,7 +192,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">
@@ -211,6 +211,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" />
@@ -294,7 +295,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -321,7 +322,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -3563,7 +3563,7 @@
                               </node>
                               <node concept="2OqwBi" id="5bB0DPkzfma" role="1m5AlR">
                                 <node concept="37vLTw" id="5bB0DPkzcoh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5bB0DPkz5Sw" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817dL" />
                                 </node>
                                 <node concept="3JvlWi" id="5bB0DPk$VPe" role="2OqNvi" />
                               </node>
@@ -3571,9 +3571,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5bB0DPkz5Sw" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817dL" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5bB0DPkz5Sx" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817dM" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/structure.mps
index c3bcc1a065..5c76be4fad 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl
index a94e52cd66..d917cabd4c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</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.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps
index 8dda167619..26fa0e7a6b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps
@@ -6,7 +6,7 @@
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -174,7 +174,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -191,7 +191,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">
@@ -305,7 +305,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -353,7 +353,7 @@
         <property id="1174558315290" name="start" index="1T8p8b" />
         <property id="1174558317822" name="end" index="1T8pRJ" />
       </concept>
-      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
         <child id="1174653387388" name="regexp" index="1YN4dH" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/constraints.mps
index 09ec11e0cf..8a5c66d80b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/constraints.mps
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -190,7 +190,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps
index 36e1c480a9..5802bd2975 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps
@@ -69,7 +69,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -83,7 +83,7 @@
         <child id="7250830207897909099" name="specificator" index="KNiz3" />
         <child id="772883491827840107" name="customizeFunction" index="3l$a4r" />
       </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="772883491827578824" name="jetbrains.mps.lang.editor.structure.CompletionCustomization_CustomizeFunction" flags="ig" index="3lBaaS" />
@@ -120,7 +120,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -132,7 +132,7 @@
         <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_">
@@ -205,7 +205,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>
@@ -213,7 +213,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" />
@@ -238,7 +238,7 @@
       <concept id="2489050352088028316" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_editorContext" flags="ng" index="2MNBq7" />
       <concept id="2283544813052478257" name="com.mbeddr.mpsutil.grammarcells.structure.GrammarCellsTransformationMenuPart" flags="ng" index="2X7gjp" />
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -278,7 +278,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
index 0ca26880ef..6c7c048371 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
@@ -82,7 +82,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,6 +98,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -179,7 +180,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>
@@ -188,7 +189,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -676,7 +676,7 @@
                         <node concept="2OqwBi" id="7VuYlCRLHJb" role="3fr31v">
                           <node concept="2OqwBi" id="7VuYlCRLHJc" role="2Oq$k0">
                             <node concept="37vLTw" id="7VuYlCRLHJd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7VuYlCRLHJh" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817dO" />
                             </node>
                             <node concept="3TrEf2" id="7VuYlCRLHJe" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -691,9 +691,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7VuYlCRLHJh" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817dO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7VuYlCRLHJi" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817dP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -720,7 +720,7 @@
                       <node concept="2OqwBi" id="7VuYlCRLJ9S" role="3clFbG">
                         <node concept="2OqwBi" id="7VuYlCRLJ9T" role="2Oq$k0">
                           <node concept="37vLTw" id="7VuYlCRLJ9U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7VuYlCRLJ9Y" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dQ" />
                           </node>
                           <node concept="3TrEf2" id="7VuYlCRLJ9V" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -734,9 +734,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7VuYlCRLJ9Y" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817dQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7VuYlCRLJ9Z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817dR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -823,7 +823,7 @@
                       <node concept="2OqwBi" id="7VuYlCRLsNi" role="3clFbG">
                         <node concept="2OqwBi" id="7VuYlCRLrGk" role="2Oq$k0">
                           <node concept="37vLTw" id="7VuYlCRLrrD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7VuYlCRLqUE" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817dS" />
                           </node>
                           <node concept="3TrEf2" id="7VuYlCRLsoa" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -837,9 +837,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7VuYlCRLqUE" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817dS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7VuYlCRLqUF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817dT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/migration.mps
index 74390546b0..659b33aeb7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/migration.mps
@@ -28,7 +28,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" />
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
index bfeade6e28..8f5a3da6bc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:5bf19129-2710-45a6-906e-9ee2d0977853(org.iets3.core.expr.simpleTypes.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="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
@@ -52,7 +52,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -159,7 +159,7 @@
       <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>
@@ -184,7 +184,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="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -203,6 +203,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -296,7 +297,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -353,7 +354,6 @@
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1227026094155" name="jetbrains.mps.baseLanguage.collections.structure.RemoveLastElementOperation" flags="nn" index="2Kt5_m" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -1724,7 +1724,7 @@
                   <node concept="3clFbF" id="zJfofgCwst" role="3cqZAp">
                     <node concept="3y3z36" id="zJfofgCxGt" role="3clFbG">
                       <node concept="37vLTw" id="zJfofgCwss" role="3uHU7B">
-                        <ref role="3cqZAo" node="zJfofgCuzR" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817dY" />
                       </node>
                       <node concept="2OqwBi" id="bA6f$piPZq" role="3uHU7w">
                         <node concept="37vLTw" id="bA6f$piPZr" role="2Oq$k0">
@@ -1735,9 +1735,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="zJfofgCuzR" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817dY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="zJfofgCuzS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817dZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2052,7 +2052,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="1PW6P0ZLheW" role="1LFl5Q">
                                   <node concept="37vLTw" id="1PW6P0ZLheX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1PW6P0ZLheZ" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817e0" />
                                   </node>
                                   <node concept="2qgKlT" id="1PW6P0ZLheY" role="2OqNvi">
                                     <ref role="37wK5l" to="b1h1:2NHHcg2Ff6S" resolve="range" />
@@ -2061,9 +2061,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1PW6P0ZLheZ" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817e0" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1PW6P0ZLhf0" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817e1" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2092,7 +2092,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="1PW6P0ZLhfd" role="1LFl5Q">
                                   <node concept="37vLTw" id="1PW6P0ZLhfe" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1PW6P0ZLhfg" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817e2" />
                                   </node>
                                   <node concept="2qgKlT" id="1PW6P0ZLhff" role="2OqNvi">
                                     <ref role="37wK5l" to="b1h1:2NHHcg2Ff6S" resolve="range" />
@@ -2101,9 +2101,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1PW6P0ZLhfg" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817e2" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1PW6P0ZLhfh" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817e3" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2183,7 +2183,7 @@
                         <node concept="3clFbF" id="1PW6P0ZLhfK" role="3cqZAp">
                           <node concept="2OqwBi" id="1PW6P0ZLhfL" role="3clFbG">
                             <node concept="37vLTw" id="1PW6P0ZLhfM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1PW6P0ZLhfO" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817e4" />
                             </node>
                             <node concept="2qgKlT" id="1PW6P0ZLhfN" role="2OqNvi">
                               <ref role="37wK5l" to="b1h1:19PglA20ASE" resolve="precision" />
@@ -2191,9 +2191,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1PW6P0ZLhfO" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817e4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1PW6P0ZLhfP" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817e5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2442,13 +2442,13 @@
                               <node concept="22lmx$" id="x6NxUzmLE5" role="3clFbG">
                                 <node concept="3clFbC" id="x6NxUzmviX" role="3uHU7B">
                                   <node concept="37vLTw" id="x6NxUzmqPZ" role="3uHU7B">
-                                    <ref role="3cqZAo" node="1G7Ce6ww1h6" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817e6" />
                                   </node>
                                   <node concept="10Nm6u" id="x6NxUzm$LQ" role="3uHU7w" />
                                 </node>
                                 <node concept="2OqwBi" id="5Am5nOLsgTA" role="3uHU7w">
                                   <node concept="37vLTw" id="1G7Ce6ww1h5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1G7Ce6ww1h6" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817e6" />
                                   </node>
                                   <node concept="1mIQ4w" id="5Am5nOLsxWo" role="2OqNvi">
                                     <node concept="chp4Y" id="5Am5nOLsFwD" role="cj9EA">
@@ -2459,9 +2459,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1G7Ce6ww1h6" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817e6" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1G7Ce6ww1h7" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817e7" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps
index ce64f75ca6..533af48999 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/textGen.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/textGen.mps
index 79d5db9aaa..33affa3041 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/textGen.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/textGen.mps
@@ -20,7 +20,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.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
index b059707deb..5fb143c245 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
@@ -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>
@@ -116,6 +116,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -290,7 +291,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -330,7 +331,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -4246,14 +4246,14 @@
                                   <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                                   <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
                                   <node concept="37vLTw" id="53cOfDpyX5I" role="37wK5m">
-                                    <ref role="3cqZAo" node="53cOfDpyW_L" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817dU" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="53cOfDpyW_L" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817dU" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="53cOfDpyW_M" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817dV" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -4275,13 +4275,13 @@
                                     <property role="Xl_RC" value="Multiple otherwise literals are not allowed" />
                                   </node>
                                   <node concept="37vLTw" id="53cOfDpd6ik" role="1urrMF">
-                                    <ref role="3cqZAo" node="53cOfDpd5JT" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817dW" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="53cOfDpd5JT" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817dW" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="53cOfDpd5JU" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817dX" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl
index f9b58add20..8aa2906e5e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
     <dependency reexport="false">daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</dependency>
@@ -33,7 +32,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -62,7 +61,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/actions.mps
index 8bc7e47b7c..b20f81d977 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/actions.mps
@@ -59,7 +59,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
index 4920b13e05..68a796a968 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
@@ -113,7 +113,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>
@@ -126,13 +126,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -203,7 +204,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -229,7 +230,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -281,7 +281,7 @@
                     <node concept="3clFbF" id="7S4tmubDTU4" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDU8u" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDTU3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubDTTV" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817e8" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDUtm" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -289,9 +289,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubDTTV" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817e8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubDTTW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817e9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -503,7 +503,7 @@
                     <node concept="2OqwBi" id="7bd8pkkAIAf" role="3clFbG">
                       <node concept="2OqwBi" id="7bd8pkkAHoq" role="2Oq$k0">
                         <node concept="37vLTw" id="7bd8pkkAH7A" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7bd8pkkAH26" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ea" />
                         </node>
                         <node concept="3TrcHB" id="7bd8pkkAHGP" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -518,9 +518,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7bd8pkkAH26" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ea" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7bd8pkkAH27" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817eb" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -577,7 +577,7 @@
                     <node concept="2OqwBi" id="7bd8pkk$AjA" role="3clFbG">
                       <node concept="2OqwBi" id="7bd8pkk$$SS" role="2Oq$k0">
                         <node concept="37vLTw" id="7bd8pkk$$A9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7bd8pkk$$u1" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ec" />
                         </node>
                         <node concept="3TrcHB" id="7bd8pkk$_h5" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -592,9 +592,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7bd8pkk$$u1" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ec" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7bd8pkk$$u2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ed" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -625,7 +625,7 @@
                     <node concept="2OqwBi" id="4J6AqiIYd9e" role="3clFbG">
                       <node concept="2OqwBi" id="4J6AqiIYd9f" role="2Oq$k0">
                         <node concept="37vLTw" id="4J6AqiIYd9g" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4J6AqiIYd9k" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ee" />
                         </node>
                         <node concept="3TrcHB" id="4J6AqiIYd9h" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -640,9 +640,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4J6AqiIYd9k" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ee" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4J6AqiIYd9l" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ef" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -687,7 +687,7 @@
                   <node concept="3clFbF" id="33mFrum_4eS" role="3cqZAp">
                     <node concept="2OqwBi" id="33mFrum_4wC" role="3clFbG">
                       <node concept="37vLTw" id="33mFrum_4eR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="33mFrum_46Z" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817eg" />
                       </node>
                       <node concept="3TrcHB" id="33mFrum_4Vf" role="2OqNvi">
                         <ref role="3TsBF5" to="19m5:33mFrum_2JP" resolve="observable" />
@@ -695,9 +695,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="33mFrum_46Z" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817eg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="33mFrum_470" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817eh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -735,7 +735,7 @@
                   <node concept="3clFbF" id="4J6AqiIUUCd" role="3cqZAp">
                     <node concept="2OqwBi" id="4J6AqiIUUCe" role="3clFbG">
                       <node concept="37vLTw" id="4J6AqiIUUCf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4J6AqiIUUCh" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817ei" />
                       </node>
                       <node concept="3TrcHB" id="3H4W4di$QNF" role="2OqNvi">
                         <ref role="3TsBF5" to="19m5:4J6AqiIShjW" resolve="observable" />
@@ -743,9 +743,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4J6AqiIUUCh" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ei" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4J6AqiIUUCi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ej" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2286,7 +2286,7 @@
                     <node concept="3clFbF" id="4IV0h47Gaud" role="3cqZAp">
                       <node concept="2OqwBi" id="4IV0h47GaFW" role="3clFbG">
                         <node concept="37vLTw" id="4IV0h47Gauc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4IV0h47GanV" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ek" />
                         </node>
                         <node concept="2qgKlT" id="4IV0h47GaTl" role="2OqNvi">
                           <ref role="37wK5l" to="4lqd:4IV0h47FYNX" resolve="guaranteesContextArguments" />
@@ -2294,9 +2294,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4IV0h47GanV" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ek" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4IV0h47GanW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817el" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/constraints.mps
index c2ea744ed4..99d43afa6a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/constraints.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>
@@ -148,7 +148,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
index e072db775e..9f4a024f1e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
@@ -82,7 +82,7 @@
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -93,7 +93,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -116,7 +116,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" />
@@ -206,7 +206,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -219,7 +219,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -237,6 +237,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" />
@@ -249,7 +250,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
@@ -262,7 +263,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -337,7 +338,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -348,7 +349,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -1880,7 +1880,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817em" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -1895,7 +1895,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817em" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
@@ -1903,9 +1903,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="LBlPJUzjy9" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817em" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1P4c1XrzTlB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817en" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
index 17db49efff..57d9ef5f87 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
@@ -6,7 +6,7 @@
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -59,6 +59,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -133,7 +134,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -147,7 +148,6 @@
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
-      <concept id="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="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -218,7 +218,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="agNjvGhIKA" role="1m5AlR">
                                     <node concept="37vLTw" id="agNjvGhHXp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="agNjvGgZnK" resolve="action" />
+                                      <ref role="3cqZAo" node="4z0AnX817eq" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGhJDn" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -244,15 +244,15 @@
                                         </node>
                                         <node concept="TSZUe" id="agNjvGhAhj" role="2OqNvi">
                                           <node concept="37vLTw" id="agNjvGhATK" role="25WWJ7">
-                                            <ref role="3cqZAo" node="agNjvGhsJs" resolve="expr" />
+                                            <ref role="3cqZAo" node="4z0AnX817eo" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="agNjvGhsJs" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817eo" role="1bW2Oz">
                                     <property role="TrG5h" value="expr" />
-                                    <node concept="2jxLKc" id="agNjvGhsJt" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817ep" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -262,7 +262,7 @@
                         <node concept="2OqwBi" id="agNjvGhEht" role="3clFbw">
                           <node concept="2OqwBi" id="agNjvGhCTZ" role="2Oq$k0">
                             <node concept="37vLTw" id="agNjvGhClX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="agNjvGgZnK" resolve="action" />
+                              <ref role="3cqZAo" node="4z0AnX817eq" />
                             </node>
                             <node concept="3TrEf2" id="agNjvGhDxy" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -289,7 +289,7 @@
                                 <node concept="TSZUe" id="agNjvGgZnA" role="2OqNvi">
                                   <node concept="2OqwBi" id="agNjvGgZnC" role="25WWJ7">
                                     <node concept="37vLTw" id="agNjvGgZnD" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="agNjvGgZnK" resolve="action" />
+                                      <ref role="3cqZAo" node="4z0AnX817eq" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGgZnE" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -304,15 +304,15 @@
                       <node concept="3clFbF" id="agNjvGgZnG" role="3cqZAp">
                         <node concept="2OqwBi" id="agNjvGgZnH" role="3clFbG">
                           <node concept="37vLTw" id="agNjvGgZnI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="agNjvGgZnK" resolve="action" />
+                            <ref role="3cqZAo" node="4z0AnX817eq" />
                           </node>
                           <node concept="3YRAZt" id="agNjvGgZnJ" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="agNjvGgZnK" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817eq" role="1bW2Oz">
                       <property role="TrG5h" value="action" />
-                      <node concept="2jxLKc" id="agNjvGgZnL" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817er" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -445,7 +445,7 @@
                         <node concept="2OqwBi" id="agNjvGrSHE" role="3clFbw">
                           <node concept="2OqwBi" id="agNjvGrRRX" role="2Oq$k0">
                             <node concept="37vLTw" id="agNjvGrR_W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="agNjvGrR6Z" resolve="action" />
+                              <ref role="3cqZAo" node="4z0AnX817eu" />
                             </node>
                             <node concept="3TrEf2" id="agNjvGrSbv" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -467,7 +467,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="agNjvGrU8t" role="1m5AlR">
                                     <node concept="37vLTw" id="agNjvGrTJG" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="agNjvGrR6Z" resolve="action" />
+                                      <ref role="3cqZAo" node="4z0AnX817eu" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGrUL0" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -493,15 +493,15 @@
                                         </node>
                                         <node concept="TSZUe" id="agNjvGs9$b" role="2OqNvi">
                                           <node concept="37vLTw" id="agNjvGsaa_" role="25WWJ7">
-                                            <ref role="3cqZAo" node="agNjvGs2NX" resolve="expr" />
+                                            <ref role="3cqZAo" node="4z0AnX817es" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="agNjvGs2NX" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817es" role="1bW2Oz">
                                     <property role="TrG5h" value="expr" />
-                                    <node concept="2jxLKc" id="agNjvGs2NY" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817et" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -523,7 +523,7 @@
                                 <node concept="TSZUe" id="agNjvGsjKH" role="2OqNvi">
                                   <node concept="2OqwBi" id="agNjvGslqS" role="25WWJ7">
                                     <node concept="37vLTw" id="agNjvGskwr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="agNjvGrR6Z" resolve="action" />
+                                      <ref role="3cqZAo" node="4z0AnX817eu" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGsmxo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -538,15 +538,15 @@
                       <node concept="3clFbF" id="agNjvGsnXu" role="3cqZAp">
                         <node concept="2OqwBi" id="agNjvGsoAv" role="3clFbG">
                           <node concept="37vLTw" id="agNjvGsnXs" role="2Oq$k0">
-                            <ref role="3cqZAo" node="agNjvGrR6Z" resolve="action" />
+                            <ref role="3cqZAo" node="4z0AnX817eu" />
                           </node>
                           <node concept="3YRAZt" id="agNjvGspwk" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="agNjvGrR6Z" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817eu" role="1bW2Oz">
                       <property role="TrG5h" value="action" />
-                      <node concept="2jxLKc" id="agNjvGrR70" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ev" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
index e98e278ca5..b7dea07196 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
@@ -45,7 +45,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -165,7 +165,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -194,6 +194,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -270,7 +271,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -297,7 +298,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -565,7 +565,7 @@
                     <node concept="1rXfSq" id="3H4W4diDgU1" role="3clFbG">
                       <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                       <node concept="37vLTw" id="3H4W4diDgU2" role="37wK5m">
-                        <ref role="3cqZAo" node="3H4W4diDgUa" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817ew" />
                       </node>
                       <node concept="2ShNRf" id="k9boAuazL3" role="37wK5m">
                         <node concept="1pGfFk" id="k9boAua_aU" role="2ShVmc">
@@ -578,9 +578,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3H4W4diDgUa" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ew" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3H4W4diDgUb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ex" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1214,7 +1214,7 @@
                                           <ref role="37wK5l" to="n9sl:Z4fkwzao$i" resolve="IDArg" />
                                           <node concept="2OqwBi" id="7bd8pkkwhmk" role="37wK5m">
                                             <node concept="37vLTw" id="7bd8pkkwgY6" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="7bd8pkkwf$F" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817ey" />
                                             </node>
                                             <node concept="3TrcHB" id="7bd8pkkwifV" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1223,7 +1223,7 @@
                                           <node concept="2OqwBi" id="7bd8pkkwkzb" role="37wK5m">
                                             <node concept="2OqwBi" id="7bd8pkkwj6Z" role="2Oq$k0">
                                               <node concept="37vLTw" id="7bd8pkkwiG0" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7bd8pkkwf$F" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817ey" />
                                               </node>
                                               <node concept="3TrEf2" id="7bd8pkkwjS6" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -1235,9 +1235,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="7bd8pkkwf$F" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817ey" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="7bd8pkkwf$G" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817ez" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2093,7 +2093,7 @@
                         <node concept="2OqwBi" id="7bd8pkk_nwf" role="3uHU7B">
                           <node concept="2OqwBi" id="7bd8pkk_nwg" role="2Oq$k0">
                             <node concept="37vLTw" id="7bd8pkk_nwh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7bd8pkk_nww" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817e$" />
                             </node>
                             <node concept="3TrEf2" id="7bd8pkk_nwi" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:33mFrumFlOJ" resolve="trigger" />
@@ -2116,7 +2116,7 @@
                               </node>
                               <node concept="2OqwBi" id="7bd8pkk_nws" role="1m5AlR">
                                 <node concept="37vLTw" id="7bd8pkk_nwt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7bd8pkk_nww" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817e$" />
                                 </node>
                                 <node concept="3TrEf2" id="7bd8pkk_nwu" role="2OqNvi">
                                   <ref role="3Tt5mk" to="19m5:33mFrumFlOJ" resolve="trigger" />
@@ -2131,9 +2131,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7bd8pkk_nww" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817e$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7bd8pkk_nwx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817e_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2647,7 +2647,7 @@
                             <node concept="1rXfSq" id="7Z_fDCwm5Yh" role="3clFbG">
                               <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                               <node concept="37vLTw" id="7Z_fDCwm5Yi" role="37wK5m">
-                                <ref role="3cqZAo" node="7Z_fDCwm5Yq" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817eA" />
                               </node>
                               <node concept="2OqwBi" id="7Z_fDCwm5Yj" role="37wK5m">
                                 <node concept="37vLTw" id="7Z_fDCwm5ZO" role="2Oq$k0">
@@ -2656,7 +2656,7 @@
                                 <node concept="liA8E" id="7Z_fDCwm5Yl" role="2OqNvi">
                                   <ref role="37wK5l" to="2ahs:6gYCXSucFwO" resolve="newChild" />
                                   <node concept="37vLTw" id="7Z_fDCwm5Ym" role="37wK5m">
-                                    <ref role="3cqZAo" node="7Z_fDCwm5Yq" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eA" />
                                   </node>
                                   <node concept="3clFbT" id="7Z_fDCwm5Yn" role="37wK5m">
                                     <property role="3clFbU" value="true" />
@@ -2665,16 +2665,16 @@
                                     <property role="Xl_RC" value="exit action" />
                                   </node>
                                   <node concept="37vLTw" id="7Z_fDCwm5Yp" role="37wK5m">
-                                    <ref role="3cqZAo" node="7Z_fDCwm5Yq" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eA" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Z_fDCwm5Yq" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817eA" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Z_fDCwm5Yr" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817eB" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2814,7 +2814,7 @@
                             <node concept="1rXfSq" id="k9boAuanvC" role="3clFbG">
                               <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                               <node concept="37vLTw" id="k9boAuanvD" role="37wK5m">
-                                <ref role="3cqZAo" node="k9boAuanvL" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817eC" />
                               </node>
                               <node concept="2OqwBi" id="k9boAuanvE" role="37wK5m">
                                 <node concept="37vLTw" id="k9boAuanvF" role="2Oq$k0">
@@ -2823,7 +2823,7 @@
                                 <node concept="liA8E" id="k9boAuanvG" role="2OqNvi">
                                   <ref role="37wK5l" to="2ahs:6gYCXSucFwO" resolve="newChild" />
                                   <node concept="37vLTw" id="k9boAuanvH" role="37wK5m">
-                                    <ref role="3cqZAo" node="k9boAuanvL" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eC" />
                                   </node>
                                   <node concept="3clFbT" id="k9boAuanvI" role="37wK5m">
                                     <property role="3clFbU" value="true" />
@@ -2832,16 +2832,16 @@
                                     <property role="Xl_RC" value="entry action" />
                                   </node>
                                   <node concept="37vLTw" id="k9boAuanvK" role="37wK5m">
-                                    <ref role="3cqZAo" node="k9boAuanvL" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eC" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="k9boAuanvL" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817eC" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="k9boAuanvM" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817eD" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3173,7 +3173,7 @@
                         <node concept="2OqwBi" id="6XMQOZeaC19" role="3clFbG">
                           <node concept="2OqwBi" id="6XMQOZeaC1a" role="2Oq$k0">
                             <node concept="37vLTw" id="6XMQOZeaC1b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6XMQOZeaC1h" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817eE" />
                             </node>
                             <node concept="3TrcHB" id="6XMQOZeaC1c" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3193,9 +3193,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6XMQOZeaC1h" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817eE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6XMQOZeaC1i" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817eF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3660,7 +3660,7 @@
                               <node concept="2OqwBi" id="7dN4gbaezqD" role="3uHU7B">
                                 <node concept="2OqwBi" id="7dN4gbaeynh" role="2Oq$k0">
                                   <node concept="37vLTw" id="7dN4gbaey6$" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7dN4gbaexXT" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eG" />
                                   </node>
                                   <node concept="3AY5_j" id="7dN4gbaeyTU" role="2OqNvi" />
                                 </node>
@@ -3676,7 +3676,7 @@
                               <node concept="2OqwBi" id="7dN4gbag1hH" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7dN4gbaeAb9" role="2Oq$k0">
                                   <node concept="37vLTw" id="7dN4gbae_QI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7dN4gbaexXT" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817eG" />
                                   </node>
                                   <node concept="3AV6Ez" id="7dN4gbaeAAk" role="2OqNvi" />
                                 </node>
@@ -3691,9 +3691,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7dN4gbaexXT" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817eG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7dN4gbaexXU" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817eH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/structure.mps
index f77e10e38a..c8b0690262 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/structure.mps
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/typesystem.mps
index 16718e8a5e..e4a7d71d35 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/typesystem.mps
@@ -61,7 +61,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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 id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.statemachines/org.iets3.core.expr.statemachines.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/org.iets3.core.expr.statemachines.mpl
index 5de3f3ab39..fb20d225d8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/org.iets3.core.expr.statemachines.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/org.iets3.core.expr.statemachines.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -31,7 +30,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
index 971a0ef2d6..f09af9e54c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
@@ -67,7 +67,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -79,7 +79,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -88,6 +88,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" />
@@ -117,7 +118,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -439,7 +439,7 @@
                       <node concept="2OqwBi" id="6KviS2K_Jer" role="3clFbG">
                         <node concept="2OqwBi" id="6KviS2K_IT0" role="2Oq$k0">
                           <node concept="37vLTw" id="6KviS2K_IES" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6KviS2K_IBV" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817eJ" />
                           </node>
                           <node concept="2qgKlT" id="6KviS2K_J7u" role="2OqNvi">
                             <ref role="37wK5l" node="4lCUG7OsQyi" resolve="resolve" />
@@ -451,9 +451,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6KviS2K_IBV" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817eJ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6KviS2K_IBW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817eK" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -489,7 +489,7 @@
                         <node concept="3clFbF" id="pOv0_Xzl8M" role="3cqZAp">
                           <node concept="2OqwBi" id="pOv0_Xzlkc" role="3clFbG">
                             <node concept="37vLTw" id="pOv0_Xzl8L" role="2Oq$k0">
-                              <ref role="3cqZAo" node="pOv0_Xzl8E" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817eL" />
                             </node>
                             <node concept="2qgKlT" id="pOv0_XzlzC" role="2OqNvi">
                               <ref role="37wK5l" node="5wF$o0BLTj$" resolve="makeX" />
@@ -497,9 +497,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="pOv0_Xzl8E" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817eL" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="pOv0_Xzl8F" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817eM" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -906,7 +906,7 @@
                         <node concept="3clFbF" id="5wF$o0BM0z5" role="3cqZAp">
                           <node concept="2OqwBi" id="5wF$o0BM0J_" role="3clFbG">
                             <node concept="37vLTw" id="5wF$o0BM0z4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5wF$o0BM0yX" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817eN" />
                             </node>
                             <node concept="2qgKlT" id="5wF$o0BM1ay" role="2OqNvi">
                               <ref role="37wK5l" node="5wF$o0BLWcU" resolve="makeX" />
@@ -914,9 +914,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5wF$o0BM0yX" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817eN" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5wF$o0BM0yY" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817eO" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.constraints.mps
index 9d9860aece..6c9a167b41 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.constraints.mps
@@ -34,7 +34,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps
index ed1f759f1b..7ab080771a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps
@@ -41,7 +41,7 @@
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -50,7 +50,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" />
@@ -66,7 +66,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -95,7 +95,7 @@
       <concept id="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>
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.structure.mps
index ed9098b064..579d7c607d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.typesystem.mps
index 19cc5fde44..51caf9c75d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.typesystem.mps
@@ -50,7 +50,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -118,7 +118,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl
index 7d7a27f29b..c2ece6c5f7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
     <dependency reexport="false">f38b69a3-1d33-4f9b-84e0-ac1095df2998(org.iets3.core.expr.stringvalidation.runtime)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.temporal/models/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/actions.mps
index a1f56f5657..16f96c623b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/actions.mps
@@ -54,7 +54,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/behavior.mps
index 54b3f42f4f..70f2c6df60 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/behavior.mps
@@ -98,7 +98,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -108,7 +108,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" />
@@ -146,7 +146,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/constraints.mps
index 0357eece58..cc9a12934b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/constraints.mps
@@ -28,7 +28,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/editor.mps
index a27df7cd11..fa569d88a2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/editor.mps
@@ -56,7 +56,7 @@
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1219226236603" name="jetbrains.mps.lang.editor.structure.DrawBracketsStyleClassItem" flags="ln" index="3vyZuw" />
@@ -77,7 +77,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -119,7 +119,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -144,7 +144,7 @@
         <child id="6856661361479798957" name="actions" index="130p63" />
         <child id="6856661361479732085" name="cell" index="130CDr" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -186,7 +186,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/intentions.mps
index fe96d8d8f0..b534c282c8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/intentions.mps
@@ -96,7 +96,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.migration.mps
index dbf3be09ae..5079e5afaf 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/org.iets3.core.expr.temporal.migration.mps
@@ -12,7 +12,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
index 214721c87a..a0a5dc14e3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
@@ -4,13 +4,13 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="-1" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -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>
@@ -137,12 +137,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="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" />
@@ -162,7 +163,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -189,7 +190,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -574,13 +574,13 @@
                 <node concept="3clFbS" id="3nGzaxUtfSw" role="1bW5cS">
                   <node concept="3clFbF" id="3nGzaxUtfSx" role="3cqZAp">
                     <node concept="37vLTw" id="3nGzaxUtfSy" role="3clFbG">
-                      <ref role="3cqZAo" node="3nGzaxUtfSz" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817eU" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3nGzaxUtfSz" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817eU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3nGzaxUtfS$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817eV" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="3nGzaxUtfS_" role="2S7zOq">
@@ -968,13 +968,13 @@
                 <node concept="3clFbS" id="4eVSC65wKJe" role="1bW5cS">
                   <node concept="3clFbF" id="4eVSC65wKJf" role="3cqZAp">
                     <node concept="37vLTw" id="4eVSC65wKJg" role="3clFbG">
-                      <ref role="3cqZAo" node="4eVSC65wKJh" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817eW" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4eVSC65wKJh" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817eW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4eVSC65wKJi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817eX" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="4eVSC65wKJj" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/structure.mps
index 6917f28270..70db5e2fe0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/structure.mps
@@ -56,7 +56,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
index d25680955d..6ea0184739 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
@@ -51,7 +51,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -131,7 +131,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -154,7 +154,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">
@@ -176,6 +176,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -373,7 +374,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>
@@ -409,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="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" />
@@ -931,7 +931,7 @@
                       <ref role="1Pybhc" node="6belQKqkKUV" resolve="TemporalHelper" />
                       <node concept="2OqwBi" id="7Ndb$5paR9y" role="37wK5m">
                         <node concept="37vLTw" id="7Ndb$5paR9z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6W4XqNw1Umu" resolve="slice" />
+                          <ref role="3cqZAo" node="4z0AnX817eS" />
                         </node>
                         <node concept="3TrEf2" id="7Ndb$5paR9$" role="2OqNvi">
                           <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -948,7 +948,7 @@
                       </node>
                       <node concept="2OqwBi" id="6belQKqlyc4" role="1urrMF">
                         <node concept="37vLTw" id="6belQKqlxC7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6W4XqNw1Umu" resolve="slice" />
+                          <ref role="3cqZAo" node="4z0AnX817eS" />
                         </node>
                         <node concept="3TrEf2" id="6belQKqlz5j" role="2OqNvi">
                           <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -972,7 +972,7 @@
                             </node>
                             <node concept="2OqwBi" id="6belQKqo2Ua" role="1urrMF">
                               <node concept="37vLTw" id="6W4XqNw255u" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6W4XqNw1Umu" resolve="slice" />
+                                <ref role="3cqZAo" node="4z0AnX817eS" />
                               </node>
                               <node concept="3TrEf2" id="6belQKqo3TC" role="2OqNvi">
                                 <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -1026,7 +1026,7 @@
                                     <node concept="3cpWs6" id="JblrdgIKOg" role="3cqZAp">
                                       <node concept="2OqwBi" id="JblrdgIKOi" role="3cqZAk">
                                         <node concept="37vLTw" id="JblrdgIKOj" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1MJboh4O57C" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817eQ" />
                                         </node>
                                         <node concept="2qgKlT" id="JblrdgIKOk" role="2OqNvi">
                                           <ref role="37wK5l" to="pbu6:7GwCuf2r4g6" resolve="isSameAs" />
@@ -1039,9 +1039,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1MJboh4O57C" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817eQ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1MJboh4O57D" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817eR" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1067,9 +1067,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6W4XqNw1Umu" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817eS" role="1bW2Oz">
                 <property role="TrG5h" value="slice" />
-                <node concept="2jxLKc" id="6W4XqNw1Umv" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817eT" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl
index a8a7ec880e..90c779b76b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -36,7 +35,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -64,7 +63,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/behavior.mps
index a90a17a924..a609d80bde 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/behavior.mps
@@ -59,7 +59,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/plugin.mps
index cba3362651..7dacfdd470 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/structure.mps
index 2d5aae0bff..e3bbcda10f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/models/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/org.iets3.core.expr.testExecution.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/org.iets3.core.expr.testExecution.mpl
index f3d1151884..6eaefb8e44 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/org.iets3.core.expr.testExecution.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.testExecution/org.iets3.core.expr.testExecution.mpl
@@ -11,13 +11,12 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1:com.mbeddr.mpsutil.spreferences" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -36,7 +35,7 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
index 1741770788..d1cb5cff80 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
@@ -29,7 +29,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -99,7 +99,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -141,7 +141,7 @@
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -224,7 +224,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.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
index f8addc7a6d..a5b0fc0c33 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
@@ -8,7 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences" version="-1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" 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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -120,7 +120,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_" />
@@ -189,7 +189,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -259,7 +259,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -287,7 +287,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -317,6 +317,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" />
@@ -458,7 +459,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">
@@ -502,7 +503,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -556,7 +556,7 @@
                       <node concept="2OqwBi" id="5Pgo_AS5DlS" role="3clFbG">
                         <node concept="2OqwBi" id="5Pgo_AS5CzJ" role="2Oq$k0">
                           <node concept="37vLTw" id="5Pgo_AS5CzK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="ub9nkyNC_W" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817eY" />
                           </node>
                           <node concept="2yIwOk" id="5Pgo_AS5CzL" role="2OqNvi" />
                         </node>
@@ -568,9 +568,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="ub9nkyNC_W" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817eY" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="ub9nkyNC_X" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817eZ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -614,7 +614,7 @@
                       <node concept="2OqwBi" id="5Pgo_AS5FdJ" role="3clFbG">
                         <node concept="2OqwBi" id="5Pgo_AS5CMH" role="2Oq$k0">
                           <node concept="37vLTw" id="5Pgo_AS5CMI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="ub9nkyNCIc" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817f0" />
                           </node>
                           <node concept="2yIwOk" id="5Pgo_AS5CMJ" role="2OqNvi" />
                         </node>
@@ -626,9 +626,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="ub9nkyNCIc" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817f0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="ub9nkyNCId" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817f1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1798,7 +1798,7 @@
                   <node concept="3clFbF" id="4ssrwy9SEuU" role="3cqZAp">
                     <node concept="2OqwBi" id="4ssrwy9SEuV" role="3clFbG">
                       <node concept="37vLTw" id="4ssrwy9SEuW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4ssrwy9SEuY" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817f2" />
                       </node>
                       <node concept="2qgKlT" id="59WscmUTnLB" role="2OqNvi">
                         <ref role="37wK5l" node="59WscmUTju7" resolve="nonEmptyItems" />
@@ -1806,9 +1806,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4ssrwy9SEuY" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817f2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4ssrwy9SEuZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817f3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1840,7 +1840,7 @@
                   <node concept="3clFbF" id="ub9nkyQ5tv" role="3cqZAp">
                     <node concept="2OqwBi" id="ub9nkyQ5xj" role="3clFbG">
                       <node concept="37vLTw" id="ub9nkyQ5tt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="ub9nkyPfGv" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817f4" />
                       </node>
                       <node concept="2qgKlT" id="ub9nkyQaN8" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumrTm" resolve="runManually" />
@@ -1849,9 +1849,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="ub9nkyPfGv" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817f4" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="ub9nkyPfGw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817f5" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2114,15 +2114,15 @@
                         <ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
                         <ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
                         <node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
-                          <ref role="3cqZAo" node="230lIJTFuY" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817f6" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="230lIJTFuY" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817f6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="230lIJTFuZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817f7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3135,7 +3135,7 @@
                     <node concept="3fqX7Q" id="4_qY3E4DnMj" role="3clFbG">
                       <node concept="2OqwBi" id="4_qY3E4Do9D" role="3fr31v">
                         <node concept="37vLTw" id="4_qY3E4DnVy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4_qY3E4DnFo" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817f8" />
                         </node>
                         <node concept="1mIQ4w" id="4_qY3E4DoN5" role="2OqNvi">
                           <node concept="chp4Y" id="4_qY3E4DoZe" role="cj9EA">
@@ -3146,9 +3146,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4_qY3E4DnFo" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817f8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4_qY3E4DnFp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817f9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4913,7 +4913,7 @@
                         <node concept="2OqwBi" id="6UrZmTWpfp4" role="3clFbG">
                           <node concept="2OqwBi" id="6UrZmTWpdBF" role="2Oq$k0">
                             <node concept="37vLTw" id="6UrZmTWpdBG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="78hTg1_ehn4" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fa" />
                             </node>
                             <node concept="2yIwOk" id="6UrZmTWpdBH" role="2OqNvi" />
                           </node>
@@ -4923,9 +4923,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="78hTg1_ehn4" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fa" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="78hTg1_ehn5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5196,7 +5196,7 @@
                           <node concept="3fqX7Q" id="18$bUx5DE1n" role="3K4E3e">
                             <node concept="2OqwBi" id="18$bUx5DE1p" role="3fr31v">
                               <node concept="37vLTw" id="18$bUx5DE1q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="18$bUx5DC3d" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fc" />
                               </node>
                               <node concept="liA8E" id="18$bUx5DE1r" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:6SpoPQg9EIA" resolve="isComplete" />
@@ -5215,9 +5215,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="18$bUx5DC3d" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="18$bUx5DC3e" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5254,7 +5254,7 @@
                           <node concept="2OqwBi" id="18$bUx5_ErM" role="1m5AlR">
                             <node concept="2OqwBi" id="18$bUx5_ErN" role="2Oq$k0">
                               <node concept="37vLTw" id="18$bUx5_J3X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="18$bUx5_EmA" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fe" />
                               </node>
                               <node concept="liA8E" id="18$bUx5_ErP" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:3_DFadMHbO3" resolve="concept" />
@@ -5282,7 +5282,7 @@
                         </node>
                         <node concept="2OqwBi" id="18$bUx5_ErW" role="37vLTx">
                           <node concept="37vLTw" id="18$bUx5_Jq2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="18$bUx5_EmA" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fe" />
                           </node>
                           <node concept="liA8E" id="18$bUx5_ErY" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:3_DFadMPhUx" resolve="status" />
@@ -5296,9 +5296,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="18$bUx5_EmA" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fe" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="18$bUx5_EmB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817ff" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5970,7 +5970,7 @@
                             <node concept="3fqX7Q" id="77QyhEfRbDt" role="3uHU7w">
                               <node concept="2OqwBi" id="77QyhEfRbDv" role="3fr31v">
                                 <node concept="37vLTw" id="77QyhEfRbDw" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4e_7uAswtI0" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fg" />
                                 </node>
                                 <node concept="1mIQ4w" id="77QyhEfRbDx" role="2OqNvi">
                                   <node concept="chp4Y" id="77QyhEfRbDy" role="cj9EA">
@@ -5982,7 +5982,7 @@
                             <node concept="3clFbC" id="4e_7uAswuMb" role="3uHU7B">
                               <node concept="2OqwBi" id="4e_7uAswu5i" role="3uHU7B">
                                 <node concept="37vLTw" id="4e_7uAswtSB" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4e_7uAswtI0" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fg" />
                                 </node>
                                 <node concept="1mfA1w" id="4e_7uAswurt" role="2OqNvi" />
                               </node>
@@ -5991,9 +5991,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4e_7uAswtI0" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817fg" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4e_7uAswtI1" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817fh" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6203,7 +6203,7 @@
                                 <node concept="2OqwBi" id="1yEri41iIyS" role="1m5AlR">
                                   <node concept="2OqwBi" id="1yEri41iIyT" role="2Oq$k0">
                                     <node concept="37vLTw" id="1yEri41iIyU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="CrzyxmC2fv" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817fi" />
                                     </node>
                                     <node concept="liA8E" id="1yEri41iIyV" role="2OqNvi">
                                       <ref role="37wK5l" to="mhbf:~SReference.getLink()" resolve="getLink" />
@@ -6278,9 +6278,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="CrzyxmC2fv" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fi" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="CrzyxmC2fw" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6328,7 +6328,7 @@
                                 <node concept="liA8E" id="5s_Nuat2wec" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
                                   <node concept="37vLTw" id="5s_Nuat2wnz" role="37wK5m">
-                                    <ref role="3cqZAo" node="5s_NuasXDtV" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817fk" />
                                   </node>
                                 </node>
                               </node>
@@ -6342,7 +6342,7 @@
                               </node>
                               <node concept="2OqwBi" id="5s_Nuat4_NR" role="33vP2m">
                                 <node concept="37vLTw" id="5s_Nuat4_NS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5s_NuasXDtV" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fk" />
                                 </node>
                                 <node concept="liA8E" id="5s_Nuat4_NT" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
@@ -6364,7 +6364,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="5s_NuasXDYU" role="1m5AlR">
                                       <node concept="37vLTw" id="5s_NuasXDGe" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5s_NuasXDtV" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817fk" />
                                       </node>
                                       <node concept="liA8E" id="5s_NuasXEev" role="2OqNvi">
                                         <ref role="37wK5l" to="c17a:~SProperty.getDeclarationNode()" resolve="getDeclarationNode" />
@@ -6424,9 +6424,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5s_NuasXDtV" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fk" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5s_NuasXDtW" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fl" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6466,7 +6466,7 @@
                           <node concept="3fqX7Q" id="4XlPKepcfR3" role="3K4E3e">
                             <node concept="2OqwBi" id="4XlPKepcfR4" role="3fr31v">
                               <node concept="37vLTw" id="4XlPKepcfR5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4XlPKepcfRb" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fm" />
                               </node>
                               <node concept="liA8E" id="4XlPKepcfR6" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:4XlPKepacYB" resolve="isComplete" />
@@ -6485,9 +6485,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4XlPKepcfRb" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4XlPKepcfRc" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -6515,7 +6515,7 @@
                         <node concept="2OqwBi" id="4XlPKepcfRs" role="37vLTx">
                           <node concept="2OqwBi" id="4XlPKepcfRt" role="2Oq$k0">
                             <node concept="37vLTw" id="4XlPKepcfRu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fo" />
                             </node>
                             <node concept="liA8E" id="4XlPKepcfRv" role="2OqNvi">
                               <ref role="37wK5l" to="pbu6:4XlPKepacYa" resolve="concept" />
@@ -6545,7 +6545,7 @@
                         </node>
                         <node concept="2OqwBi" id="4XlPKepcfRA" role="37vLTx">
                           <node concept="37vLTw" id="4XlPKepcfRB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" />
                           </node>
                           <node concept="liA8E" id="4XlPKepcfRC" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4XlPKepacZ6" resolve="status" />
@@ -6557,7 +6557,7 @@
                       <node concept="37vLTI" id="3MHhZL0uvZ0" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uwjd" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uw6w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uBU2" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:3MHhZL0uyid" resolve="testCount" />
@@ -6577,7 +6577,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCcu" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCcv" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCcw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCcx" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9KlDr8" resolve="testVolume" />
@@ -6597,7 +6597,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCdh" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCdi" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCdj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCdk" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9Kl7HS" resolve="minimumHeterogeneity" />
@@ -6617,7 +6617,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCec" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCed" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCee" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4XlPKepcfRF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCef" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9KluoX" resolve="maximumHeterogeneity" />
@@ -6639,9 +6639,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4XlPKepcfRF" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fo" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4XlPKepcfRG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6792,7 +6792,7 @@
                               </node>
                               <node concept="2OqwBi" id="5DEy7AGcxWM" role="1m5AlR">
                                 <node concept="37vLTw" id="5DEy7AGcxWN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5DEy7AGcxWS" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fq" />
                                 </node>
                                 <node concept="3TrEf2" id="5DEy7AGcxWO" role="2OqNvi">
                                   <ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
@@ -6813,9 +6813,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5DEy7AGcxWS" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5DEy7AGcxWT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fr" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7589,7 +7589,7 @@
                           <node concept="2OqwBi" id="1vo80p3dJp" role="25KhWn">
                             <node concept="2OqwBi" id="1vo80p3dJq" role="2Oq$k0">
                               <node concept="37vLTw" id="1vo80p3dJr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1vo80p3dJu" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fs" />
                               </node>
                               <node concept="3TrEf2" id="1vo80p3dJs" role="2OqNvi">
                                 <ref role="3Tt5mk" to="av4b:1vo80oMkMR" resolve="concept" />
@@ -7602,9 +7602,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1vo80p3dJu" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817fs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1vo80p3dJv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ft" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7767,7 +7767,7 @@
                           <node concept="3fqX7Q" id="1vo80p9of_" role="3uHU7w">
                             <node concept="2OqwBi" id="1vo80p9ofB" role="3fr31v">
                               <node concept="37vLTw" id="1vo80p9ofC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1vo80oOIsf" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fu" />
                               </node>
                               <node concept="1mIQ4w" id="1vo80p9ofD" role="2OqNvi">
                                 <node concept="chp4Y" id="1vo80p9ofE" role="cj9EA">
@@ -7780,7 +7780,7 @@
                             <ref role="37wK5l" node="1vo80oO$S9" resolve="shouldAnalyze" />
                             <node concept="2OqwBi" id="1vo80oOJkF" role="37wK5m">
                               <node concept="37vLTw" id="1vo80oOJ5u" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1vo80oOIsf" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fu" />
                               </node>
                               <node concept="2yIwOk" id="1vo80oOJQv" role="2OqNvi" />
                             </node>
@@ -7788,9 +7788,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1vo80oOIsf" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1vo80oOIsg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7824,7 +7824,7 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="5IKJrJIe5TX" role="37vLTx">
-                          <ref role="3cqZAo" node="5IKJrJIe5DG" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817fw" />
                         </node>
                       </node>
                     </node>
@@ -7848,7 +7848,7 @@
                                 <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                                 <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                 <node concept="37vLTw" id="7fsCTt5VPFn" role="37wK5m">
-                                  <ref role="3cqZAo" node="5IKJrJIe5DG" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" />
                                 </node>
                               </node>
                             </node>
@@ -7863,7 +7863,7 @@
                               <ref role="37wK5l" node="1vo80p38XS" resolve="getSpecFor" />
                               <node concept="2OqwBi" id="1vo80p3kzV" role="37wK5m">
                                 <node concept="37vLTw" id="1vo80p3kjJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5IKJrJIe5DG" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" />
                                 </node>
                                 <node concept="2yIwOk" id="1vo80p3l3c" role="2OqNvi" />
                               </node>
@@ -7880,7 +7880,7 @@
                               <ref role="37wK5l" node="1vo80p38XS" resolve="getSpecFor" />
                               <node concept="2OqwBi" id="1vo80p3hHs" role="37wK5m">
                                 <node concept="37vLTw" id="1vo80p3htS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5IKJrJIe5DG" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" />
                                 </node>
                                 <node concept="2yIwOk" id="1vo80p3ic1" role="2OqNvi" />
                               </node>
@@ -7903,7 +7903,7 @@
                                   <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                                   <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                   <node concept="37vLTw" id="1vo80p3ozG" role="37wK5m">
-                                    <ref role="3cqZAo" node="5IKJrJIe5DG" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817fw" />
                                   </node>
                                 </node>
                               </node>
@@ -7969,9 +7969,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5IKJrJIe5DG" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5IKJrJIe5DH" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8093,7 +8093,7 @@
                     <node concept="3clFbF" id="7fsCTt5WvCU" role="3cqZAp">
                       <node concept="2OqwBi" id="7fsCTt5WvCV" role="3clFbG">
                         <node concept="37vLTw" id="7fsCTt5WvCW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7fsCTt5WvCY" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817fy" />
                         </node>
                         <node concept="2qgKlT" id="7fsCTt5WvCX" role="2OqNvi">
                           <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -8101,9 +8101,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7fsCTt5WvCY" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7fsCTt5WvCZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8130,7 +8130,7 @@
                           <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="7fsCTt5Wygj" role="37wK5m">
-                            <ref role="3cqZAo" node="7fsCTt5WxnM" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817f$" />
                           </node>
                         </node>
                       </node>
@@ -8157,9 +8157,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7fsCTt5WxnM" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817f$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7fsCTt5WxnN" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817f_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8265,7 +8265,7 @@
                           </node>
                           <node concept="2OqwBi" id="1gw9pCYp0tr" role="1m5AlR">
                             <node concept="37vLTw" id="1gw9pCYoAwb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1gw9pCYoAp7" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fA" />
                             </node>
                             <node concept="3TrEf2" id="1gw9pCYp0KQ" role="2OqNvi">
                               <ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
@@ -8279,9 +8279,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1gw9pCYoAp7" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817fA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1gw9pCYoAp8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817fB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8736,16 +8736,16 @@
                           </node>
                           <node concept="2OqwBi" id="4e_7uAt7r4n" role="3uHU7B">
                             <node concept="37vLTw" id="4e_7uAt7r4o" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4e_7uAt7r4q" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fC" />
                             </node>
                             <node concept="2yIwOk" id="4e_7uAt7r4p" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4e_7uAt7r4q" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4e_7uAt7r4r" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -9877,7 +9877,7 @@
                             <node concept="2OqwBi" id="5AG05XYAQ8N" role="3clFbG">
                               <node concept="2OqwBi" id="5AG05XYAMMt" role="2Oq$k0">
                                 <node concept="37vLTw" id="5AG05XYALhK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5AG05XYAJ7V" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fE" />
                                 </node>
                                 <node concept="3TrEf2" id="5AG05XYAP0s" role="2OqNvi">
                                   <ref role="3Tt5mk" to="av4b:1bwJEEf2HGQ" resolve="value" />
@@ -9887,9 +9887,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5AG05XYAJ7V" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5AG05XYAJ7W" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11340,7 +11340,7 @@
                       <node concept="2OqwBi" id="3_xsRJ4LLL1" role="3clFbG">
                         <node concept="2OqwBi" id="3_xsRJ4LL7e" role="2Oq$k0">
                           <node concept="37vLTw" id="3_xsRJ4LKTE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3_xsRJ4LKTu" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fG" />
                           </node>
                           <node concept="3TrcHB" id="3_xsRJ4LLhk" role="2OqNvi">
                             <ref role="3TsBF5" to="av4b:3_xsRJ4sa6R" resolve="internalUniqueID" />
@@ -11355,9 +11355,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3_xsRJ4LKTu" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3_xsRJ4LKTv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11580,15 +11580,15 @@
                               <node concept="liA8E" id="7WSgHRL9pxD" role="2OqNvi">
                                 <ref role="37wK5l" to="oq0c:7WSgHRKY1NI" resolve="appliesTo" />
                                 <node concept="37vLTw" id="7WSgHRL9pxE" role="37wK5m">
-                                  <ref role="3cqZAo" node="7WSgHRL9pxF" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817fI" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7WSgHRL9pxF" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7WSgHRL9pxG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -11859,7 +11859,7 @@
                       <node concept="2OqwBi" id="1qjbRymX3fq" role="37wK5m">
                         <node concept="2OqwBi" id="1qjbRymX2Ld" role="2Oq$k0">
                           <node concept="37vLTw" id="1qjbRymX2C7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1qjbRymX2yF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fK" />
                           </node>
                           <node concept="3TrEf2" id="1qjbRymX2W3" role="2OqNvi">
                             <ref role="3Tt5mk" to="av4b:1qjbRymSXmZ" resolve="newNode" />
@@ -11875,15 +11875,15 @@
                   <node concept="3clFbF" id="1qjbRymXP7x" role="3cqZAp">
                     <node concept="2OqwBi" id="1qjbRymXPgN" role="3clFbG">
                       <node concept="37vLTw" id="1qjbRymXP7v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1qjbRymX2yF" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817fK" />
                       </node>
                       <node concept="3YRAZt" id="1qjbRymXPAc" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1qjbRymX2yF" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817fK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1qjbRymX2yG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817fL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -12644,16 +12644,16 @@
                         </node>
                         <node concept="2OqwBi" id="7aipPVpHkcG" role="3uHU7B">
                           <node concept="37vLTw" id="7aipPVpHkcH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7aipPVpHkcJ" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fM" />
                           </node>
                           <node concept="2yIwOk" id="7aipPVpHkcI" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7aipPVpHkcJ" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7aipPVpHkcK" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -13332,7 +13332,7 @@
                         <node concept="2OqwBi" id="5Pgo_AS5orO" role="3fr31v">
                           <node concept="2OqwBi" id="5Pgo_AS5orP" role="2Oq$k0">
                             <node concept="37vLTw" id="5Pgo_AS5orQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5Pgo_AS5lRi" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fO" />
                             </node>
                             <node concept="2yIwOk" id="5Pgo_AS5orR" role="2OqNvi" />
                           </node>
@@ -13343,9 +13343,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5Pgo_AS5lRi" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817fO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5Pgo_AS5lRj" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817fP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
index ec9c923b5e..bc395f4f40 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
@@ -60,7 +60,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>
@@ -86,6 +86,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" />
@@ -126,7 +127,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -180,7 +180,7 @@
                           <node concept="10Nm6u" id="1F1F0IUZAJD" role="3uHU7w" />
                           <node concept="2OqwBi" id="1F1F0IUZAJE" role="3uHU7B">
                             <node concept="37vLTw" id="1F1F0IUZAJF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1F1F0IUZAJH" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817fQ" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZAJG" role="2OqNvi">
                               <ref role="3Tt5mk" to="4kwy:cJpacq40jC" resolve="optionalName" />
@@ -189,9 +189,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZAJH" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZAJI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -439,14 +439,14 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="GEat54MAOd" role="1LFl5Q">
-                            <ref role="3cqZAo" node="GEat54MAxZ" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817fS" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="GEat54MAxZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817fS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="GEat54MAy0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817fT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
index c2dc81b18d..500b3a785e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
@@ -128,7 +128,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -157,7 +157,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="1165420413719" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Group" flags="ng" index="1ou48o">
@@ -190,7 +190,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">
@@ -335,7 +335,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -358,7 +358,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -386,6 +386,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -398,7 +399,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G" />
@@ -484,7 +485,7 @@
       <concept id="4032373061957735279" name="de.slisson.mps.tables.structure.HeaderQuery_InsertNew" flags="ig" index="10boU0" />
       <concept id="1118639624532961312" name="de.slisson.mps.tables.structure.CanCreate_Rows" flags="ng" index="34s9NJ" />
       <concept id="4032373061970539014" name="de.slisson.mps.tables.structure.QueryParameter_EditorContext" flags="ng" index="1frAZD" />
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -569,7 +570,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">
@@ -612,7 +613,6 @@
       <concept id="1227022196108" name="jetbrains.mps.baseLanguage.collections.structure.RemoveAtElementOperation" flags="nn" index="2KedMh">
         <child id="1227022274197" name="index" index="2KewY8" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -3260,7 +3260,7 @@
                           <node concept="3clFbF" id="1vJWYav6Cka" role="3cqZAp">
                             <node concept="2OqwBi" id="1vJWYav6Ckb" role="3clFbG">
                               <node concept="37vLTw" id="1vJWYav6Ckc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1vJWYav6Cke" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fU" />
                               </node>
                               <node concept="3TrcHB" id="1vJWYav6Ckd" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3268,9 +3268,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1vJWYav6Cke" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1vJWYav6Ckf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3301,14 +3301,14 @@
                                 <property role="3cmrfH" value="1" />
                               </node>
                               <node concept="37vLTw" id="1vJWYav6GbL" role="1LFl5Q">
-                                <ref role="3cqZAo" node="1vJWYav6GbM" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817fW" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1vJWYav6GbM" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817fW" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1vJWYav6GbN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817fX" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3666,7 +3666,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="1bwJEEf3A$J" role="3uHU7B">
                                             <node concept="37vLTw" id="1bwJEEf3Al7" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1bwJEEf3A04" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817fY" />
                                             </node>
                                             <node concept="3TrEf2" id="1bwJEEf3AZv" role="2OqNvi">
                                               <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -3675,9 +3675,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="1bwJEEf3A04" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817fY" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="1bwJEEf3A05" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817fZ" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3842,7 +3842,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="1bwJEEgpA8z" role="3uHU7B">
                                               <node concept="37vLTw" id="1bwJEEgpA8$" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="1bwJEEgpA8A" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817g0" />
                                               </node>
                                               <node concept="3TrEf2" id="1bwJEEgpBAR" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="av4b:1bwJEEgpfj2" resolve="out" />
@@ -3851,9 +3851,9 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="1bwJEEgpA8A" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX817g0" role="1bW2Oz">
                                         <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="1bwJEEgpA8B" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX817g1" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -4297,16 +4297,16 @@
                               </node>
                               <node concept="2OqwBi" id="1bwJEEfccT0" role="3uHU7B">
                                 <node concept="37vLTw" id="1bwJEEfccAQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1bwJEEfccAc" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817g2" />
                                 </node>
                                 <node concept="2bSWHS" id="1bwJEEfcd7N" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1bwJEEfccAc" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817g2" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1bwJEEfccAd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817g3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -4329,7 +4329,7 @@
                             <node concept="1frAZD" id="1bwJEEfN604" role="2Oq$k0" />
                             <node concept="2CJim2" id="1bwJEEfN6Fl" role="2OqNvi">
                               <node concept="37vLTw" id="1bwJEEfN7Pm" role="2CJshu">
-                                <ref role="3cqZAo" node="1bwJEEfLoqk" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817g4" />
                               </node>
                               <node concept="2CJsh3" id="1bwJEEfN6Fn" role="2CJshi">
                                 <node concept="3EZMnI" id="1bwJEEfN85K" role="2wV5jI">
@@ -4371,9 +4371,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1bwJEEfLoqk" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817g4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1bwJEEfLoql" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817g5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5592,7 +5592,7 @@
                                 <node concept="3clFbF" id="5Pgo_ASgPsn" role="3cqZAp">
                                   <node concept="2OqwBi" id="5Pgo_ASgPso" role="3clFbG">
                                     <node concept="37vLTw" id="5Pgo_ASgPsp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5Pgo_ASgPsr" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817g6" />
                                     </node>
                                     <node concept="liA8E" id="5Pgo_ASgPsq" role="2OqNvi">
                                       <ref role="37wK5l" to="2ahs:4fb2DFB6IMb" resolve="getTargetNode" />
@@ -5600,9 +5600,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5Pgo_ASgPsr" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817g6" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5Pgo_ASgPss" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817g7" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -6612,15 +6612,15 @@
                                 <node concept="3clFbF" id="1gw9pCYi7z0" role="3cqZAp">
                                   <node concept="2OqwBi" id="1gw9pCYi7z1" role="3clFbG">
                                     <node concept="37vLTw" id="1gw9pCYi7z2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1gw9pCYi7z4" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817g8" />
                                     </node>
                                     <node concept="I4A8Y" id="1gw9pCYi7z3" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1gw9pCYi7z4" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817g8" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1gw9pCYi7z5" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817g9" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -6633,15 +6633,15 @@
                             <node concept="3clFbF" id="1gw9pCYi7za" role="3cqZAp">
                               <node concept="2OqwBi" id="1gw9pCYi7zd" role="3clFbG">
                                 <node concept="37vLTw" id="1gw9pCYi7ze" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1gw9pCYi7zg" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ga" />
                                 </node>
                                 <node concept="LkI2h" id="1gw9pCYi7zf" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="1gw9pCYi7zg" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817ga" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="1gw9pCYi7zh" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817gb" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -6656,7 +6656,7 @@
                                   <ref role="3cqZAo" node="1gw9pCYiuTs" resolve="s" />
                                 </node>
                                 <node concept="37vLTw" id="1gw9pCYiy9s" role="3uHU7w">
-                                  <ref role="3cqZAo" node="1gw9pCYiuTu" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gc" />
                                 </node>
                               </node>
                               <node concept="Xl_RD" id="1gw9pCYkvFU" role="3uHU7w">
@@ -6669,9 +6669,9 @@
                           <property role="TrG5h" value="s" />
                           <node concept="17QB3L" id="1gw9pCYivWQ" role="1tU5fm" />
                         </node>
-                        <node concept="Rh6nW" id="1gw9pCYiuTu" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gc" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1gw9pCYiuTv" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gd" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="Xl_RD" id="1gw9pCYivmb" role="1MDeny">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
index 931ec091ca..d9db75e66d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
@@ -48,11 +48,12 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -91,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="2PqlIr" id="18$bUx5q5RM">
@@ -215,13 +215,13 @@
                     <node concept="3clFbS" id="18$bUx5qi2X" role="1bW5cS">
                       <node concept="1O1abz" id="18$bUx5q6uv" role="3cqZAp">
                         <node concept="37vLTw" id="18$bUx5qizy" role="1O1k6O">
-                          <ref role="3cqZAo" node="18$bUx5qi2Y" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ge" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="18$bUx5qi2Y" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ge" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="18$bUx5qi2Z" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817gf" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
index 3bdc8b4e37..a8472e8c9e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
@@ -22,7 +22,7 @@
     <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="grbm" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.text(org.apache.commons/)" />
-    <import index="gyfg" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.base(de.q60.mps.libs/)" />
+    <import index="gyfg" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.base(de.q60.mps.collections.libs/)" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
     <import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" implicit="true" />
   </imports>
@@ -134,7 +134,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -150,7 +150,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -165,6 +165,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -268,7 +269,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>
@@ -292,7 +293,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -455,7 +455,7 @@
                   <node concept="3clFbF" id="ub9nkyQ51e" role="3cqZAp">
                     <node concept="2OqwBi" id="ub9nkyPnC$" role="3clFbG">
                       <node concept="37vLTw" id="ub9nkyPnC_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="ub9nkyPfpk" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817gg" />
                       </node>
                       <node concept="2qgKlT" id="ub9nkyQb6k" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumrTm" resolve="runManually" />
@@ -464,9 +464,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="ub9nkyPfpk" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817gg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="ub9nkyPfpl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817gh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -883,7 +883,7 @@
                       <node concept="2OqwBi" id="1bwJEEfPJii" role="3clFbG">
                         <node concept="2OqwBi" id="1bwJEEfPIRh" role="2Oq$k0">
                           <node concept="37vLTw" id="1bwJEEfPIFJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1bwJEEfPIF_" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817gi" />
                           </node>
                           <node concept="3TrEf2" id="1bwJEEfPJ10" role="2OqNvi">
                             <ref role="3Tt5mk" to="av4b:1bwJEEfL7oM" resolve="outcome" />
@@ -897,9 +897,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1bwJEEfPIF_" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817gi" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1bwJEEfPIFA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817gj" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -910,15 +910,15 @@
                   <node concept="3clFbF" id="1bwJEEfPKHV" role="3cqZAp">
                     <node concept="2OqwBi" id="1bwJEEfPKVl" role="3clFbG">
                       <node concept="37vLTw" id="1bwJEEfPKHU" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1bwJEEfPKxa" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817gk" />
                       </node>
                       <node concept="3YRAZt" id="1bwJEEfPLjc" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1bwJEEfPKxa" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817gk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1bwJEEfPKxb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817gl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -981,7 +981,7 @@
                               <node concept="2OqwBi" id="1bwJEEgu7lf" role="3uHU7B">
                                 <node concept="2OqwBi" id="1bwJEEgu6$P" role="2Oq$k0">
                                   <node concept="37vLTw" id="1bwJEEgu6ot" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1bwJEEgt$EE" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817gm" />
                                   </node>
                                   <node concept="3TrEf2" id="1bwJEEgu6XJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -994,7 +994,7 @@
                               <node concept="2OqwBi" id="1bwJEEgt_Qn" role="3uHU7B">
                                 <node concept="2OqwBi" id="1bwJEEgt$TR" role="2Oq$k0">
                                   <node concept="37vLTw" id="1bwJEEgt$Io" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1bwJEEgt$EE" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817gm" />
                                   </node>
                                   <node concept="3TrEf2" id="1bwJEEgt_3x" role="2OqNvi">
                                     <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -1006,7 +1006,7 @@
                                 <node concept="2OqwBi" id="1bwJEEgtSo2" role="3uHU7B">
                                   <node concept="2OqwBi" id="1bwJEEgtRI$" role="2Oq$k0">
                                     <node concept="37vLTw" id="1bwJEEgtRsA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1bwJEEgt$EE" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817gm" />
                                     </node>
                                     <node concept="3TrEf2" id="1bwJEEgtS73" role="2OqNvi">
                                       <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -1020,9 +1020,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1bwJEEgt$EE" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817gm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1bwJEEgt$EF" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817gn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1033,15 +1033,15 @@
                       <node concept="3clFbF" id="1bwJEEgtANN" role="3cqZAp">
                         <node concept="2OqwBi" id="1bwJEEgtAXT" role="3clFbG">
                           <node concept="37vLTw" id="1bwJEEgtANM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1bwJEEgtALQ" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817go" />
                           </node>
                           <node concept="3YRAZt" id="1bwJEEgtBcn" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1bwJEEgtALQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817go" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1bwJEEgtALR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817gp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1065,15 +1065,15 @@
                           <node concept="3clFbF" id="1bwJEEgtBlZ" role="3cqZAp">
                             <node concept="2OqwBi" id="1bwJEEgtBm0" role="3clFbG">
                               <node concept="37vLTw" id="1bwJEEgtBm1" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1bwJEEgtBm3" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817gq" />
                               </node>
                               <node concept="3YRAZt" id="1bwJEEgtBm2" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1bwJEEgtBm3" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1bwJEEgtBm4" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gr" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
index 694cd13a7c..a5234c3822 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
@@ -75,7 +75,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -84,12 +84,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -165,7 +166,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>
@@ -193,7 +194,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -293,7 +293,7 @@
                           <node concept="3clFbF" id="7Z_pmaBujxa" role="3cqZAp">
                             <node concept="2OqwBi" id="7Z_pmaBujxb" role="3clFbG">
                               <node concept="37vLTw" id="7Z_pmaBujxc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7Z_pmaBujxe" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817gs" />
                               </node>
                               <node concept="3TrEf2" id="7Z_pmaBujxd" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tp5g:hHqenIi" resolve="nodeToCheck" />
@@ -301,9 +301,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7Z_pmaBujxe" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gs" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7Z_pmaBujxf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gt" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -482,15 +482,15 @@
                                 <node concept="3clFbF" id="7Z_pmaBAncn" role="3cqZAp">
                                   <node concept="2OqwBi" id="7Z_pmaBAno1" role="3clFbG">
                                     <node concept="37vLTw" id="7Z_pmaBAncm" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7Z_pmaBAn69" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817gu" />
                                     </node>
                                     <node concept="3YRAZt" id="7Z_pmaBAnXx" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7Z_pmaBAn69" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817gu" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7Z_pmaBAn6a" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817gv" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/plugin.mps
index 87685aa30e..fe5348f60e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:1f2c1459-9e84-4a21-8c09-b46a4f624a10(org.iets3.core.expr.tests.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
     <use id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions" version="-1" />
@@ -35,7 +35,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -136,7 +136,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -158,7 +158,7 @@
         <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" />
@@ -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.iets3.opensource/languages/org.iets3.core.expr.tests/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/structure.mps
index 2d37786e77..13f9682a34 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/structure.mps
@@ -96,7 +96,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps
index 56ae37ad90..b383e70a68 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/typesystem.mps
@@ -84,7 +84,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -214,7 +214,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
index 7984b23965..e371d4bd4b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
@@ -37,7 +37,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" />
@@ -125,7 +125,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -171,7 +170,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -200,7 +199,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
index 087fd01ff5..053d1605e9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/intentions.mps
@@ -103,7 +103,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -216,7 +216,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.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
index 3080d2c9fe..38aaf9dfcc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
@@ -5,7 +5,7 @@
     <use id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -35,11 +35,12 @@
       <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>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -62,7 +63,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -82,7 +83,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="jA7cl" id="4ptnK4jesjN">
@@ -112,15 +112,15 @@
                   <node concept="3clFbF" id="4ptnK4jewHw" role="3cqZAp">
                     <node concept="2OqwBi" id="4ptnK4jewRL" role="3clFbG">
                       <node concept="37vLTw" id="4ptnK4jewHv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4ptnK4jewHo" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817i8" />
                       </node>
                       <node concept="3YRAZt" id="4ptnK4jex3Q" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4ptnK4jewHo" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817i8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4ptnK4jewHp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817i9" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/actions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/actions.mps
index ffaf5202f1..3f7a7eb7b7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/actions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/actions.mps
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
index 53a97e144b..2a20179761 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
@@ -7,7 +7,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -75,7 +75,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -155,7 +155,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -168,7 +168,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -197,6 +197,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -331,7 +332,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>
@@ -387,7 +388,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -751,7 +751,7 @@
                             <node concept="3clFbF" id="5fy$GmV4lLS" role="3cqZAp">
                               <node concept="2OqwBi" id="5fy$GmV4lLT" role="3clFbG">
                                 <node concept="37vLTw" id="5fy$GmV4lLU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5fy$GmV4lLX" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gw" />
                                 </node>
                                 <node concept="1mIQ4w" id="5fy$GmV4lLV" role="2OqNvi">
                                   <node concept="chp4Y" id="5fy$GmV4lLW" role="cj9EA">
@@ -761,9 +761,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5fy$GmV4lLX" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817gw" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5fy$GmV4lLY" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817gx" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -775,7 +775,7 @@
                             <node concept="2OqwBi" id="5fy$GmV50ax" role="3clFbG">
                               <node concept="2OqwBi" id="5fy$GmV4nsi" role="2Oq$k0">
                                 <node concept="37vLTw" id="5fy$GmV4nbN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5fy$GmV4mWg" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gy" />
                                 </node>
                                 <node concept="3TrEf2" id="5fy$GmV4nFx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -785,9 +785,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5fy$GmV4mWg" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gy" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5fy$GmV4mWh" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gz" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -818,7 +818,7 @@
                         <node concept="2OqwBi" id="3RtoCzi7o4W" role="3clFbG">
                           <node concept="2OqwBi" id="3RtoCzi7l5u" role="2Oq$k0">
                             <node concept="37vLTw" id="13V9Kfd$3Ef" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5fy$GmV4KCk" resolve="constraint" />
+                              <ref role="3cqZAo" node="4z0AnX817gC" />
                             </node>
                             <node concept="2Rf3mk" id="3RtoCzi7lBV" role="2OqNvi">
                               <node concept="1xMEDy" id="3RtoCzi7lBX" role="1xVPHs">
@@ -835,7 +835,7 @@
                                 <node concept="3clFbF" id="3RtoCzi7rUn" role="3cqZAp">
                                   <node concept="2OqwBi" id="3RtoCzi7s6G" role="3clFbG">
                                     <node concept="37vLTw" id="3RtoCzi7rUl" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3RtoCzi7rHt" resolve="res" />
+                                      <ref role="3cqZAo" node="4z0AnX817g$" />
                                     </node>
                                     <node concept="1P9Npp" id="3RtoCzi7swc" role="2OqNvi">
                                       <node concept="2pJPEk" id="3RtoCzi7zD3" role="1P9ThW">
@@ -861,9 +861,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3RtoCzi7rHt" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817g$" role="1bW2Oz">
                                 <property role="TrG5h" value="res" />
-                                <node concept="2jxLKc" id="3RtoCzi7rHu" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817g_" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -874,7 +874,7 @@
                         <node concept="2OqwBi" id="3RtoCzidmAs" role="3clFbG">
                           <node concept="2OqwBi" id="3RtoCzidji0" role="2Oq$k0">
                             <node concept="37vLTw" id="13V9Kfd$5aZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5fy$GmV4KCk" resolve="constraint" />
+                              <ref role="3cqZAo" node="4z0AnX817gC" />
                             </node>
                             <node concept="2Rf3mk" id="3RtoCzidjzF" role="2OqNvi">
                               <node concept="1xMEDy" id="3RtoCzidjzH" role="1xVPHs">
@@ -895,7 +895,7 @@
                                     <node concept="2OqwBi" id="3RtoCziduDw" role="33vP2m">
                                       <node concept="2OqwBi" id="3RtoCziduDx" role="2Oq$k0">
                                         <node concept="37vLTw" id="3RtoCziduDy" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3RtoCzidrkZ" resolve="ref" />
+                                          <ref role="3cqZAo" node="4z0AnX817gA" />
                                         </node>
                                         <node concept="3TrEf2" id="3RtoCziduDz" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -930,7 +930,7 @@
                                 <node concept="3clFbF" id="3RtoCzidr$G" role="3cqZAp">
                                   <node concept="2OqwBi" id="3RtoCzidrLW" role="3clFbG">
                                     <node concept="37vLTw" id="3RtoCzidr$E" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3RtoCzidrkZ" resolve="ref" />
+                                      <ref role="3cqZAo" node="4z0AnX817gA" />
                                     </node>
                                     <node concept="1P9Npp" id="3RtoCzidsj$" role="2OqNvi">
                                       <node concept="2OqwBi" id="13V9Kfd$i$G" role="1P9ThW">
@@ -951,18 +951,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3RtoCzidrkZ" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817gA" role="1bW2Oz">
                                 <property role="TrG5h" value="ref" />
-                                <node concept="2jxLKc" id="3RtoCzidrl0" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817gB" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5fy$GmV4KCk" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817gC" role="1bW2Oz">
                       <property role="TrG5h" value="constraint" />
-                      <node concept="2jxLKc" id="5fy$GmV4KCl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817gD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1037,14 +1037,14 @@
                             <node concept="BsUDl" id="74u6qanTSDb" role="3clFbG">
                               <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                               <node concept="37vLTw" id="74u6qanTT2L" role="37wK5m">
-                                <ref role="3cqZAo" node="74u6qanTSbN" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817gE" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="74u6qanTSbN" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gE" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="74u6qanTSbO" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gF" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1219,7 +1219,7 @@
                         <node concept="1pGfFk" id="2nByCcxY9t1" role="2ShVmc">
                           <ref role="37wK5l" to="oq0c:3ni3WidV2MT" resolve="EffectHelper" />
                           <node concept="37vLTw" id="2nByCcxY9_I" role="37wK5m">
-                            <ref role="3cqZAo" node="2nByCcxY0V4" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817gG" />
                           </node>
                         </node>
                       </node>
@@ -1229,9 +1229,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2nByCcxY0V4" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817gG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2nByCcxY0V5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817gH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1299,7 +1299,7 @@
                             <node concept="3clFbF" id="2i_9vDmz_lr" role="3cqZAp">
                               <node concept="2OqwBi" id="2i_9vDmz_$b" role="3clFbG">
                                 <node concept="37vLTw" id="2i_9vDmz_lq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2i_9vDmz_e2" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gI" />
                                 </node>
                                 <node concept="1mIQ4w" id="2i_9vDmz_RC" role="2OqNvi">
                                   <node concept="chp4Y" id="2i_9vDmz_Zx" role="cj9EA">
@@ -1309,9 +1309,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2i_9vDmz_e2" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817gI" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2i_9vDmz_e3" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817gJ" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1322,7 +1322,7 @@
                           <node concept="3clFbF" id="2i_9vDmzATt" role="3cqZAp">
                             <node concept="2OqwBi" id="2i_9vDmzB9W" role="3clFbG">
                               <node concept="37vLTw" id="2i_9vDmzATs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2i_9vDmzAI_" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817gK" />
                               </node>
                               <node concept="3TrEf2" id="2i_9vDmzBp9" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -1330,9 +1330,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2i_9vDmzAI_" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gK" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2i_9vDmzAIA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gL" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1388,7 +1388,7 @@
                           </node>
                           <node concept="2OqwBi" id="2i_9vDmzLFK" role="33vP2m">
                             <node concept="37vLTw" id="2i_9vDmzLv8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2i_9vDmzLdD" resolve="c" />
+                              <ref role="3cqZAo" node="4z0AnX817gM" />
                             </node>
                             <node concept="1$rogu" id="2i_9vDmzLWl" role="2OqNvi" />
                           </node>
@@ -1467,9 +1467,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2i_9vDmzLdD" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817gM" role="1bW2Oz">
                       <property role="TrG5h" value="c" />
-                      <node concept="2jxLKc" id="2i_9vDmzLdE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817gN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1933,7 +1933,7 @@
                             <node concept="3clFbF" id="74u6qanTb40" role="3cqZAp">
                               <node concept="2OqwBi" id="74u6qanTb41" role="3clFbG">
                                 <node concept="37vLTw" id="74u6qanTb42" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="74u6qanTb45" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gO" />
                                 </node>
                                 <node concept="1mIQ4w" id="74u6qanTb43" role="2OqNvi">
                                   <node concept="chp4Y" id="74u6qanTb44" role="cj9EA">
@@ -1943,9 +1943,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="74u6qanTb45" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817gO" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="74u6qanTb46" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817gP" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1957,7 +1957,7 @@
                             <node concept="2OqwBi" id="74u6qanTb4b" role="3clFbG">
                               <node concept="2OqwBi" id="74u6qanTb4c" role="2Oq$k0">
                                 <node concept="37vLTw" id="74u6qanTb4d" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="74u6qanTb4g" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817gQ" />
                                 </node>
                                 <node concept="3TrEf2" id="74u6qanTb4e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -1967,9 +1967,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="74u6qanTb4g" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gQ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="74u6qanTb4h" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gR" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2000,7 +2000,7 @@
                         <node concept="2OqwBi" id="74u6qanTb4v" role="3clFbG">
                           <node concept="2OqwBi" id="74u6qanTb4w" role="2Oq$k0">
                             <node concept="37vLTw" id="74u6qanTb4x" role="2Oq$k0">
-                              <ref role="3cqZAo" node="74u6qanTb5r" resolve="constraint" />
+                              <ref role="3cqZAo" node="4z0AnX817gW" />
                             </node>
                             <node concept="2Rf3mk" id="74u6qanTb4y" role="2OqNvi">
                               <node concept="1xMEDy" id="74u6qanTb4z" role="1xVPHs">
@@ -2017,7 +2017,7 @@
                                 <node concept="3clFbF" id="74u6qanTb4D" role="3cqZAp">
                                   <node concept="2OqwBi" id="74u6qanTb4E" role="3clFbG">
                                     <node concept="37vLTw" id="74u6qanTb4F" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="74u6qanTb4Q" resolve="res" />
+                                      <ref role="3cqZAo" node="4z0AnX817gS" />
                                     </node>
                                     <node concept="1P9Npp" id="74u6qanTb4G" role="2OqNvi">
                                       <node concept="2pJPEk" id="74u6qanTb4H" role="1P9ThW">
@@ -2043,9 +2043,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="74u6qanTb4Q" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817gS" role="1bW2Oz">
                                 <property role="TrG5h" value="res" />
-                                <node concept="2jxLKc" id="74u6qanTb4R" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817gT" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2056,7 +2056,7 @@
                         <node concept="2OqwBi" id="74u6qanTb4U" role="3clFbG">
                           <node concept="2OqwBi" id="74u6qanTb4V" role="2Oq$k0">
                             <node concept="37vLTw" id="74u6qanTb4W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="74u6qanTb5r" resolve="constraint" />
+                              <ref role="3cqZAo" node="4z0AnX817gW" />
                             </node>
                             <node concept="2Rf3mk" id="74u6qanTb4X" role="2OqNvi">
                               <node concept="1xMEDy" id="74u6qanTb4Y" role="1xVPHs">
@@ -2077,7 +2077,7 @@
                                     <node concept="2OqwBi" id="74u6qanTb57" role="33vP2m">
                                       <node concept="2OqwBi" id="74u6qanTb58" role="2Oq$k0">
                                         <node concept="37vLTw" id="74u6qanTb59" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="74u6qanTb5p" resolve="ref" />
+                                          <ref role="3cqZAo" node="4z0AnX817gU" />
                                         </node>
                                         <node concept="3TrEf2" id="74u6qanTb5a" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -2188,7 +2188,7 @@
                                 <node concept="3clFbF" id="74u6qanTb5e" role="3cqZAp">
                                   <node concept="2OqwBi" id="74u6qanTb5f" role="3clFbG">
                                     <node concept="37vLTw" id="74u6qanTb5g" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="74u6qanTb5p" resolve="ref" />
+                                      <ref role="3cqZAo" node="4z0AnX817gU" />
                                     </node>
                                     <node concept="1P9Npp" id="74u6qanTb5h" role="2OqNvi">
                                       <node concept="37vLTw" id="74u6qaotX26" role="1P9ThW">
@@ -2198,18 +2198,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="74u6qanTb5p" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817gU" role="1bW2Oz">
                                 <property role="TrG5h" value="ref" />
-                                <node concept="2jxLKc" id="74u6qanTb5q" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817gV" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="74u6qanTb5r" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817gW" role="1bW2Oz">
                       <property role="TrG5h" value="constraint" />
-                      <node concept="2jxLKc" id="74u6qanTb5s" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817gX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2284,14 +2284,14 @@
                             <node concept="BsUDl" id="74u6qanTwH8" role="3clFbG">
                               <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                               <node concept="37vLTw" id="74u6qanTwRh" role="37wK5m">
-                                <ref role="3cqZAo" node="74u6qanTwxp" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817gY" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="74u6qanTwxp" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817gY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="74u6qanTwxq" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817gZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2414,7 +2414,7 @@
                             <node concept="3clFbF" id="74u6qapyDcG" role="3cqZAp">
                               <node concept="2OqwBi" id="74u6qapyDcH" role="3clFbG">
                                 <node concept="37vLTw" id="74u6qapyDcI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="74u6qapyDcL" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817h0" />
                                 </node>
                                 <node concept="1mIQ4w" id="74u6qapyDcJ" role="2OqNvi">
                                   <node concept="chp4Y" id="74u6qapyDcK" role="cj9EA">
@@ -2424,9 +2424,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="74u6qapyDcL" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817h0" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="74u6qapyDcM" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817h1" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2437,7 +2437,7 @@
                           <node concept="3clFbF" id="74u6qapyDcQ" role="3cqZAp">
                             <node concept="2OqwBi" id="74u6qapyDcR" role="3clFbG">
                               <node concept="37vLTw" id="74u6qapyDcS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="74u6qapyDcU" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817h2" />
                               </node>
                               <node concept="3TrEf2" id="74u6qapyDcT" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -2445,9 +2445,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="74u6qapyDcU" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817h2" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="74u6qapyDcV" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817h3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2503,7 +2503,7 @@
                           </node>
                           <node concept="2OqwBi" id="74u6qapyDdk" role="33vP2m">
                             <node concept="37vLTw" id="74u6qapyDdl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="74u6qapyDdS" resolve="c" />
+                              <ref role="3cqZAo" node="4z0AnX817h4" />
                             </node>
                             <node concept="1$rogu" id="74u6qapyDdm" role="2OqNvi" />
                           </node>
@@ -2663,9 +2663,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="74u6qapyDdS" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817h4" role="1bW2Oz">
                       <property role="TrG5h" value="c" />
-                      <node concept="2jxLKc" id="74u6qapyDdT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817h5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3203,7 +3203,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RIvadv2InN" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817h6" />
                       </node>
                       <node concept="3TrEf2" id="2Fd5B1gxdCm" role="2OqNvi">
                         <ref role="3Tt5mk" to="yv47:ub9nkyG$WU" resolve="constant" />
@@ -3211,9 +3211,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="RIvadv2InN" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817h6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="RIvadv2InO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817h7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3792,7 +3792,7 @@
                         <ref role="37wK5l" to="pbu6:lH$PujSMTa" resolve="DefaultConstraintAndError" />
                         <node concept="2OqwBi" id="78hTg1$sDNx" role="37wK5m">
                           <node concept="37vLTw" id="78hTg1$sDE5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="SRvqsNppF0" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" />
                           </node>
                           <node concept="3TrEf2" id="78hTg1$sEds" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3800,19 +3800,19 @@
                         </node>
                         <node concept="2OqwBi" id="68JOYCcTzlz" role="37wK5m">
                           <node concept="37vLTw" id="68JOYCcTz3q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="SRvqsNppF0" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" />
                           </node>
                           <node concept="3TrEf2" id="68JOYCcTzQP" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:5F8uib8hsjE" resolve="err" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="6ItA_x_aJIs" role="37wK5m">
-                          <ref role="3cqZAo" node="SRvqsNppF0" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817h8" />
                         </node>
                         <node concept="2OqwBi" id="78hTg1$sH78" role="37wK5m">
                           <node concept="2OqwBi" id="78hTg1$sGxO" role="2Oq$k0">
                             <node concept="37vLTw" id="78hTg1$sGlN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="SRvqsNppF0" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817h8" />
                             </node>
                             <node concept="3TrEf2" id="78hTg1$sGOj" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3824,7 +3824,7 @@
                         </node>
                         <node concept="2OqwBi" id="lH$PujSIX6" role="37wK5m">
                           <node concept="37vLTw" id="lH$PujSIKz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="SRvqsNppF0" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" />
                           </node>
                           <node concept="3TrcHB" id="lH$PujSLcE" role="2OqNvi">
                             <ref role="3TsBF5" to="hm2y:3xthw2gJs74" resolve="warning" />
@@ -3834,9 +3834,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="SRvqsNppF0" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817h8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="SRvqsNppF1" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817h9" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4088,7 +4088,7 @@
                     <node concept="3clFbF" id="6N7p0lWz3ZK" role="3cqZAp">
                       <node concept="2OqwBi" id="6N7p0lWz48M" role="3clFbG">
                         <node concept="37vLTw" id="6N7p0lWz3ZJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6N7p0lWz3Wd" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ha" />
                         </node>
                         <node concept="liA8E" id="6N7p0lWz4jA" role="2OqNvi">
                           <ref role="37wK5l" to="pq1l:6N7p0lWyLeD" resolve="PriorityLevel" />
@@ -4096,9 +4096,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6N7p0lWz3Wd" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ha" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6N7p0lWz3We" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hb" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="6N7p0lWz4tU" role="2S7zOq" />
@@ -4184,7 +4184,7 @@
                   <node concept="3clFbF" id="7D7uZV2j0Y2" role="3cqZAp">
                     <node concept="2OqwBi" id="7D7uZV2j13s" role="3clFbG">
                       <node concept="37vLTw" id="7D7uZV2j0Y1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7D7uZV2j0Wq" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817hc" />
                       </node>
                       <node concept="1mIQ4w" id="7D7uZV2j1cn" role="2OqNvi">
                         <node concept="chp4Y" id="7D7uZV2pxe2" role="cj9EA">
@@ -4194,9 +4194,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7D7uZV2j0Wq" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7D7uZV2j0Wr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4799,7 +4799,7 @@
                             <node concept="3clFbF" id="5ipapt3nmee" role="3cqZAp">
                               <node concept="2OqwBi" id="5ipapt3nmef" role="3clFbG">
                                 <node concept="37vLTw" id="5ipapt3nmeg" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5ipapt3nmei" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817he" />
                                 </node>
                                 <node concept="3TrEf2" id="5ipapt3nmeh" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -4807,9 +4807,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5ipapt3nmei" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817he" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5ipapt3nmej" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817hf" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -4997,14 +4997,14 @@
                         <ref role="3cqZAo" node="5ipapt3zhMK" resolve="expr" />
                       </node>
                       <node concept="37vLTw" id="5ipapt3zvv3" role="3uHU7B">
-                        <ref role="3cqZAo" node="5ipapt3zvrR" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817hg" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ipapt3zvrR" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hg" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ipapt3zvrS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hh" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5034,7 +5034,7 @@
                     <node concept="2OqwBi" id="5ipapt3z_7x" role="3clFbG">
                       <node concept="2OqwBi" id="5ipapt3zy$6" role="2Oq$k0">
                         <node concept="37vLTw" id="5ipapt3zynQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5ipapt3zykA" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hi" />
                         </node>
                         <node concept="2Rf3mk" id="5ipapt3zyGT" role="2OqNvi">
                           <node concept="1xMEDy" id="5ipapt3zyGV" role="1xVPHs">
@@ -5052,9 +5052,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ipapt3zykA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hi" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ipapt3zykB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5150,14 +5150,14 @@
                         <ref role="3cqZAo" node="5ipapt3DCea" resolve="expr" />
                       </node>
                       <node concept="37vLTw" id="5ipapt3DCdJ" role="3uHU7B">
-                        <ref role="3cqZAo" node="5ipapt3DCdK" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817hk" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ipapt3DCdK" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hk" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ipapt3DCdL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hl" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5187,7 +5187,7 @@
                     <node concept="2OqwBi" id="5ipapt3DCdY" role="3clFbG">
                       <node concept="2OqwBi" id="5ipapt3DCdZ" role="2Oq$k0">
                         <node concept="37vLTw" id="5ipapt3DCe0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5ipapt3DCe6" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hm" />
                         </node>
                         <node concept="2Rf3mk" id="5ipapt3DCe1" role="2OqNvi">
                           <node concept="1xMEDy" id="5ipapt3DCe2" role="1xVPHs">
@@ -5205,9 +5205,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5ipapt3DCe6" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hm" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5ipapt3DCe7" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hn" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5546,7 +5546,7 @@
                           <ref role="37wK5l" to="pbu6:lH$PujSMTa" resolve="DefaultConstraintAndError" />
                           <node concept="2OqwBi" id="3aPPYyxBZm5" role="37wK5m">
                             <node concept="37vLTw" id="3aPPYyxBZm6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3aPPYyxBZmm" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" />
                             </node>
                             <node concept="3TrEf2" id="3aPPYyxBZm7" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -5554,19 +5554,19 @@
                           </node>
                           <node concept="2OqwBi" id="68JOYCcTAT1" role="37wK5m">
                             <node concept="37vLTw" id="68JOYCcTAvG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3aPPYyxBZmm" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" />
                             </node>
                             <node concept="3TrEf2" id="68JOYCcTB$z" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:5F8uib8hsjE" resolve="err" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="3aPPYyxBZm8" role="37wK5m">
-                            <ref role="3cqZAo" node="3aPPYyxBZmm" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817ho" />
                           </node>
                           <node concept="2OqwBi" id="3aPPYyxBZma" role="37wK5m">
                             <node concept="2OqwBi" id="3aPPYyxBZmb" role="2Oq$k0">
                               <node concept="37vLTw" id="3aPPYyxBZmc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3aPPYyxBZmm" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817ho" />
                               </node>
                               <node concept="3TrEf2" id="3aPPYyxBZmd" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -5578,7 +5578,7 @@
                           </node>
                           <node concept="2OqwBi" id="48O0oIkAOyO" role="37wK5m">
                             <node concept="37vLTw" id="48O0oIkAOi5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3aPPYyxBZmm" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" />
                             </node>
                             <node concept="3TrcHB" id="48O0oIkAQ$X" role="2OqNvi">
                               <ref role="3TsBF5" to="hm2y:3xthw2gJs74" resolve="warning" />
@@ -5588,9 +5588,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3aPPYyxBZmm" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ho" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3aPPYyxBZmn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6282,7 +6282,7 @@
                     <node concept="3clFbF" id="7S4tmubDufQ" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDutv" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDufP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubDu2z" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hq" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDyP8" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubDuM6" resolve="renderReadable" />
@@ -6290,9 +6290,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubDu2z" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817hq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubDu2$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6435,7 +6435,7 @@
                   <node concept="3clFbF" id="olugnm0XaB" role="3cqZAp">
                     <node concept="2OqwBi" id="olugnm0XAO" role="3clFbG">
                       <node concept="37vLTw" id="olugnm0XaA" role="2Oq$k0">
-                        <ref role="3cqZAo" node="olugnm0X0I" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817hs" />
                       </node>
                       <node concept="2qgKlT" id="olugnm10lK" role="2OqNvi">
                         <ref role="37wK5l" node="olugnm0Egc" resolve="effectiveLiterals" />
@@ -6443,9 +6443,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="olugnm0X0I" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hs" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="olugnm0X0J" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817ht" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6890,7 +6890,7 @@
                     <node concept="3fqX7Q" id="58eyHuUh9bN" role="3clFbG">
                       <node concept="2OqwBi" id="58eyHuUh9uF" role="3fr31v">
                         <node concept="37vLTw" id="58eyHuUh9dR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="58eyHuUh93F" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hu" />
                         </node>
                         <node concept="1mIQ4w" id="58eyHuUh9Wm" role="2OqNvi">
                           <node concept="chp4Y" id="58eyHuUha9I" role="cj9EA">
@@ -6901,9 +6901,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="58eyHuUh93F" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="58eyHuUh93G" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7036,7 +7036,7 @@
                       <node concept="2OqwBi" id="6JZACDWH7OS" role="3clFbG">
                         <node concept="2OqwBi" id="6JZACDWH6va" role="2Oq$k0">
                           <node concept="37vLTw" id="6JZACDWH6b9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6JZACDWH5Xo" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hw" />
                           </node>
                           <node concept="2qgKlT" id="4WLweXm4piJ" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4WLweXm3SW5" resolve="type" />
@@ -7050,9 +7050,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6JZACDWH5Xo" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817hw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6JZACDWH5Xp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7068,7 +7068,7 @@
                         </node>
                         <node concept="2OqwBi" id="6JZACDWGX$E" role="1m5AlR">
                           <node concept="37vLTw" id="6JZACDWGX$F" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6JZACDWGX$G" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hy" />
                           </node>
                           <node concept="2qgKlT" id="4WLweXm4qig" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4WLweXm3SW5" resolve="type" />
@@ -7081,9 +7081,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6JZACDWGX$G" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6JZACDWGX$H" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7414,15 +7414,15 @@
                         <ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
                         <ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
                         <node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
-                          <ref role="3cqZAo" node="230lIJTFuY" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817h$" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="230lIJTFuY" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817h$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="230lIJTFuZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817h_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7842,7 +7842,7 @@
                           <ref role="2pIpSl" to="yv47:67Y8mp$DNs9" resolve="literal" />
                           <node concept="36biLy" id="_kNv2PYfKV" role="28nt2d">
                             <node concept="37vLTw" id="_kNv2PYqM4" role="36biLW">
-                              <ref role="3cqZAo" node="_kNv2PYekW" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817hA" />
                             </node>
                           </node>
                         </node>
@@ -7850,9 +7850,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="_kNv2PYekW" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="_kNv2PYekX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8082,7 +8082,7 @@
                     <node concept="3clFbF" id="7S4tmubDlG$" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDlVx" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDlGz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubDlGs" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hC" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDp$5" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubDmlH" resolve="renderReadable" />
@@ -8090,9 +8090,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubDlGs" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817hC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubDlGt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -8138,7 +8138,7 @@
                       <node concept="3clFbF" id="7cphKbLzN4t" role="3cqZAp">
                         <node concept="2OqwBi" id="7cphKbLzNlu" role="3clFbG">
                           <node concept="37vLTw" id="7cphKbLzN4s" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7cphKbLzMTp" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hE" />
                           </node>
                           <node concept="2qgKlT" id="7cphKbLzNE0" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -8146,9 +8146,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7cphKbLzMTp" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817hE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7cphKbLzMTq" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817hF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8196,7 +8196,7 @@
                     <node concept="2OqwBi" id="1Ic1PAvP8J" role="3clFbG">
                       <node concept="2OqwBi" id="1Ic1PAvNpc" role="2Oq$k0">
                         <node concept="37vLTw" id="1Ic1PAvN93" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1Ic1PAvMZc" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hG" />
                         </node>
                         <node concept="3TrcHB" id="1Ic1PAvNG_" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8211,9 +8211,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1Ic1PAvMZc" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1Ic1PAvMZd" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8557,11 +8557,11 @@
                               <node concept="3clFbF" id="4ptnK4jbG2i" role="3cqZAp">
                                 <node concept="3clFbC" id="4ptnK4jbG2j" role="3clFbG">
                                   <node concept="37vLTw" id="4ptnK4jbPG1" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4ptnK4jbNro" resolve="mand" />
+                                    <ref role="3cqZAo" node="4z0AnX817hK" />
                                   </node>
                                   <node concept="2OqwBi" id="4ptnK4jbG2l" role="3uHU7B">
                                     <node concept="37vLTw" id="4ptnK4jbG2m" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4ptnK4jbG2o" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817hI" />
                                     </node>
                                     <node concept="3TrEf2" id="4ptnK4jbG2n" role="2OqNvi">
                                       <ref role="3Tt5mk" to="yv47:4ptnK4jbqZQ" resolve="field" />
@@ -8570,9 +8570,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4ptnK4jbG2o" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817hI" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4ptnK4jbG2p" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817hJ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -8580,9 +8580,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4ptnK4jbNro" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hK" role="1bW2Oz">
                   <property role="TrG5h" value="mand" />
-                  <node concept="2jxLKc" id="4ptnK4jbNrp" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8645,7 +8645,7 @@
                               <ref role="cht4Q" to="hm2y:4WLweXm3SVw" resolve="ITypeable" />
                             </node>
                             <node concept="37vLTw" id="7oamhfs0PLq" role="1m5AlR">
-                              <ref role="3cqZAo" node="4ptnK4jbwIL" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817hM" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="7oamhfs0V3t" role="2OqNvi">
@@ -8654,7 +8654,7 @@
                         </node>
                         <node concept="2OqwBi" id="7oamhfs0NiT" role="3K4Cdx">
                           <node concept="37vLTw" id="7oamhfs0MGe" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ptnK4jbwIL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hM" />
                           </node>
                           <node concept="1mIQ4w" id="7oamhfs0OWt" role="2OqNvi">
                             <node concept="chp4Y" id="7oamhfs0P9k" role="cj9EA">
@@ -8664,7 +8664,7 @@
                         </node>
                         <node concept="2OqwBi" id="7oamhfs0MlF" role="3K4GZi">
                           <node concept="37vLTw" id="7oamhfs0MlG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ptnK4jbwIL" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hM" />
                           </node>
                           <node concept="3JvlWi" id="7oamhfs0MlH" role="2OqNvi" />
                         </node>
@@ -8686,9 +8686,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4ptnK4jbwIL" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817hM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4ptnK4jbwIM" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817hN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -8851,7 +8851,7 @@
                     <node concept="3clFbF" id="7S4tmubD4HZ" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubD4UY" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubD4HY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7S4tmubD4HR" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817hO" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubD5al" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubD2lA" resolve="renderReadable" />
@@ -8859,9 +8859,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7S4tmubD4HR" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817hO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7S4tmubD4HS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817hP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
index f6b060f829..fcc01b871f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -157,6 +157,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" />
@@ -241,7 +242,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -260,7 +261,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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -398,7 +398,7 @@
                       <node concept="3clFbF" id="1F1F0IUZBpP" role="3cqZAp">
                         <node concept="2OqwBi" id="1F1F0IUZBpQ" role="3clFbG">
                           <node concept="37vLTw" id="1F1F0IUZBpR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1F1F0IUZBpT" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hQ" />
                           </node>
                           <node concept="3TrcHB" id="1F1F0IUZBpS" role="2OqNvi">
                             <ref role="3TsBF5" to="zzzn:2uR5X5azvjH" resolve="ext" />
@@ -406,9 +406,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZBpT" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817hQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZBpU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817hR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -466,7 +466,7 @@
                                 <node concept="2OqwBi" id="1F1F0IUZB$P" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1F1F0IUZB$Q" role="2Oq$k0">
                                     <node concept="37vLTw" id="1F1F0IUZB$R" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1F1F0IUZB_0" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817hS" />
                                     </node>
                                     <node concept="3Tsc0h" id="1F1F0IUZB$S" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8eSCZ" resolve="args" />
@@ -491,9 +491,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZB_0" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817hS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZB_1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817hT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -819,14 +819,14 @@
                             <ref role="3cqZAo" node="1F1F0IUZB1w" resolve="td" />
                           </node>
                           <node concept="37vLTw" id="1F1F0IUZB8q" role="3uHU7B">
-                            <ref role="3cqZAo" node="1F1F0IUZB8r" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817hU" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1F1F0IUZB8r" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817hU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1F1F0IUZB8s" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817hV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1038,7 +1038,7 @@
                         <node concept="3fqX7Q" id="MIkgqljJgy" role="3clFbG">
                           <node concept="2OqwBi" id="MIkgqljJg$" role="3fr31v">
                             <node concept="37vLTw" id="MIkgqljJg_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="MIkgqljHBx" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817hW" />
                             </node>
                             <node concept="2qgKlT" id="MIkgqljJgA" role="2OqNvi">
                               <ref role="37wK5l" to="nu60:MIkgqljGnG" resolve="hasItsOwnType" />
@@ -1047,9 +1047,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="MIkgqljHBx" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817hW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="MIkgqljHBy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817hX" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1371,7 +1371,7 @@
                           <node concept="3clFbF" id="4zsmO3KsRvU" role="3cqZAp">
                             <node concept="2OqwBi" id="4zsmO3KsRvV" role="3clFbG">
                               <node concept="37vLTw" id="4zsmO3KsRvW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4zsmO3KsRvY" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817hY" />
                               </node>
                               <node concept="2qgKlT" id="4zsmO3KsRvX" role="2OqNvi">
                                 <ref role="37wK5l" to="nu60:olugnm0Egc" resolve="effectiveLiterals" />
@@ -1379,9 +1379,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4zsmO3KsRvY" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817hY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4zsmO3KsRvZ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817hZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1424,7 +1424,7 @@
                                 <node concept="3fqX7Q" id="4zsmO3KsWES" role="3clFbG">
                                   <node concept="2OqwBi" id="4zsmO3KsWET" role="3fr31v">
                                     <node concept="37vLTw" id="4zsmO3KsWEU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4zsmO3KsWEW" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817i0" />
                                     </node>
                                     <node concept="3TrcHB" id="4zsmO3KsWEV" role="2OqNvi">
                                       <ref role="3TsBF5" to="yv47:67Y8mp$M9cx" resolve="qualified" />
@@ -1433,9 +1433,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4zsmO3KsWEW" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817i0" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4zsmO3KsWEX" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817i1" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1446,7 +1446,7 @@
                             <node concept="3clFbF" id="4zsmO3KsWF1" role="3cqZAp">
                               <node concept="2OqwBi" id="4zsmO3KsWF2" role="3clFbG">
                                 <node concept="37vLTw" id="4zsmO3KsWF3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4zsmO3KsWF5" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817i2" />
                                 </node>
                                 <node concept="2qgKlT" id="4zsmO3KsWF4" role="2OqNvi">
                                   <ref role="37wK5l" to="nu60:olugnm0Egc" resolve="effectiveLiterals" />
@@ -1454,9 +1454,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4zsmO3KsWF5" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817i2" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4zsmO3KsWF6" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817i3" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2040,7 +2040,7 @@
                       <node concept="3clFbF" id="4zsmO3KwfuR" role="3cqZAp">
                         <node concept="2OqwBi" id="4zsmO3KwfWp" role="3clFbG">
                           <node concept="37vLTw" id="4zsmO3KwfuQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4zsmO3Kwfoj" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817i4" />
                           </node>
                           <node concept="3TrcHB" id="4zsmO3Kwgv7" role="2OqNvi">
                             <ref role="3TsBF5" to="yv47:67Y8mp$M9cx" resolve="qualified" />
@@ -2048,9 +2048,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4zsmO3Kwfoj" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817i4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4zsmO3Kwfok" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817i5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
index f03aefe01f..995a5c5120 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
@@ -51,7 +51,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -93,7 +93,7 @@
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
@@ -177,12 +177,12 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -228,7 +228,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="772883491827578824" name="jetbrains.mps.lang.editor.structure.CompletionCustomization_CustomizeFunction" flags="ig" index="3lBaaS" />
@@ -265,12 +265,12 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -284,7 +284,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="6419604448124516209" name="jetbrains.mps.lang.editor.structure.QueryFunction_IsMethodCurrent" flags="in" index="3LVrda" />
@@ -335,7 +335,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">
@@ -444,7 +444,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -462,7 +462,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -484,6 +484,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" />
@@ -496,7 +497,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
@@ -511,7 +512,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -616,7 +617,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>
@@ -647,7 +648,6 @@
         <child id="1235573175711" name="elementType" index="2HTBi0" />
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -3237,7 +3237,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817i6" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -3252,7 +3252,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="LBlPJUzjy9" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817i6" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
@@ -3260,9 +3260,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="LBlPJUzjy9" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817i6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1P4c1XrzTlB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817i7" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
index 1ca5ac5b9d..28dcde0412 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
@@ -49,7 +49,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -158,7 +158,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -181,7 +181,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="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -212,6 +212,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -274,7 +275,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -315,7 +316,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -490,7 +490,7 @@
                               <ref role="37wK5l" node="7_$HJtBvdxi" resolve="getValueByName" />
                               <node concept="2OqwBi" id="5F4AdUj4CuR" role="37wK5m">
                                 <node concept="37vLTw" id="5F4AdUj4CuS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7D7uZV2wPni" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817iq" />
                                 </node>
                                 <node concept="3TrcHB" id="5F4AdUj4CuT" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -522,9 +522,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7D7uZV2wPni" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817iq" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7D7uZV2wPnj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ir" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1495,7 +1495,7 @@
                         <node concept="3clFbF" id="2nByCcxYwJH" role="3cqZAp">
                           <node concept="2OqwBi" id="2nByCcxYwJI" role="3clFbG">
                             <node concept="37vLTw" id="2nByCcxYwJJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2nByCcxYwJL" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817is" />
                             </node>
                             <node concept="2qgKlT" id="2nByCcxYwJK" role="2OqNvi">
                               <ref role="37wK5l" to="nu60:2nByCcxXVT$" resolve="allArgsPure" />
@@ -1503,9 +1503,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2nByCcxYwJL" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817is" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2nByCcxYwJM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817it" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/structure.mps
index 80f8abad9e..c7954766dd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/structure.mps
@@ -71,7 +71,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
index 184d87def4..e341d41ce5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
@@ -104,7 +104,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,6 +136,7 @@
       <concept 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" />
@@ -332,7 +333,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -370,7 +371,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -433,7 +433,7 @@
                     </node>
                     <node concept="2OqwBi" id="ub9nkyP0HI" role="3uHU7B">
                       <node concept="37vLTw" id="ub9nkyP0Dp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="ub9nkyP0$l" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817ia" />
                       </node>
                       <node concept="3TrEf2" id="ub9nkyP0OT" role="2OqNvi">
                         <ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
@@ -442,9 +442,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="ub9nkyP0$l" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817ia" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="ub9nkyP0$m" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817ib" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -601,7 +601,7 @@
                               </node>
                               <node concept="2OqwBi" id="1bwJEEfjwbm" role="3uHU7B">
                                 <node concept="37vLTw" id="1bwJEEfjwbn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1bwJEEfjwbp" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ic" />
                                 </node>
                                 <node concept="3TrEf2" id="1bwJEEfjwbo" role="2OqNvi">
                                   <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -610,9 +610,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1bwJEEfjwbp" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ic" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1bwJEEfjwbq" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817id" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1014,7 +1014,7 @@
                               <node concept="3clFbF" id="7D7uZV2og6Z" role="3cqZAp">
                                 <node concept="2OqwBi" id="7D7uZV2oge3" role="3clFbG">
                                   <node concept="37vLTw" id="7D7uZV2og6Y" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7D7uZV2og2W" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817ie" />
                                   </node>
                                   <node concept="3TrcHB" id="7D7uZV2ogpm" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1022,9 +1022,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7D7uZV2og2W" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817ie" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7D7uZV2og2X" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817if" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1851,7 +1851,7 @@
                             <node concept="2OqwBi" id="TcaAhOKhZ3" role="3clFbG">
                               <node concept="2OqwBi" id="TcaAhOKhZ4" role="2Oq$k0">
                                 <node concept="37vLTw" id="TcaAhOKhZ5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="TcaAhOKhZ8" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ig" />
                                 </node>
                                 <node concept="3TrEf2" id="TcaAhOKhZ6" role="2OqNvi">
                                   <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -1861,9 +1861,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="TcaAhOKhZ8" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ig" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="TcaAhOKhZ9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817ih" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1875,7 +1875,7 @@
                           <node concept="2OqwBi" id="TcaAhOKhZe" role="3clFbG">
                             <node concept="2OqwBi" id="TcaAhOKhZf" role="2Oq$k0">
                               <node concept="37vLTw" id="TcaAhOKhZg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="TcaAhOKhZj" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817ii" />
                               </node>
                               <node concept="3TrEf2" id="TcaAhOKhZh" role="2OqNvi">
                                 <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -1885,9 +1885,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="TcaAhOKhZj" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817ii" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="TcaAhOKhZk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817ij" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3895,7 +3895,7 @@
                           </node>
                           <node concept="2OqwBi" id="5YygIlc4ohm" role="3uHU7B">
                             <node concept="37vLTw" id="5YygIlc4sRW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5YygIlc4sIv" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ik" />
                             </node>
                             <node concept="3TrEf2" id="5YygIlc4tqN" role="2OqNvi">
                               <ref role="3Tt5mk" to="yv47:SRvqsNmWci" resolve="member" />
@@ -3904,9 +3904,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5YygIlc4sIv" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ik" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5YygIlc4sIw" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817il" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3934,13 +3934,13 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="5YygIlc4vqf" role="1urrMF">
-                        <ref role="3cqZAo" node="5YygIlc4u7k" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817im" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5YygIlc4u7k" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817im" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5YygIlc4u7l" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817in" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4203,7 +4203,7 @@
                   <ref role="JncvD" to="hm2y:7halHeUzscN" resolve="PrimitiveLiteral" />
                   <node concept="2OqwBi" id="Y$AzCx8nqC" role="JncvB">
                     <node concept="37vLTw" id="Y$AzCx8ndN" role="2Oq$k0">
-                      <ref role="3cqZAo" node="Y$AzCx8eUg" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817io" />
                     </node>
                     <node concept="3TrEf2" id="Y$AzCx8nH7" role="2OqNvi">
                       <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -4298,7 +4298,7 @@
                   <ref role="JncvD" to="yv47:67Y8mp$DNr5" resolve="EnumLiteralRef" />
                   <node concept="2OqwBi" id="Y$AzCx8zn5" role="JncvB">
                     <node concept="37vLTw" id="Y$AzCx8z89" role="2Oq$k0">
-                      <ref role="3cqZAo" node="Y$AzCx8eUg" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817io" />
                     </node>
                     <node concept="3TrEf2" id="Y$AzCx8zFa" role="2OqNvi">
                       <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -4341,9 +4341,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="Y$AzCx8eUg" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817io" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="Y$AzCx8eUh" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817ip" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
index d1daa6b993..ee027be5e3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -48,7 +47,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -76,7 +75,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
@@ -130,7 +129,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
     <module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
     <module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="3" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
index 8e6bee647b..09e6a0d4cd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
@@ -98,7 +98,7 @@
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -231,7 +231,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>
@@ -250,7 +250,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="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
@@ -262,13 +262,14 @@
       <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" />
       </concept>
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
@@ -303,7 +304,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>
@@ -328,7 +329,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="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -1776,7 +1776,7 @@
                           <node concept="2OqwBi" id="5U8d23QlPI5" role="3uHU7B">
                             <node concept="2JrnkZ" id="5U8d23QlPof" role="2Oq$k0">
                               <node concept="37vLTw" id="5U8d23QlO$8" role="2JrQYb">
-                                <ref role="3cqZAo" node="5U8d23QlOnh" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817iu" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5U8d23QlQhh" role="2OqNvi">
@@ -1790,9 +1790,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5U8d23QlOnh" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817iu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5U8d23QlOni" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817iv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/structure.mps
index fb06d644de..277a63e5a1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/structure.mps
@@ -25,7 +25,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/util.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/util.mps
index 5dec99ae0a..b4e7c185af 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/util.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/util.mps
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,7 +106,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -121,7 +121,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.iets3.opensource/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl
index db69bfae3e..a4f4081950 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -47,7 +46,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/generator/templates/org.iets3.core.expr.typetags.bindingtime.generator.templates@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/generator/templates/org.iets3.core.expr.typetags.bindingtime.generator.templates@generator.mps
index 586d0c6ff4..11eeb5fc98 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/generator/templates/org.iets3.core.expr.typetags.bindingtime.generator.templates@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/generator/templates/org.iets3.core.expr.typetags.bindingtime.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.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.behavior.mps
index ea589e1ede..70cac5b98f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.behavior.mps
@@ -92,7 +92,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -101,7 +101,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -143,7 +143,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.editor.mps
index b4375d34e7..a818c95329 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.editor.mps
@@ -16,7 +16,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -31,7 +31,7 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
-      <concept id="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>
@@ -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" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -124,7 +124,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.structure.mps
index f4b7f93e99..bf8d0b5574 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.typesystem.mps
index 83aed46719..bf5d7f8551 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/models/org.iets3.core.expr.typetags.bindingtime.typesystem.mps
@@ -88,7 +88,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -164,7 +164,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl
index 7060668cfd..5832003b16 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.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" />
@@ -89,7 +89,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -102,7 +101,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/generator/template/main@generator.mps
index 8ff6e24c15..3f2bb24f07 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/generator/template/main@generator.mps
@@ -57,7 +57,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/behavior.mps
index bca9de3919..19688871f2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/behavior.mps
@@ -102,7 +102,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,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">
@@ -165,7 +165,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/editor.mps
index afce6d603c..03b8b3ff55 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/editor.mps
@@ -45,7 +45,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/plugin.mps
index c4b1405a50..a54a81f2da 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:d37e6782-feb5-44db-8a75-c73d548549ac(org.iets3.core.expr.typetags.lib.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
   </languages>
   <imports />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/structure.mps
index 51cad8b687..e396c40b9f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/structure.mps
@@ -39,7 +39,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
index 2f58f806fb..b8c52a93fd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
@@ -53,12 +53,13 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -131,7 +132,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -139,7 +140,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -354,7 +354,7 @@
                             <node concept="2OqwBi" id="sflsE7pzXW" role="3clFbG">
                               <node concept="2OqwBi" id="sflsE7pzXX" role="2Oq$k0">
                                 <node concept="37vLTw" id="sflsE7pzXY" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="sflsE7pzY2" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ix" />
                                 </node>
                                 <node concept="3TrcHB" id="sflsE7pzXZ" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -369,9 +369,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="sflsE7pzY2" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ix" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="sflsE7pzY3" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817iy" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl
index e1052b8a1a..dd6a124ce6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl
@@ -34,7 +34,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -91,7 +91,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
@@ -101,7 +100,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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" />
@@ -120,7 +119,7 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
index d015407c66..5236f3c901 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
@@ -87,7 +87,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -106,6 +106,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -162,7 +163,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -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="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -361,7 +361,7 @@
                                 <ref role="2pIpSl" to="a0oj:71Zj$i0ct2e" resolve="quantity" />
                                 <node concept="36biLy" id="76ZhK6XZ3Iq" role="28nt2d">
                                   <node concept="37vLTw" id="76ZhK6XZ3IR" role="36biLW">
-                                    <ref role="3cqZAo" node="76ZhK6XVzgl" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817iz" />
                                   </node>
                                 </node>
                               </node>
@@ -372,9 +372,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="76ZhK6XVzgl" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="76ZhK6XVzgm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817i$" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.editor.mps
index c3fe3a462a..8ac5aa5575 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.editor.mps
@@ -20,7 +20,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -77,10 +77,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -98,10 +98,10 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -126,7 +126,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -134,14 +134,14 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
         <reference id="843003353410421234" name="concept" index="1FNNbB" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6684862045052272180" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_NodeToWrap" flags="ng" index="3N4pyC" />
@@ -246,7 +246,7 @@
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -327,7 +327,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.structure.mps
index 9892030482..1172f07200 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.structure.mps
@@ -35,7 +35,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.typesystem.mps
index f216c124a0..b94023d928 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.typesystem.mps
@@ -10,7 +10,7 @@
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="w1hl" ref="r:04b74a30-84ff-4d44-89e3-8084278f9c79(org.iets3.core.expr.typetags.structure)" />
     <import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" />
-    <import index="a0oj" ref="r:7add344e-59b0-49a5-a0a7-0e0dc1798815(org.iets3.core.expr.typetags.units.dimensions.structure)" />
+    <import index="a0oj" ref="r:7add344e-59b0-49a5-a0a7-0e0dc1798815(org.iets3.core.expr.typetags.units.quantity.structure)" />
     <import index="b0gq" ref="r:1eb914ff-b91c-4cbc-93c6-3ecde7821894(org.iets3.core.expr.typetags.units.structure)" />
   </imports>
   <registry>
@@ -71,7 +71,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -134,7 +134,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl
index 02b90e39d3..b5787d8f9d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)</dependency>
     <dependency reexport="false">cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
index ea0e0d7f73..c24eb4f813 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
@@ -84,7 +84,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -205,7 +205,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -228,7 +228,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -249,6 +249,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -392,7 +393,7 @@
         <property id="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" />
@@ -451,7 +452,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" />
@@ -1438,7 +1438,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RIvadv2InN" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817iA" />
                       </node>
                       <node concept="3TrEf2" id="2Fd5B1gxdCm" role="2OqNvi">
                         <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -1446,9 +1446,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="RIvadv2InN" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="RIvadv2InO" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817iB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1720,7 +1720,7 @@
                                 <ref role="2pIpSl" to="b0gq:7eOyx9r3qFW" resolve="unit" />
                                 <node concept="36biLy" id="76ZhK6XZ3Iq" role="28nt2d">
                                   <node concept="37vLTw" id="76ZhK6XZ3IR" role="36biLW">
-                                    <ref role="3cqZAo" node="76ZhK6XVzgl" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817iC" />
                                   </node>
                                 </node>
                               </node>
@@ -1731,9 +1731,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="76ZhK6XVzgl" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iC" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="76ZhK6XVzgm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817iD" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2015,7 +2015,7 @@
                                           <node concept="2OqwBi" id="49jLf4T7o5E" role="3uHU7B">
                                             <node concept="2OqwBi" id="49jLf4T7ia7" role="2Oq$k0">
                                               <node concept="37vLTw" id="49jLf4T7hsJ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817iE" />
                                               </node>
                                               <node concept="2Rxl7S" id="49jLf4T7n0Z" role="2OqNvi" />
                                             </node>
@@ -2026,7 +2026,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="5sKgdctVOj_" role="3uHU7w">
                                           <node concept="37vLTw" id="5sKgdctVL$D" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817iE" />
                                           </node>
                                           <node concept="3TrcHB" id="5sKgdctVQyp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2035,9 +2035,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="5sKgdctVKP4" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817iE" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="5sKgdctVKP5" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817iF" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -2987,7 +2987,7 @@
                   <node concept="3clFbF" id="7UgeC20_Fvo" role="3cqZAp">
                     <node concept="2OqwBi" id="7UgeC20_Fvp" role="3clFbG">
                       <node concept="37vLTw" id="7UgeC20_Fvq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7UgeC20_Fvv" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817iG" />
                       </node>
                       <node concept="1P9Npp" id="7UgeC20_Fvr" role="2OqNvi">
                         <node concept="2OqwBi" id="7UgeC20_Fvs" role="1P9ThW">
@@ -3000,9 +3000,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7UgeC20_Fvv" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7UgeC20_Fvw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817iH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5467,7 +5467,7 @@
                       <node concept="2OqwBi" id="4DRdDUoCUJf" role="3clFbG">
                         <node concept="2OqwBi" id="4DRdDUoCTgo" role="2Oq$k0">
                           <node concept="37vLTw" id="4DRdDUoCT8W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4DRdDUoCT4u" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iI" />
                           </node>
                           <node concept="3TrcHB" id="4DRdDUoCU6$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5482,9 +5482,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4DRdDUoCT4u" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817iI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4DRdDUoCT4v" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817iJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5589,14 +5589,14 @@
                             <ref role="3cqZAo" node="4DRdDUoCGZE" resolve="nounit" />
                           </node>
                           <node concept="37vLTw" id="2Ux6GHgYxsb" role="3uHU7B">
-                            <ref role="3cqZAo" node="2Ux6GHgYw2N" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iK" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2Ux6GHgYw2N" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817iK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2Ux6GHgYw2O" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817iL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5931,14 +5931,14 @@
                         <node concept="1rXfSq" id="3M4aPu_2GB9" role="3clFbG">
                           <ref role="37wK5l" node="3M4aPu_2pcA" resolve="isIntegerType" />
                           <node concept="37vLTw" id="3M4aPu_2GQ9" role="37wK5m">
-                            <ref role="3cqZAo" node="3M4aPu_2GnG" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iM" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3M4aPu_2GnG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817iM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3M4aPu_2GnH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817iN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8934,7 +8934,7 @@
                       <node concept="3clFbF" id="5sKgdctSk0y" role="3cqZAp">
                         <node concept="2OqwBi" id="5sKgdctSkC7" role="3clFbG">
                           <node concept="37vLTw" id="5sKgdctSk0x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5sKgdctSgiV" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iO" />
                           </node>
                           <node concept="2OwXpG" id="5sKgdctSl$e" role="2OqNvi">
                             <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -8942,9 +8942,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5sKgdctSgiV" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817iO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5sKgdctSgiW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817iP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8963,7 +8963,7 @@
                         <node concept="3clFbF" id="5sKgdctSZp4" role="3cqZAp">
                           <node concept="2OqwBi" id="5sKgdctT0oL" role="3clFbG">
                             <node concept="37vLTw" id="5sKgdctSZp3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5sKgdctSVqP" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817iQ" />
                             </node>
                             <node concept="2OwXpG" id="5sKgdctT4Gr" role="2OqNvi">
                               <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -8971,9 +8971,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5sKgdctSVqP" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817iQ" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5sKgdctSVqQ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817iR" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -9070,7 +9070,7 @@
                       <node concept="2OqwBi" id="3htFKtcjhWD" role="37vLTx">
                         <node concept="2OqwBi" id="3htFKtcjhqW" role="2Oq$k0">
                           <node concept="37vLTw" id="3htFKtcjh8W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3htFKtciTSF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iS" />
                           </node>
                           <node concept="3AV6Ez" id="3htFKtcjhEi" role="2OqNvi" />
                         </node>
@@ -9081,7 +9081,7 @@
                       <node concept="3EllGN" id="3htFKtcjeJQ" role="37vLTJ">
                         <node concept="2OqwBi" id="3htFKtcjffF" role="3ElVtu">
                           <node concept="37vLTw" id="3htFKtcjeYq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3htFKtciTSF" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iS" />
                           </node>
                           <node concept="3AY5_j" id="3htFKtcjfp7" role="2OqNvi" />
                         </node>
@@ -9092,9 +9092,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3htFKtciTSF" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3htFKtciTSG" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817iT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9189,7 +9189,7 @@
                       <node concept="2OqwBi" id="6q$NxWeXxCB" role="37vLTx">
                         <node concept="2OqwBi" id="6q$NxWeXwHl" role="2Oq$k0">
                           <node concept="37vLTw" id="6q$NxWeXwbz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6q$NxWeXtSa" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iU" />
                           </node>
                           <node concept="3AV6Ez" id="6q$NxWeXx6R" role="2OqNvi" />
                         </node>
@@ -9203,7 +9203,7 @@
                       <node concept="3EllGN" id="6q$NxWeXutC" role="37vLTJ">
                         <node concept="2OqwBi" id="6q$NxWeXvj4" role="3ElVtu">
                           <node concept="37vLTw" id="6q$NxWeXuIe" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6q$NxWeXtSa" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817iU" />
                           </node>
                           <node concept="3AY5_j" id="6q$NxWeXvG3" role="2OqNvi" />
                         </node>
@@ -9214,9 +9214,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6q$NxWeXtSa" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817iU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6q$NxWeXtSb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817iV" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/constraints.mps
index 87dd129936..e98408bc2a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/constraints.mps
@@ -69,7 +69,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -156,7 +156,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/editor.mps
index 7a8e093697..f71b75625f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/editor.mps
@@ -31,7 +31,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -117,10 +117,10 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -152,14 +152,14 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7597241200646296619" name="jetbrains.mps.lang.editor.structure.QueryFunction_SNode" flags="in" index="3k4GqP" />
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -188,7 +188,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -196,7 +196,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -209,7 +209,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="6684862045052272180" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_NodeToWrap" flags="ng" index="3N4pyC" />
@@ -321,7 +321,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>
@@ -340,7 +340,7 @@
       <concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n">
         <child id="8207263695490893799" name="symbols" index="2ElW$Z" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
@@ -435,7 +435,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/intentions.mps
index ae7afb1e2a..8cc23840b3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/intentions.mps
@@ -74,7 +74,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.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
index 5aa3c4c620..e58581cf54 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
@@ -6,7 +6,7 @@
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="-1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="-1" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -90,7 +90,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -104,7 +104,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -120,6 +120,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">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -252,7 +253,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -2198,7 +2198,7 @@
                             <node concept="2OqwBi" id="3slXa_gMfyB" role="3clFbG">
                               <node concept="2OqwBi" id="3slXa_gMdFc" role="2Oq$k0">
                                 <node concept="37vLTw" id="3slXa_gMd5q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3slXa_gMcJe" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817jc" />
                                 </node>
                                 <node concept="2yIwOk" id="3slXa_gMeJR" role="2OqNvi" />
                               </node>
@@ -2210,9 +2210,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3slXa_gMcJe" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817jc" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3slXa_gMcJf" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817jd" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2268,7 +2268,7 @@
                             <node concept="2OqwBi" id="6Z6cUqSMRQ_" role="3uHU7w">
                               <node concept="2OqwBi" id="6Z6cUqSMQwj" role="2Oq$k0">
                                 <node concept="37vLTw" id="6Z6cUqSMQ3Q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6Z6cUqSMLbc" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817je" />
                                 </node>
                                 <node concept="3TrEf2" id="6Z6cUqSMRlx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="b0gq:1KUmgSFpwWq" resolve="dimension" />
@@ -2279,7 +2279,7 @@
                             <node concept="2OqwBi" id="6Z6cUqSMOPl" role="3uHU7B">
                               <node concept="2OqwBi" id="6Z6cUqSMLWz" role="2Oq$k0">
                                 <node concept="37vLTw" id="6Z6cUqSMLss" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6Z6cUqSMLbc" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817je" />
                                 </node>
                                 <node concept="3TrcHB" id="6Z6cUqSMMJw" role="2OqNvi">
                                   <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2290,9 +2290,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Z6cUqSMLbc" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817je" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Z6cUqSMLbd" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817jf" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2312,13 +2312,13 @@
                           <node concept="1Ls8ON" id="1KUmgSFqlsm" role="33vP2m">
                             <node concept="2OqwBi" id="1KUmgSFqlsn" role="1Lso8e">
                               <node concept="37vLTw" id="1KUmgSFqlso" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1KUmgSFqiQH" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817jg" />
                               </node>
                               <node concept="1mfA1w" id="1KUmgSFqlsp" role="2OqNvi" />
                             </node>
                             <node concept="2OqwBi" id="1KUmgSFqlsq" role="1Lso8e">
                               <node concept="37vLTw" id="1KUmgSFqlsr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1KUmgSFqiQH" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817jg" />
                               </node>
                               <node concept="2NL2c5" id="1KUmgSFqlss" role="2OqNvi" />
                             </node>
@@ -2371,15 +2371,15 @@
                           </node>
                           <node concept="TSZUe" id="1KUmgSFqzzD" role="2OqNvi">
                             <node concept="37vLTw" id="1KUmgSFqzN0" role="25WWJ7">
-                              <ref role="3cqZAo" node="1KUmgSFqiQH" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817jg" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1KUmgSFqiQH" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jg" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1KUmgSFqiQI" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2421,7 +2421,7 @@
                         <node concept="2OqwBi" id="1KUmgSFqKE$" role="3clFbG">
                           <node concept="2OqwBi" id="1KUmgSFqFXA" role="2Oq$k0">
                             <node concept="37vLTw" id="1KUmgSFqFAk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1KUmgSFqCAe" resolve="parentAndUnits" />
+                              <ref role="3cqZAo" node="4z0AnX817jo" />
                             </node>
                             <node concept="3AV6Ez" id="1KUmgSFqGlQ" role="2OqNvi" />
                           </node>
@@ -2442,7 +2442,7 @@
                                         <node concept="3EllGN" id="1KUmgSFr0hz" role="37vLTJ">
                                           <node concept="2OqwBi" id="1KUmgSFr0h$" role="3ElVtu">
                                             <node concept="37vLTw" id="1KUmgSFr0h_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1KUmgSFqP61" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817ji" />
                                             </node>
                                             <node concept="3TrcHB" id="1KUmgSFr0hA" role="2OqNvi">
                                               <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2460,7 +2460,7 @@
                                     <node concept="3EllGN" id="1KUmgSFqQBi" role="3uHU7B">
                                       <node concept="2OqwBi" id="1KUmgSFqS_H" role="3ElVtu">
                                         <node concept="37vLTw" id="1KUmgSFqRv7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1KUmgSFqP61" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817ji" />
                                         </node>
                                         <node concept="3TrcHB" id="1KUmgSFqU8V" role="2OqNvi">
                                           <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2477,7 +2477,7 @@
                                     <node concept="3EllGN" id="1KUmgSFr59t" role="2Oq$k0">
                                       <node concept="2OqwBi" id="1KUmgSFr59u" role="3ElVtu">
                                         <node concept="37vLTw" id="1KUmgSFr59v" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1KUmgSFqP61" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817ji" />
                                         </node>
                                         <node concept="3TrcHB" id="1KUmgSFr59w" role="2OqNvi">
                                           <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2489,15 +2489,15 @@
                                     </node>
                                     <node concept="TSZUe" id="1KUmgSFrefL" role="2OqNvi">
                                       <node concept="37vLTw" id="1KUmgSFrezJ" role="25WWJ7">
-                                        <ref role="3cqZAo" node="1KUmgSFqP61" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817ji" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1KUmgSFqP61" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817ji" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1KUmgSFqP62" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817jj" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2525,7 +2525,7 @@
                                           <node concept="WxPPo" id="1KUmgSFrlpn" role="28ntcv">
                                             <node concept="2OqwBi" id="1KUmgSFrlpo" role="WxPPp">
                                               <node concept="37vLTw" id="1KUmgSFrlpp" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="1KUmgSFrhp0" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817jm" />
                                               </node>
                                               <node concept="3AY5_j" id="1KUmgSFrlpq" role="2OqNvi" />
                                             </node>
@@ -2539,7 +2539,7 @@
                                   <node concept="2OqwBi" id="1KUmgSFrsEp" role="3clFbG">
                                     <node concept="2OqwBi" id="1KUmgSFro8I" role="2Oq$k0">
                                       <node concept="37vLTw" id="1KUmgSFrnH3" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1KUmgSFrhp0" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817jm" />
                                       </node>
                                       <node concept="3AV6Ez" id="1KUmgSFroM8" role="2OqNvi" />
                                     </node>
@@ -2553,7 +2553,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="1KUmgSFryyy" role="37vLTJ">
                                                 <node concept="37vLTw" id="1KUmgSFrxOw" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="1KUmgSFrxmZ" resolve="it" />
+                                                  <ref role="3cqZAo" node="4z0AnX817jk" />
                                                 </node>
                                                 <node concept="3TrEf2" id="1KUmgSFrzIL" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="b0gq:1KUmgSFpwWq" resolve="dimension" />
@@ -2562,9 +2562,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="1KUmgSFrxmZ" role="1bW2Oz">
+                                        <node concept="gl6BB" id="4z0AnX817jk" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="1KUmgSFrxn0" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="4z0AnX817jl" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -2580,7 +2580,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="1KUmgSFrDIM" role="1LFl5Q">
                                         <node concept="37vLTw" id="1KUmgSFrDIN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1KUmgSFqCAe" resolve="parentAndUnits" />
+                                          <ref role="3cqZAo" node="4z0AnX817jo" />
                                         </node>
                                         <node concept="3AY5_j" id="1KUmgSFrDIO" role="2OqNvi" />
                                       </node>
@@ -2596,7 +2596,7 @@
                                     <node concept="1LFfDK" id="1KUmgSFrHdZ" role="33vP2m">
                                       <node concept="2OqwBi" id="1KUmgSFrHe0" role="1LFl5Q">
                                         <node concept="37vLTw" id="1KUmgSFrHe1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1KUmgSFqCAe" resolve="parentAndUnits" />
+                                          <ref role="3cqZAo" node="4z0AnX817jo" />
                                         </node>
                                         <node concept="3AY5_j" id="1KUmgSFrHe2" role="2OqNvi" />
                                       </node>
@@ -2625,9 +2625,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1KUmgSFrhp0" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817jm" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1KUmgSFrhp1" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817jn" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2635,9 +2635,9 @@
                       </node>
                       <node concept="3clFbH" id="1KUmgSFqCOv" role="3cqZAp" />
                     </node>
-                    <node concept="Rh6nW" id="1KUmgSFqCAe" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jo" role="1bW2Oz">
                       <property role="TrG5h" value="parentAndUnits" />
-                      <node concept="2jxLKc" id="1KUmgSFqCAf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2656,7 +2656,7 @@
                           <node concept="2OqwBi" id="6Z6cUqSN5Dy" role="3clFbG">
                             <node concept="2OqwBi" id="6Z6cUqSN4u8" role="2Oq$k0">
                               <node concept="37vLTw" id="6Z6cUqSN48h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Z6cUqSN40Y" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817jq" />
                               </node>
                               <node concept="3TrcHB" id="6Z6cUqSN582" role="2OqNvi">
                                 <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2666,9 +2666,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6Z6cUqSN40Y" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817jq" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6Z6cUqSN40Z" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817jr" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2681,7 +2681,7 @@
                           <node concept="10Nm6u" id="6Z6cUqSN8e$" role="37vLTx" />
                           <node concept="2OqwBi" id="6Z6cUqSN71A" role="37vLTJ">
                             <node concept="37vLTw" id="6Z6cUqSN6IG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Z6cUqSN6Dx" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817js" />
                             </node>
                             <node concept="3TrcHB" id="6Z6cUqSN7I8" role="2OqNvi">
                               <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2690,9 +2690,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6Z6cUqSN6Dx" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817js" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6Z6cUqSN6Dy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
index 368d475ba2..3b1731c42a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
@@ -23,7 +23,7 @@
     <import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" />
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" />
-    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.libs/)" />
+    <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.collections.libs/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -40,7 +40,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">
@@ -85,7 +85,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">
@@ -135,7 +135,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -152,7 +152,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -187,6 +187,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" />
@@ -262,7 +263,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -287,7 +288,6 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <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>
@@ -366,14 +366,14 @@
                         <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                         <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                         <node concept="37vLTw" id="7WxTcH$fRMh" role="37wK5m">
-                          <ref role="3cqZAo" node="2rzAw9UVwe9" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ju" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2rzAw9UVwe9" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ju" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2rzAw9UVwea" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817jv" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -425,14 +425,14 @@
                           <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                           <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                           <node concept="37vLTw" id="7WxTcH$fVCh" role="37wK5m">
-                            <ref role="3cqZAo" node="2rzAw9UW39_" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817jw" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2rzAw9UW39_" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2rzAw9UW39A" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -446,14 +446,14 @@
                           <ref role="cht4Q" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
                         </node>
                         <node concept="37vLTw" id="2rzAw9UW39H" role="1m5AlR">
-                          <ref role="3cqZAo" node="2rzAw9UW39I" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817jy" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2rzAw9UW39I" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817jy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2rzAw9UW39J" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817jz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -687,15 +687,15 @@
                               <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                               <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                               <node concept="37vLTw" id="66PK8Syl9ws" role="37wK5m">
-                                <ref role="3cqZAo" node="2rzAw9UZA6B" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817j$" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2rzAw9UZA6B" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817j$" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2rzAw9UZA6C" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817j_" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -994,7 +994,7 @@
                         <ref role="37wK5l" to="dntf:5pSqQr$AdB$" resolve="getUnitSpecification" />
                         <ref role="1Pybhc" to="dntf:4jkbLB5RJZL" resolve="UnitConversionUtil" />
                         <node concept="37vLTw" id="2rzAw9UY1SP" role="37wK5m">
-                          <ref role="3cqZAo" node="2rzAw9UY1T2" resolve="typeWithUnit" />
+                          <ref role="3cqZAo" node="4z0AnX817jA" />
                         </node>
                       </node>
                     </node>
@@ -1028,15 +1028,15 @@
                           <ref role="3cqZAo" node="2rzAw9UY1SR" resolve="unitSpecInMap" />
                         </node>
                         <node concept="37vLTw" id="2rzAw9UY1T1" role="37wK5m">
-                          <ref role="3cqZAo" node="2rzAw9UY1T2" resolve="typeWithUnit" />
+                          <ref role="3cqZAo" node="4z0AnX817jA" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2rzAw9UY1T2" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jA" role="1bW2Oz">
                   <property role="TrG5h" value="typeWithUnit" />
-                  <node concept="2jxLKc" id="2rzAw9UY1T3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1171,7 +1171,7 @@
                       <node concept="3clFbF" id="69hlyJ6g7p0" role="3cqZAp">
                         <node concept="2OqwBi" id="69hlyJ6g7p1" role="3clFbG">
                           <node concept="37vLTw" id="69hlyJ6g7p2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="69hlyJ6g7p4" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817jC" />
                           </node>
                           <node concept="2qgKlT" id="69hlyJ6hZY8" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1179,9 +1179,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="69hlyJ6g7p4" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="69hlyJ6g7p5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1467,7 +1467,7 @@
                       <node concept="3clFbF" id="4qv99IrBJ43" role="3cqZAp">
                         <node concept="2OqwBi" id="4qv99IrBJ44" role="3clFbG">
                           <node concept="37vLTw" id="4qv99IrBJ45" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4qv99IrBJ47" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817jE" />
                           </node>
                           <node concept="liA8E" id="4qv99IrBJ46" role="2OqNvi">
                             <ref role="37wK5l" node="26cjRACVSeU" resolve="getPriorityLevel" />
@@ -1475,9 +1475,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4qv99IrBJ47" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4qv99IrBJ48" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jF" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="4qv99IrBJ49" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/structure.mps
index 485b223205..f7d283062f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/structure.mps
@@ -58,7 +58,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.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
index ece28396f7..aface9d6d6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:bf3cd5a0-eefc-4fd9-b3a6-b57643c9d80c(org.iets3.core.expr.typetags.units.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -61,7 +61,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -154,7 +154,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -178,7 +178,7 @@
       </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">
@@ -208,6 +208,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" />
@@ -414,7 +415,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" />
@@ -454,7 +455,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -928,13 +928,13 @@
                     <property role="Xl_RC" value="The specifier's type is already covered" />
                   </node>
                   <node concept="37vLTw" id="1wGuEUwrs0w" role="1urrMF">
-                    <ref role="3cqZAo" node="1wGuEUwrqnn" resolve="it" />
+                    <ref role="3cqZAo" node="4z0AnX817iW" />
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1wGuEUwrqnn" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817iW" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1wGuEUwrqno" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817iX" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1120,7 +1120,7 @@
                                   <node concept="3y3z36" id="6FK1Pb8udWl" role="3uHU7B">
                                     <node concept="2OqwBi" id="6FK1Pb8udWm" role="3uHU7B">
                                       <node concept="37vLTw" id="6FK1Pb8udWn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6FK1Pb8uaUA" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817iY" />
                                       </node>
                                       <node concept="3TrEf2" id="5Q6EZP5PnyX" role="2OqNvi">
                                         <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFY" resolve="exponent" />
@@ -1135,7 +1135,7 @@
                                     <node concept="2OqwBi" id="6FK1Pb8udWg" role="3uHU7B">
                                       <node concept="2OqwBi" id="6FK1Pb8udWh" role="2Oq$k0">
                                         <node concept="37vLTw" id="6FK1Pb8udWi" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6FK1Pb8uaUA" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817iY" />
                                         </node>
                                         <node concept="3TrEf2" id="5Q6EZP5PlXD" role="2OqNvi">
                                           <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFY" resolve="exponent" />
@@ -1149,9 +1149,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6FK1Pb8uaUA" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817iY" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6FK1Pb8uaUB" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817iZ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2785,15 +2785,15 @@
                         <node concept="3clFbF" id="77FPJvcTsNH" role="3cqZAp">
                           <node concept="2OqwBi" id="77FPJvcTv70" role="3clFbG">
                             <node concept="37vLTw" id="77FPJvcTsNG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="77FPJvcTsaj" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817j0" />
                             </node>
                             <node concept="1$rogu" id="77FPJvcTvAz" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="77FPJvcTsaj" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817j0" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="77FPJvcTsak" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817j1" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4570,7 +4570,7 @@
                       <node concept="3clFbF" id="77FPJvcIdAw" role="3cqZAp">
                         <node concept="2OqwBi" id="77FPJvcIdAx" role="3clFbG">
                           <node concept="37vLTw" id="77FPJvcIdAy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="77FPJvcIdAU" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817j2" />
                           </node>
                           <node concept="1P9Npp" id="77FPJvcIdAz" role="2OqNvi">
                             <node concept="37vLTw" id="77FPJvcIdA$" role="1P9ThW">
@@ -4593,7 +4593,7 @@
                         <node concept="3clFbF" id="77FPJvcIdAN" role="3cqZAp">
                           <node concept="2OqwBi" id="77FPJvcIdAO" role="3clFbG">
                             <node concept="37vLTw" id="77FPJvcIdAP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="77FPJvcIdAU" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817j2" />
                             </node>
                             <node concept="1P9Npp" id="77FPJvcIdAQ" role="2OqNvi">
                               <node concept="2OqwBi" id="77FPJvcIdAR" role="1P9ThW">
@@ -4609,9 +4609,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="77FPJvcIdAU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817j2" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="77FPJvcIdAV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817j3" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4961,7 +4961,7 @@
                       <node concept="3clFbF" id="4CJErGj9uEg" role="3cqZAp">
                         <node concept="2OqwBi" id="4CJErGj9uEh" role="3clFbG">
                           <node concept="37vLTw" id="4CJErGj9uEi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4CJErGj9uEl" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817j4" />
                           </node>
                           <node concept="1mIQ4w" id="4CJErGj9uEj" role="2OqNvi">
                             <node concept="chp4Y" id="4CJErGj9uEk" role="cj9EA">
@@ -4971,9 +4971,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4CJErGj9uEl" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817j4" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4CJErGj9uEm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817j5" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4987,14 +4987,14 @@
                           <ref role="cht4Q" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
                         </node>
                         <node concept="37vLTw" id="4CJErGj9uEt" role="1m5AlR">
-                          <ref role="3cqZAo" node="4CJErGj9uEu" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817j6" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4CJErGj9uEu" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817j6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4CJErGj9uEv" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817j7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -5037,7 +5037,7 @@
                     <node concept="2OqwBi" id="4CJErGj9uEL" role="3clFbG">
                       <node concept="2OqwBi" id="4CJErGj9uEM" role="2Oq$k0">
                         <node concept="37vLTw" id="4CJErGj9uEN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4CJErGj9uEY" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ja" />
                         </node>
                         <node concept="3Tsc0h" id="4CJErGj9uEO" role="2OqNvi">
                           <ref role="3TtcxE" to="b0gq:7eOyx9r3qG3" resolve="components" />
@@ -5054,7 +5054,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4CJErGj9uET" role="1m5AlR">
                                   <node concept="37vLTw" id="4CJErGj9uEU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4CJErGj9uEW" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817j8" />
                                   </node>
                                   <node concept="3TrEf2" id="4CJErGj9uEV" role="2OqNvi">
                                     <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -5063,18 +5063,18 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4CJErGj9uEW" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817j8" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4CJErGj9uEX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817j9" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4CJErGj9uEY" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ja" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4CJErGj9uEZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jb" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl
index a33342bb3a..6142484e22 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">6fadc44e-69c2-4a4a-9d16-7ebf5f8d3ba0(org.iets3.core.expr.math)</dependency>
@@ -33,7 +32,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -62,7 +61,7 @@
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/generator/template/main@generator.mps
index f9a147b05c..b954e99c3a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/generator/template/main@generator.mps
@@ -58,7 +58,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
index ac513a1603..38983fd2ec 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
@@ -7,7 +7,7 @@
     <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="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -158,7 +158,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -181,7 +181,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="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -190,6 +190,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" />
@@ -291,7 +292,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" />
@@ -329,7 +330,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1205598340672" name="jetbrains.mps.baseLanguage.collections.structure.DisjunctOperation" flags="nn" index="2NgGto" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
@@ -752,7 +752,7 @@
                         <node concept="3clFbF" id="4HxogODR9T7" role="3cqZAp">
                           <node concept="2OqwBi" id="4HxogODR9Xl" role="3clFbG">
                             <node concept="37vLTw" id="4HxogODR9T6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4HxogODR9Ol" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817jG" />
                             </node>
                             <node concept="2qgKlT" id="4HxogODRa6r" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -760,9 +760,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4HxogODR9Ol" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817jG" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4HxogODR9Om" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817jH" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1961,7 +1961,7 @@
                         <node concept="3clFbF" id="2Ux6GHgZEJU" role="3cqZAp">
                           <node concept="2OqwBi" id="2Ux6GHgZEJV" role="3clFbG">
                             <node concept="37vLTw" id="2Ux6GHgZEJW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2Ux6GHgZEJY" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817jI" />
                             </node>
                             <node concept="2qgKlT" id="2Ux6GHgZEJX" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1969,9 +1969,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2Ux6GHgZEJY" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817jI" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2Ux6GHgZEJZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817jJ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/constraints.mps
index c07d3210b1..ac0f5bf9b5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/constraints.mps
@@ -37,7 +37,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.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
index d101cab8ca..4b68e3b4c4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
@@ -71,15 +71,15 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -102,7 +102,7 @@
       </concept>
       <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -122,12 +122,12 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -138,7 +138,7 @@
         <child id="4233361609415240998" name="part" index="1GhOri" />
         <child id="4233361609415241000" name="parameterQuery" index="1GhOrs" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -232,7 +232,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>
@@ -247,6 +247,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -335,7 +336,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -360,7 +361,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -856,7 +856,7 @@
                         <node concept="3clFbF" id="76ZhK6Y0I6v" role="3cqZAp">
                           <node concept="2OqwBi" id="76ZhK6Y0IqU" role="3clFbG">
                             <node concept="37vLTw" id="76ZhK6Y0I6u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="76ZhK6Y0HRc" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817jK" />
                             </node>
                             <node concept="2qgKlT" id="76ZhK6Y0J$O" role="2OqNvi">
                               <ref role="37wK5l" to="qlm2:2Ux6GHgZEiG" resolve="canTagExpression" />
@@ -864,9 +864,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="76ZhK6Y0HRc" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817jK" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="76ZhK6Y0HRd" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817jL" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/structure.mps
index 40f9616eb5..ec7bacbc72 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps
index e30c10f103..0ad93a763d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:42a3bc53-29b1-44d6-9767-7c921cef7ba0(org.iets3.core.expr.typetags.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" 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="11" />
@@ -40,7 +40,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">
@@ -126,7 +126,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,7 +146,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -302,7 +302,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl
index 109f76ab13..f51efa3f14 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl
@@ -34,7 +34,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -90,7 +90,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
@@ -109,7 +108,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
index 38b09430e0..c05e4dcde8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -73,7 +73,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">
@@ -154,7 +154,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,7 +171,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -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" />
@@ -323,7 +324,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -365,7 +366,6 @@
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -496,7 +496,7 @@
                         </node>
                         <node concept="2OqwBi" id="6kR0qIbwYQB" role="3uHU7B">
                           <node concept="37vLTw" id="6kR0qIbwYMW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6kR0qIbwYik" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817jN" />
                           </node>
                           <node concept="3TrEf2" id="6kR0qIbwYYo" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -506,7 +506,7 @@
                       <node concept="3clFbC" id="6kR0qIbwYB$" role="3uHU7B">
                         <node concept="2OqwBi" id="6kR0qIbwYoL" role="3uHU7B">
                           <node concept="37vLTw" id="6kR0qIbwYlj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6kR0qIbwYik" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817jN" />
                           </node>
                           <node concept="3TrEf2" id="6kR0qIbwYuJ" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -519,9 +519,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6kR0qIbwYik" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jN" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6kR0qIbwYil" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jO" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -744,7 +744,7 @@
                         <node concept="2OqwBi" id="29Y5P9UXY6D" role="3clFbG">
                           <node concept="2OqwBi" id="4bJfPIwJanO" role="2Oq$k0">
                             <node concept="37vLTw" id="4bJfPIwJanP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4bJfPIwJanS" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817jP" />
                             </node>
                             <node concept="3Tsc0h" id="29Y5P9UXUqa" role="2OqNvi">
                               <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -754,9 +754,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4bJfPIwJanS" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817jP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4bJfPIwJanT" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817jQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -777,7 +777,7 @@
                     <node concept="2OqwBi" id="29Y5P9UXOGa" role="3clFbG">
                       <node concept="2OqwBi" id="4bJfPIwJ7B0" role="2Oq$k0">
                         <node concept="37vLTw" id="4bJfPIwJ7B1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4bJfPIwJ7B4" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817jR" />
                         </node>
                         <node concept="3Tsc0h" id="29Y5P9UXPSa" role="2OqNvi">
                           <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -787,9 +787,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4bJfPIwJ7B4" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jR" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4bJfPIwJ7B5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jS" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2402,7 +2402,7 @@
                   <node concept="3clFbF" id="22hm_0$bc4v" role="3cqZAp">
                     <node concept="2OqwBi" id="22hm_0$bc7I" role="3clFbG">
                       <node concept="37vLTw" id="22hm_0$bc4u" role="2Oq$k0">
-                        <ref role="3cqZAo" node="22hm_0$bc2E" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817jT" />
                       </node>
                       <node concept="2qgKlT" id="22hm_0$bcc8" role="2OqNvi">
                         <ref role="37wK5l" node="22hm_0$b7pE" resolve="isLeaf" />
@@ -2410,9 +2410,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="22hm_0$bc2E" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="22hm_0$bc2F" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2942,7 +2942,7 @@
                   <node concept="3clFbF" id="4u1MGlrMpGh" role="3cqZAp">
                     <node concept="2OqwBi" id="4u1MGlrMq29" role="3clFbG">
                       <node concept="37vLTw" id="4u1MGlrMpLY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4u1MGlrMp$L" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817jV" />
                       </node>
                       <node concept="1mIQ4w" id="4u1MGlrMqm6" role="2OqNvi">
                         <node concept="chp4Y" id="4u1MGlrMqxO" role="cj9EA">
@@ -2952,9 +2952,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4u1MGlrMp$L" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4u1MGlrMp$M" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jW" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3003,7 +3003,7 @@
                       </node>
                       <node concept="2OqwBi" id="38udS81rzW_" role="3uHU7B">
                         <node concept="37vLTw" id="38udS81rzIU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="38udS81rzCH" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817jX" />
                         </node>
                         <node concept="3TrEf2" id="38udS81r$fI" role="2OqNvi">
                           <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3012,9 +3012,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="38udS81rzCH" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="38udS81rzCI" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817jY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3051,7 +3051,7 @@
                   <node concept="3clFbF" id="38udS81rG63" role="3cqZAp">
                     <node concept="2OqwBi" id="38udS81rGmv" role="3clFbG">
                       <node concept="37vLTw" id="38udS81rG62" role="2Oq$k0">
-                        <ref role="3cqZAo" node="38udS81rFWR" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817jZ" />
                       </node>
                       <node concept="3Tsc0h" id="38udS81rG_a" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -3059,9 +3059,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="38udS81rFWR" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817jZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="38udS81rFWS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817k0" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3193,11 +3193,11 @@
                               <node concept="3clFbF" id="42T9ieTOAUy" role="3cqZAp">
                                 <node concept="3clFbC" id="42T9ieTOBIq" role="3clFbG">
                                   <node concept="37vLTw" id="42T9ieTOCJW" role="3uHU7w">
-                                    <ref role="3cqZAo" node="42T9ieTOzgL" resolve="res" />
+                                    <ref role="3cqZAo" node="4z0AnX817k3" />
                                   </node>
                                   <node concept="2OqwBi" id="42T9ieTOB9N" role="3uHU7B">
                                     <node concept="37vLTw" id="42T9ieTOAUx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="42T9ieTOAUl" resolve="content" />
+                                      <ref role="3cqZAo" node="4z0AnX817k1" />
                                     </node>
                                     <node concept="3TrEf2" id="42T9ieTOBsa" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3206,18 +3206,18 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="42T9ieTOAUl" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817k1" role="1bW2Oz">
                               <property role="TrG5h" value="content" />
-                              <node concept="2jxLKc" id="42T9ieTOAUm" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817k2" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="42T9ieTOzgL" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817k3" role="1bW2Oz">
                     <property role="TrG5h" value="res" />
-                    <node concept="2jxLKc" id="42T9ieTOzgM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817k4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3252,7 +3252,7 @@
                       <node concept="2OqwBi" id="8XWEteuTUL" role="2Oq$k0">
                         <node concept="2OqwBi" id="8XWEteuTUM" role="2Oq$k0">
                           <node concept="37vLTw" id="8XWEteuTUN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="8XWEteuTUR" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817k5" />
                           </node>
                           <node concept="3TrEf2" id="8XWEteuTUO" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3266,9 +3266,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="8XWEteuTUR" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817k5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="8XWEteuTUS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817k6" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3300,7 +3300,7 @@
                     <node concept="3clFbF" id="2s2qa7R56uh" role="3cqZAp">
                       <node concept="2OqwBi" id="2s2qa7R56ui" role="3clFbG">
                         <node concept="37vLTw" id="2s2qa7R56uj" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2s2qa7R56ul" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817k7" />
                         </node>
                         <node concept="2qgKlT" id="2s2qa7R56uk" role="2OqNvi">
                           <ref role="37wK5l" node="LvU0bhwLPQ" resolve="createComparisonExpression" />
@@ -3308,9 +3308,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2s2qa7R56ul" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817k7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2s2qa7R56um" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817k8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3340,7 +3340,7 @@
                       <node concept="2OqwBi" id="3V7UZBYHOo" role="3clFbG">
                         <node concept="2OqwBi" id="3V7UZBYFHq" role="2Oq$k0">
                           <node concept="37vLTw" id="3V7UZBYFxK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3V7UZBYFro" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817k9" />
                           </node>
                           <node concept="3Tsc0h" id="3V7UZBYFRV" role="2OqNvi">
                             <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -3350,9 +3350,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3V7UZBYFro" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817k9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3V7UZBYFrp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817ka" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3663,7 +3663,7 @@
                         <node concept="3fqX7Q" id="3V7UZBJ2W6" role="3clFbG">
                           <node concept="2OqwBi" id="3V7UZBJ2W7" role="3fr31v">
                             <node concept="37vLTw" id="3V7UZBJ2W8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3V7UZBJ2Wb" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817kb" />
                             </node>
                             <node concept="1mIQ4w" id="3V7UZBJ2W9" role="2OqNvi">
                               <node concept="chp4Y" id="3V7UZBJ2Wa" role="cj9EA">
@@ -3674,9 +3674,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3V7UZBJ2Wb" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817kb" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3V7UZBJ2Wc" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817kc" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3927,7 +3927,7 @@
                         <node concept="3fqX7Q" id="3V7UZBIXpd" role="3clFbG">
                           <node concept="2OqwBi" id="3V7UZBIYdQ" role="3fr31v">
                             <node concept="37vLTw" id="3V7UZBIXKW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3V7UZBIX3Q" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817kd" />
                             </node>
                             <node concept="1mIQ4w" id="3V7UZBIYMy" role="2OqNvi">
                               <node concept="chp4Y" id="3V7UZBIZb5" role="cj9EA">
@@ -3938,9 +3938,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3V7UZBIX3Q" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817kd" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3V7UZBIX3R" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ke" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4613,7 +4613,7 @@
                         <node concept="2OqwBi" id="3xi1F8SDsq8" role="3clFbG">
                           <node concept="2OqwBi" id="3xi1F8SDoWx" role="2Oq$k0">
                             <node concept="37vLTw" id="3xi1F8SDofY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Om1N8V0Q35" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817kh" />
                             </node>
                             <node concept="32TBzR" id="3xi1F8SDqNr" role="2OqNvi" />
                           </node>
@@ -4623,7 +4623,7 @@
                                 <node concept="Jncv_" id="3xi1F8SDxWY" role="3cqZAp">
                                   <ref role="JncvD" to="kfo3:8XWEtdYkhC" resolve="Content" />
                                   <node concept="37vLTw" id="3xi1F8SDzpl" role="JncvB">
-                                    <ref role="3cqZAo" node="3xi1F8SDuj7" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817kf" />
                                   </node>
                                   <node concept="3clFbS" id="3xi1F8SDxX0" role="Jncv$">
                                     <node concept="3cpWs6" id="3xi1F8SDBGQ" role="3cqZAp">
@@ -4651,18 +4651,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3xi1F8SDuj7" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817kf" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3xi1F8SDuj8" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817kg" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="Om1N8V0Q35" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817kh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="Om1N8V0Q36" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817ki" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4827,7 +4827,7 @@
                         <node concept="3clFbF" id="7lDeIdaBy3X" role="3cqZAp">
                           <node concept="2OqwBi" id="7lDeIdaByoR" role="3clFbG">
                             <node concept="37vLTw" id="7lDeIdaBy3W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7lDeIdaBxLW" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817kj" />
                             </node>
                             <node concept="2qgKlT" id="7lDeIdaBBxl" role="2OqNvi">
                               <ref role="37wK5l" node="7lDeIdaByVZ" resolve="renderReadable" />
@@ -4835,9 +4835,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7lDeIdaBxLW" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817kj" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7lDeIdaBxLX" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817kk" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -5458,7 +5458,7 @@
                         </node>
                         <node concept="2OqwBi" id="Nuz63e$N8O" role="3uHU7B">
                           <node concept="37vLTw" id="Nuz63e$N8P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="Nuz63e$N8R" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817kl" />
                           </node>
                           <node concept="3TrEf2" id="Nuz63e$N8Q" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -5467,9 +5467,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="Nuz63e$N8R" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817kl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="Nuz63e$N8S" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817km" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/constraints.mps
index 15ebec4fb3..025f4cdea2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/constraints.mps
@@ -56,7 +56,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
index 02653147d1..d63959929f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
@@ -7,7 +7,7 @@
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" 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" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="c73b17af-16a1-4490-8072-8a84937c5206" name="com.mbeddr.mpsutil.treenotation" version="0" />
@@ -101,7 +101,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -124,7 +124,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
@@ -155,7 +155,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" />
@@ -265,7 +265,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -290,6 +290,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -302,7 +303,7 @@
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
       </concept>
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
       <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -429,7 +430,7 @@
       <concept id="4032373061957737357" name="de.slisson.mps.tables.structure.Parameter_Index" flags="ng" index="10bopy" />
       <concept id="4032373061957735279" name="de.slisson.mps.tables.structure.HeaderQuery_InsertNew" flags="ig" index="10boU0" />
       <concept id="4032373061970539014" name="de.slisson.mps.tables.structure.QueryParameter_EditorContext" flags="ng" index="1frAZD" />
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -523,7 +524,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -544,7 +545,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -825,7 +825,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3DYDRw0Kc2Y" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0KbYQ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3DYDRw0KbWL" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kn" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0Ke$o" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -834,9 +834,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3DYDRw0KbWL" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817kn" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3DYDRw0KbWM" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817ko" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -847,15 +847,15 @@
                             <node concept="3clFbF" id="3DYDRw0Kf6$" role="3cqZAp">
                               <node concept="2OqwBi" id="3DYDRw0KfbO" role="3clFbG">
                                 <node concept="37vLTw" id="3DYDRw0Kf6z" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3DYDRw0Kf1u" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817kp" />
                                 </node>
                                 <node concept="3YRAZt" id="3DYDRw0KfkK" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3DYDRw0Kf1u" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817kp" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3DYDRw0Kf1v" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817kq" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -954,7 +954,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3DYDRw0Kg7G" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0Kg7H" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3DYDRw0Kg7J" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kr" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0KgRh" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -963,9 +963,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3DYDRw0Kg7J" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817kr" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3DYDRw0Kg7K" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817ks" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -976,15 +976,15 @@
                             <node concept="3clFbF" id="3DYDRw0Kg7O" role="3cqZAp">
                               <node concept="2OqwBi" id="3DYDRw0Kg7P" role="3clFbG">
                                 <node concept="37vLTw" id="3DYDRw0Kg7Q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3DYDRw0Kg7S" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817kt" />
                                 </node>
                                 <node concept="3YRAZt" id="3DYDRw0Kg7R" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3DYDRw0Kg7S" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817kt" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3DYDRw0Kg7T" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817ku" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1094,7 +1094,7 @@
                                 <node concept="3clFbC" id="3DYDRw0KsTi" role="3uHU7w">
                                   <node concept="2OqwBi" id="3DYDRw0KsnG" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0KsfP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3DYDRw0Krsw" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kv" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0Kswo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -1107,7 +1107,7 @@
                                 <node concept="3clFbC" id="3DYDRw0KrWr" role="3uHU7B">
                                   <node concept="2OqwBi" id="3DYDRw0KrCH" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0Kryx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3DYDRw0Krsw" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kv" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0KrM3" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -1120,9 +1120,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3DYDRw0Krsw" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817kv" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3DYDRw0Krsx" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817kw" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1199,7 +1199,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="5yPljRYe7LG" role="3uHU7B">
                                           <node concept="37vLTw" id="5yPljRYe7LH" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5yPljRYe7LO" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817kx" />
                                           </node>
                                           <node concept="3TrEf2" id="5yPljRYe7LI" role="2OqNvi">
                                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -1209,7 +1209,7 @@
                                       <node concept="17R0WA" id="5yPljRYe7LJ" role="3uHU7B">
                                         <node concept="2OqwBi" id="5yPljRYe7LK" role="3uHU7B">
                                           <node concept="37vLTw" id="5yPljRYe7LL" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5yPljRYe7LO" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817kx" />
                                           </node>
                                           <node concept="3TrEf2" id="5yPljRYe7LM" role="2OqNvi">
                                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -1222,9 +1222,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="5yPljRYe7LO" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817kx" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="5yPljRYe7LP" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817ky" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -1748,7 +1748,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3IFXLmixUlA" role="3uHU7B">
                                     <node concept="37vLTw" id="3IFXLmixUgE" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3IFXLmixUb_" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kz" />
                                     </node>
                                     <node concept="3TrcHB" id="3IFXLmixUDu" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1757,9 +1757,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3IFXLmixUb_" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817kz" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3IFXLmixUbA" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817k$" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2399,7 +2399,7 @@
                             </node>
                             <node concept="2OqwBi" id="4_sn_QHl$rY" role="3uHU7B">
                               <node concept="37vLTw" id="4_sn_QHl$by" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4_sn_QHl$29" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817k_" />
                               </node>
                               <node concept="3TrEf2" id="4_sn_QHl$CV" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2408,9 +2408,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4_sn_QHl$29" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817k_" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4_sn_QHl$2a" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817kA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2503,7 +2503,7 @@
                                 <node concept="17R0WA" id="5yPljRY6LW_" role="3clFbG">
                                   <node concept="2OqwBi" id="5yPljRY6LWA" role="3uHU7B">
                                     <node concept="37vLTw" id="5yPljRY6LWB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5yPljRY6LWE" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817kB" />
                                     </node>
                                     <node concept="3TrEf2" id="5yPljRY6LWC" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2515,9 +2515,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5yPljRY6LWE" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817kB" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5yPljRY6LWF" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817kC" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2807,7 +2807,7 @@
                         <node concept="3clFbF" id="Nuz63fmUld" role="3cqZAp">
                           <node concept="2OqwBi" id="Nuz63fmUGc" role="3clFbG">
                             <node concept="37vLTw" id="Nuz63fmUlc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Nuz63fmTZJ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817kD" />
                             </node>
                             <node concept="1mIQ4w" id="Nuz63fmVrT" role="2OqNvi">
                               <node concept="chp4Y" id="Nuz63fn2xe" role="cj9EA">
@@ -2817,9 +2817,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="Nuz63fmTZJ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817kD" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="Nuz63fmTZK" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817kE" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3459,7 +3459,7 @@
                                   <node concept="2OqwBi" id="5hullqu1Knj" role="2Oq$k0">
                                     <node concept="2OqwBi" id="5hullqu1Knk" role="2Oq$k0">
                                       <node concept="37vLTw" id="5hullqu1Knl" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5hullqu1KnF" resolve="row" />
+                                        <ref role="3cqZAo" node="4z0AnX817kJ" />
                                       </node>
                                       <node concept="3Tsc0h" id="5hullqu1Knm" role="2OqNvi">
                                         <ref role="3TtcxE" to="kfo3:8XWEtdYkjq" resolve="contents" />
@@ -3475,7 +3475,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="5hullqu1Knt" role="3uHU7B">
                                                 <node concept="37vLTw" id="5hullqu1Knu" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="5hullqu1Knw" resolve="c" />
+                                                  <ref role="3cqZAo" node="4z0AnX817kF" />
                                                 </node>
                                                 <node concept="3TrEf2" id="5hullqu1Knv" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3484,9 +3484,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="5hullqu1Knw" role="1bW2Oz">
+                                        <node concept="gl6BB" id="4z0AnX817kF" role="1bW2Oz">
                                           <property role="TrG5h" value="c" />
-                                          <node concept="2jxLKc" id="5hullqu1Knx" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="4z0AnX817kG" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3497,24 +3497,24 @@
                                         <node concept="3clFbF" id="5hullqu1Kn_" role="3cqZAp">
                                           <node concept="2OqwBi" id="5hullqu1KnA" role="3clFbG">
                                             <node concept="37vLTw" id="5hullqu1KnB" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5hullqu1KnD" resolve="c" />
+                                              <ref role="3cqZAo" node="4z0AnX817kH" />
                                             </node>
                                             <node concept="3YRAZt" id="5hullqu1KnC" role="2OqNvi" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="5hullqu1KnD" role="1bW2Oz">
+                                      <node concept="gl6BB" id="4z0AnX817kH" role="1bW2Oz">
                                         <property role="TrG5h" value="c" />
-                                        <node concept="2jxLKc" id="5hullqu1KnE" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="4z0AnX817kI" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5hullqu1KnF" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817kJ" role="1bW2Oz">
                               <property role="TrG5h" value="row" />
-                              <node concept="2jxLKc" id="5hullqu1KnG" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817kK" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
index 222575b3ae..8ecb3368c3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
@@ -131,7 +131,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,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">
@@ -175,6 +175,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -303,7 +304,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>
@@ -328,7 +329,6 @@
       </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -662,7 +662,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLEcpc" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLEbvT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Oac05Ij7Wu" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817kL" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLEhU1" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -714,9 +714,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Oac05Ij7Wu" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817kL" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Oac05Ij7Wv" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817kM" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -754,7 +754,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLETXB" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLETXC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Oac05IjcnA" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817kN" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLETXD" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -807,9 +807,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Oac05IjcnA" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817kN" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Oac05IjcnB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817kO" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -847,7 +847,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLEWz$" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLEWz_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Oac05Ijh7v" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817kP" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLEWzA" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -910,7 +910,7 @@
                                     <node concept="2OqwBi" id="7Oac05IjGq8" role="25WWJ7">
                                       <node concept="2OqwBi" id="7Oac05IjFYu" role="2Oq$k0">
                                         <node concept="37vLTw" id="7Oac05IjFPu" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7Oac05Ijh7v" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817kP" />
                                         </node>
                                         <node concept="3TrEf2" id="7Oac05IjGdE" role="2OqNvi">
                                           <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -938,7 +938,7 @@
                                     <node concept="2OqwBi" id="7Oac05IjKo5" role="25WWJ7">
                                       <node concept="2OqwBi" id="7Oac05IjKo6" role="2Oq$k0">
                                         <node concept="37vLTw" id="7Oac05IjKo7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7Oac05Ijh7v" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817kP" />
                                         </node>
                                         <node concept="3TrEf2" id="7Oac05IjLgw" role="2OqNvi">
                                           <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -956,9 +956,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7Oac05Ijh7v" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817kP" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Oac05Ijh7w" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817kQ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2045,7 +2045,7 @@
                             </node>
                             <node concept="2OqwBi" id="6vi7U_pxVL5" role="3uHU7B">
                               <node concept="37vLTw" id="6vi7U_pxV$E" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6vi7U_pxV3f" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817kR" />
                               </node>
                               <node concept="3TrEf2" id="6vi7U_pxVVN" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2054,9 +2054,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6vi7U_pxV3f" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817kR" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6vi7U_pxV3g" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817kS" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2067,15 +2067,15 @@
                       <node concept="3clFbF" id="6vi7U_pycwt" role="3cqZAp">
                         <node concept="2OqwBi" id="6vi7U_pycD_" role="3clFbG">
                           <node concept="37vLTw" id="6vi7U_pycws" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6vi7U_pycwi" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817kT" />
                           </node>
                           <node concept="3YRAZt" id="6vi7U_pycW8" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6vi7U_pycwi" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817kT" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6vi7U_pycwj" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817kU" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2282,7 +2282,7 @@
                         </node>
                         <node concept="2OqwBi" id="6vi7U_pwPFX" role="3uHU7B">
                           <node concept="37vLTw" id="6vi7U_pwPFY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6vi7U_pwPG0" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817kV" />
                           </node>
                           <node concept="3TrEf2" id="6vi7U_pwRVM" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -2291,9 +2291,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6vi7U_pwPG0" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817kV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6vi7U_pwPG1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817kW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2304,15 +2304,15 @@
                   <node concept="3clFbF" id="6vi7U_pwPG5" role="3cqZAp">
                     <node concept="2OqwBi" id="6vi7U_pwPG6" role="3clFbG">
                       <node concept="37vLTw" id="6vi7U_pwPG7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6vi7U_pwPG9" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817kX" />
                       </node>
                       <node concept="3YRAZt" id="6vi7U_pwPG8" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6vi7U_pwPG9" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817kX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6vi7U_pwPGa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817kY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2517,7 +2517,7 @@
                         </node>
                         <node concept="2OqwBi" id="6vi7U_pwzRg" role="3uHU7B">
                           <node concept="37vLTw" id="6vi7U_pwzCL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6vi7U_pwzvR" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817kZ" />
                           </node>
                           <node concept="3TrEf2" id="6vi7U_pw$9M" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -2526,9 +2526,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6vi7U_pwzvR" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817kZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6vi7U_pwzvS" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817l0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2539,15 +2539,15 @@
                   <node concept="3clFbF" id="6vi7U_pwNB$" role="3cqZAp">
                     <node concept="2OqwBi" id="6vi7U_pwNOr" role="3clFbG">
                       <node concept="37vLTw" id="6vi7U_pwNBz" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6vi7U_pwNBp" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817l1" />
                       </node>
                       <node concept="3YRAZt" id="6vi7U_pwOf9" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6vi7U_pwNBp" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817l1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6vi7U_pwNBq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817l2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4180,7 +4180,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="1bYFVysIU$1" role="1m5AlR">
                                               <node concept="37vLTw" id="1bYFVysIU6E" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="1bYFVysIvDj" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817l3" />
                                               </node>
                                               <node concept="3TrEf2" id="1bYFVysIVkF" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -4211,7 +4211,7 @@
                                       <node concept="36biLy" id="1bYFVysJ05h" role="36be1Z">
                                         <node concept="2OqwBi" id="1bYFVysJ0Y9" role="36biLW">
                                           <node concept="37vLTw" id="1bYFVysJ0vn" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1bYFVysIvDj" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817l3" />
                                           </node>
                                           <node concept="3TrEf2" id="1bYFVysJ1Jm" role="2OqNvi">
                                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpK" resolve="then" />
@@ -4229,9 +4229,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1bYFVysIvDj" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817l3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1bYFVysIvDk" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817l4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4276,7 +4276,7 @@
                     <node concept="3clFbF" id="1bYFVysHxOW" role="3cqZAp">
                       <node concept="2OqwBi" id="1bYFVysHxOX" role="3clFbG">
                         <node concept="37vLTw" id="1bYFVysHxOY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1bYFVysHxP1" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817l5" />
                         </node>
                         <node concept="1mIQ4w" id="1bYFVysHxOZ" role="2OqNvi">
                           <node concept="chp4Y" id="1bYFVysHxP0" role="cj9EA">
@@ -4286,9 +4286,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1bYFVysHxP1" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817l5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1bYFVysHxP2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817l6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4343,27 +4343,27 @@
                       <node concept="3clFbF" id="1bYFVysHV3B" role="3cqZAp">
                         <node concept="3K4zz7" id="1bYFVysHV3C" role="3clFbG">
                           <node concept="37vLTw" id="1bYFVysHV3D" role="3K4E3e">
-                            <ref role="3cqZAo" node="1bYFVysHV3I" resolve="a" />
+                            <ref role="3cqZAo" node="4z0AnX817l7" />
                           </node>
                           <node concept="10Nm6u" id="1bYFVysHV3E" role="3K4GZi" />
                           <node concept="13dIca" id="1bYFVysHV3F" role="3K4Cdx">
                             <node concept="37vLTw" id="1bYFVysHV3G" role="3uHU7w">
-                              <ref role="3cqZAo" node="1bYFVysHV3K" resolve="b" />
+                              <ref role="3cqZAo" node="4z0AnX817l9" />
                             </node>
                             <node concept="37vLTw" id="1bYFVysHV3H" role="3uHU7B">
-                              <ref role="3cqZAo" node="1bYFVysHV3I" resolve="a" />
+                              <ref role="3cqZAo" node="4z0AnX817l7" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1bYFVysHV3I" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817l7" role="1bW2Oz">
                       <property role="TrG5h" value="a" />
-                      <node concept="2jxLKc" id="1bYFVysHV3J" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817l8" role="1tU5fm" />
                     </node>
-                    <node concept="Rh6nW" id="1bYFVysHV3K" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817l9" role="1bW2Oz">
                       <property role="TrG5h" value="b" />
-                      <node concept="2jxLKc" id="1bYFVysHV3L" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817la" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/migration.mps
index d7573f7740..997029e840 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/migration.mps
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.expr.util/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/plugin.mps
index c3a582ceff..50c67f9202 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:8df617af-5f5f-45a6-8691-2aa535b4748e(org.iets3.core.expr.util.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
   </languages>
   <imports />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
index 7f278211e3..ffb001939c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
@@ -58,7 +58,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.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
index d1768cc7fd..2997cf24be 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:9c5c2614-fd32-4054-b6ea-f1ceb6bdd369(org.iets3.core.expr.util.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
@@ -80,7 +80,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,6 +100,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" />
@@ -261,7 +262,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -290,7 +291,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -585,7 +585,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="3DYDRw0NDNU" role="3uHU7B">
                                   <node concept="37vLTw" id="3DYDRw0NDHw" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3DYDRw0NDbr" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817lb" />
                                   </node>
                                   <node concept="3TrEf2" id="3DYDRw0NDUG" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -595,7 +595,7 @@
                               <node concept="3clFbC" id="3DYDRw0NDyp" role="3uHU7B">
                                 <node concept="2OqwBi" id="3DYDRw0NDhw" role="3uHU7B">
                                   <node concept="37vLTw" id="3DYDRw0NDdz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3DYDRw0NDbr" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817lb" />
                                   </node>
                                   <node concept="3TrEf2" id="3DYDRw0NDqX" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -608,9 +608,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3DYDRw0NDbr" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817lb" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3DYDRw0NDbs" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817lc" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1194,7 +1194,7 @@
                     <node concept="3clFbF" id="wW2kvILYjh" role="3cqZAp">
                       <node concept="2OqwBi" id="wW2kvILYnd" role="3clFbG">
                         <node concept="37vLTw" id="wW2kvILYjg" role="2Oq$k0">
-                          <ref role="3cqZAo" node="wW2kvILYhd" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817ld" />
                         </node>
                         <node concept="2qgKlT" id="wW2kvILYt8" role="2OqNvi">
                           <ref role="37wK5l" to="wthy:22hm_0$b7pE" resolve="isLeaf" />
@@ -1202,9 +1202,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="wW2kvILYhd" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ld" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="wW2kvILYhe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817le" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1363,7 +1363,7 @@
                 <node concept="3clFbF" id="8XWEtejDgz" role="3cqZAp">
                   <node concept="2OqwBi" id="8XWEtejDrJ" role="3clFbG">
                     <node concept="37vLTw" id="8XWEtejDgy" role="2Oq$k0">
-                      <ref role="3cqZAo" node="8XWEtejDd7" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817lf" />
                     </node>
                     <node concept="1mIQ4w" id="8XWEtejDAq" role="2OqNvi">
                       <node concept="chp4Y" id="8XWEtejDHK" role="cj9EA">
@@ -1373,9 +1373,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="8XWEtejDd7" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817lf" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="8XWEtejDd8" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817lg" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1837,15 +1837,15 @@
                       <node concept="3clFbF" id="6OunYCf2NN$" role="3cqZAp">
                         <node concept="2OqwBi" id="6OunYCf2NXm" role="3clFbG">
                           <node concept="37vLTw" id="6OunYCf2NNz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6OunYCf2NHZ" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817lh" />
                           </node>
                           <node concept="2yIwOk" id="6OunYCf2Oc3" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6OunYCf2NHZ" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817lh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6OunYCf2NI0" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817li" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1923,7 +1923,7 @@
                     <node concept="3clFbF" id="5aYM8itbLEg" role="3cqZAp">
                       <node concept="2OqwBi" id="5aYM8itbLSL" role="3clFbG">
                         <node concept="37vLTw" id="5aYM8itbLEf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5aYM8itbL$o" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817lj" />
                         </node>
                         <node concept="2qgKlT" id="5aYM8itbNfB" role="2OqNvi">
                           <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
@@ -1931,9 +1931,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5aYM8itbL$o" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817lj" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5aYM8itbL$p" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817lk" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -2139,7 +2139,7 @@
                                   <ref role="2pIpSl" to="kfo3:7EKPeISC$Mj" resolve="col" />
                                   <node concept="36biLy" id="7EKPeISCZcK" role="28nt2d">
                                     <node concept="37vLTw" id="7EKPeISCZcL" role="36biLW">
-                                      <ref role="3cqZAo" node="7EKPeISCZcM" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817ll" />
                                     </node>
                                   </node>
                                 </node>
@@ -2147,9 +2147,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="7EKPeISCZcM" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ll" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="7EKPeISCZcN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817lm" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl
index 91acb8f27c..0844081a4b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
@@ -48,7 +47,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -72,7 +71,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
index b329c1c46b..6b2b15543a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
@@ -4,7 +4,7 @@
   <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1f1b4a81-113d-4b88-9b67-2bae3e4f8128" name="com.mbeddr.mpsutil.projectview" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
@@ -46,6 +46,7 @@
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1207149998849" name="isAlwaysVisible" index="fJN8o" />
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <property id="997079742910640235" name="fillActionContext" index="1teQrl" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -72,7 +73,7 @@
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
       <concept id="1203680534665" name="jetbrains.mps.lang.plugin.structure.GroupAnchor" flags="ng" index="10WQ6h" />
-      <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" />
@@ -81,7 +82,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>
@@ -173,7 +174,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>
@@ -193,7 +194,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -219,6 +220,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -252,7 +254,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>
@@ -297,7 +299,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -325,7 +327,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="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -451,7 +452,7 @@
                     <node concept="3clFbF" id="6LfBX8Yg$Ya" role="3cqZAp">
                       <node concept="2OqwBi" id="6LfBX8Yg$Yb" role="3clFbG">
                         <node concept="37vLTw" id="6LfBX8Yg$Yc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6LfBX8Yg$Ye" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817mg" />
                         </node>
                         <node concept="liA8E" id="6LfBX8Yg$Yd" role="2OqNvi">
                           <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -459,9 +460,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6LfBX8Yg$Ye" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817mg" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6LfBX8Yg$Yf" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817mh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -480,7 +481,7 @@
                     <node concept="2OqwBi" id="6LfBX8YgEuh" role="3clFbG">
                       <node concept="2OqwBi" id="6LfBX8YgAau" role="2Oq$k0">
                         <node concept="37vLTw" id="6LfBX8YgA7J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6LfBX8Yg_YX" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817mi" />
                         </node>
                         <node concept="2RRcyG" id="6LfBX8YgAdn" role="2OqNvi">
                           <node concept="chp4Y" id="aofgSPMowO" role="3MHsoP">
@@ -492,9 +493,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6LfBX8Yg_YX" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mi" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6LfBX8Yg_YY" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -854,7 +855,7 @@
                                   <node concept="1Wc70l" id="4bmM0avMJp7" role="3clFbG">
                                     <node concept="2OqwBi" id="4bmM0avMJCU" role="3uHU7w">
                                       <node concept="37vLTw" id="4bmM0avMJwc" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4bmM0avMIWp" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817mk" />
                                       </node>
                                       <node concept="2qgKlT" id="4bmM0avMJQa" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -862,7 +863,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="4bmM0avMJ3w" role="3uHU7B">
                                       <node concept="37vLTw" id="4bmM0avMIZE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4bmM0avMIWp" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817mk" />
                                       </node>
                                       <node concept="2qgKlT" id="4bmM0avMJeK" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
@@ -871,9 +872,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4bmM0avMIWp" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817mk" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4bmM0avMIWq" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817ml" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -996,6 +997,7 @@
     <property role="2uzpH1" value="Run/Evaluate/Check All in Model Manually" />
     <property role="3GE5qa" value="view" />
     <property role="1teQrl" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="3HmE5WaYae3" role="tncku">
       <node concept="3clFbS" id="3HmE5WaYae4" role="2VODD2">
         <node concept="3cpWs8" id="3HmE5WaYmi_" role="3cqZAp">
@@ -1111,7 +1113,7 @@
                                   <node concept="1Wc70l" id="3HmE5WaYaes" role="3clFbG">
                                     <node concept="2OqwBi" id="3HmE5WaYaet" role="3uHU7w">
                                       <node concept="37vLTw" id="3HmE5WaYaeu" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3HmE5WaYaez" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817mm" />
                                       </node>
                                       <node concept="2qgKlT" id="3HmE5WaYaev" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -1119,7 +1121,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="3HmE5WaYaew" role="3uHU7B">
                                       <node concept="37vLTw" id="3HmE5WaYaex" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3HmE5WaYaez" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817mm" />
                                       </node>
                                       <node concept="2qgKlT" id="3HmE5WaYaey" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
@@ -1128,9 +1130,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3HmE5WaYaez" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817mm" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3HmE5WaYae$" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817mn" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1396,7 +1398,7 @@
                     <node concept="1Wc70l" id="TuTPrvRwMB" role="3clFbG">
                       <node concept="2OqwBi" id="TuTPrvRxja" role="3uHU7w">
                         <node concept="37vLTw" id="TuTPrvRx4I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="TuTPrvRv5a" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817mo" />
                         </node>
                         <node concept="2qgKlT" id="TuTPrvRxBV" role="2OqNvi">
                           <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -1404,7 +1406,7 @@
                       </node>
                       <node concept="2OqwBi" id="TuTPrvRvHM" role="3uHU7B">
                         <node concept="37vLTw" id="TuTPrvRvus" role="2Oq$k0">
-                          <ref role="3cqZAo" node="TuTPrvRv5a" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817mo" />
                         </node>
                         <node concept="2qgKlT" id="TuTPrvRwjm" role="2OqNvi">
                           <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
@@ -1413,9 +1415,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="TuTPrvRv5a" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mo" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="TuTPrvRv5b" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mp" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd
index f93733900f..e8b8fb7f8d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.plugin" uuid="07e2118e-763f-4d93-8ae6-23cf5ede3d59" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.plugin" uuid="07e2118e-763f-4d93-8ae6-23cf5ede3d59" 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">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -26,11 +25,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/behavior.mps
index 44876a8c8b..a1c4b2c857 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/behavior.mps
@@ -45,11 +45,11 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/structure.mps
index b994a86518..e81b45e3c4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/models/org/iets3/core/trace/test/structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl
index 0d9eb25141..eb39a538d7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
   </dependencies>
@@ -19,7 +18,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps
index 692c7af9ac..b3dbd4a63d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps
@@ -86,7 +86,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">
@@ -96,7 +96,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" />
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.trace/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/constraints.mps
index aa69cfbfeb..3719902f5d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/constraints.mps
@@ -31,7 +31,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
index c2804fdba9..1e01c03705 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
@@ -40,11 +40,12 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -68,7 +69,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -98,7 +99,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="2PqlIr" id="1Sur9ckOV6J">
@@ -137,7 +137,7 @@
                     <node concept="2OqwBi" id="1Sur9ckR4jc" role="1O1k6O">
                       <node concept="2OqwBi" id="1Sur9ckQjUd" role="2Oq$k0">
                         <node concept="37vLTw" id="1Sur9ckP0Tr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1Sur9ckP0$e" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817lo" />
                         </node>
                         <node concept="2Xjw5R" id="1Sur9ckQk6t" role="2OqNvi">
                           <node concept="1xMEDy" id="1Sur9ckQk6v" role="1xVPHs">
@@ -153,9 +153,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1Sur9ckP0$e" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817lo" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1Sur9ckP0$f" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817lp" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
index 3c6ba1918f..94c8b38d00 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
@@ -4,9 +4,9 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -83,7 +83,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -112,6 +112,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" />
@@ -146,7 +147,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -181,7 +182,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -250,7 +250,7 @@
                             <node concept="2OqwBi" id="1HLccB8zPT1" role="3uHU7B">
                               <node concept="2OqwBi" id="1HLccB8zPT2" role="2Oq$k0">
                                 <node concept="37vLTw" id="1HLccB8zPT3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1HLccB8zPT6" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817lq" />
                                 </node>
                                 <node concept="3TrEf2" id="1HLccB8zPT4" role="2OqNvi">
                                   <ref role="3Tt5mk" to="ci3w:1PzuxQOT_10" resolve="traceKind" />
@@ -261,9 +261,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1HLccB8zPT6" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817lq" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1HLccB8zPT7" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817lr" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -319,7 +319,7 @@
                             <node concept="2OqwBi" id="mhbzaHmHlJ" role="2Oq$k0">
                               <node concept="2OqwBi" id="mhbzaHmHlK" role="2Oq$k0">
                                 <node concept="37vLTw" id="mhbzaHmHlL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1HLccB8zGMk" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ls" />
                                 </node>
                                 <node concept="2qgKlT" id="mhbzaHmHlM" role="2OqNvi">
                                   <ref role="37wK5l" to="fp62:7qN5a9Pfhlm" resolve="getTraceSource" />
@@ -330,9 +330,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1HLccB8zGMk" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817ls" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1HLccB8zGMl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817lt" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -380,7 +380,7 @@
                               <node concept="2OqwBi" id="1HLccB8zH07" role="2Oq$k0">
                                 <node concept="2OqwBi" id="1HLccB8zH08" role="2Oq$k0">
                                   <node concept="37vLTw" id="1HLccB8zH09" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1HLccB8zH0m" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817lw" />
                                   </node>
                                   <node concept="3Tsc0h" id="1HLccB8zH0a" role="2OqNvi">
                                     <ref role="3TtcxE" to="ci3w:1PzuxQOT_1a" resolve="traceTarget" />
@@ -397,7 +397,7 @@
                                       <node concept="2OqwBi" id="mhbzaHmpxH" role="3clFbG">
                                         <node concept="2OqwBi" id="mhbzaHmpxI" role="2Oq$k0">
                                           <node concept="37vLTw" id="mhbzaHmpxJ" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1HLccB8zH0j" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817lu" />
                                           </node>
                                           <node concept="2yIwOk" id="mhbzaHmpxK" role="2OqNvi" />
                                         </node>
@@ -413,9 +413,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="1HLccB8zH0j" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817lu" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="1HLccB8zH0k" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817lv" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -424,9 +424,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1HLccB8zH0m" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817lw" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1HLccB8zH0n" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817lx" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -835,7 +835,7 @@
                       <node concept="3clFbF" id="1HLccB8vN07" role="3cqZAp">
                         <node concept="2OqwBi" id="1HLccB8vN08" role="3clFbG">
                           <node concept="37vLTw" id="1HLccB8vN09" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1HLccB8vN0c" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817ly" />
                           </node>
                           <node concept="1mIQ4w" id="1HLccB8vN0a" role="2OqNvi">
                             <node concept="chp4Y" id="1HLccB8vN0b" role="cj9EA">
@@ -845,9 +845,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1HLccB8vN0c" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ly" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1HLccB8vN0d" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817lz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -983,7 +983,7 @@
                         <node concept="2OqwBi" id="6_Ift$_F4Yl" role="2Oq$k0">
                           <node concept="2OqwBi" id="6_Ift$_F48s" role="2Oq$k0">
                             <node concept="37vLTw" id="6_Ift$_F3XG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6_Ift$_F3Nr" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817l$" />
                             </node>
                             <node concept="2yIwOk" id="6_Ift$_F4L7" role="2OqNvi" />
                           </node>
@@ -998,9 +998,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6_Ift$_F3Nr" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817l$" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6_Ift$_F3Ns" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817l_" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1016,7 +1016,7 @@
                       </node>
                       <node concept="zAVLd" id="6_Ift$_DjDF" role="33vP2m">
                         <node concept="37vLTw" id="6_Ift$_DjDG" role="2GiN3p">
-                          <ref role="3cqZAo" node="6_Ift$_DjDO" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817lA" />
                         </node>
                         <node concept="zAVLb" id="6_Ift$_DjDH" role="1C5ry4">
                           <ref role="2$JaeB" to="qo9z:1Sur9ckOV6J" resolve="FindTraces" />
@@ -1040,9 +1040,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6_Ift$_DjDO" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817lA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6_Ift$_DjDP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817lB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1090,7 +1090,7 @@
                         <node concept="2OqwBi" id="6_Ift$_PDBW" role="3uHU7B">
                           <node concept="2OqwBi" id="6_Ift$_OnOS" role="2Oq$k0">
                             <node concept="37vLTw" id="6_Ift$_OnOT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6_Ift$_OnOV" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817lC" />
                             </node>
                             <node concept="3TrEf2" id="6_Ift$_OnOU" role="2OqNvi">
                               <ref role="3Tt5mk" to="ci3w:1PzuxQOT_10" resolve="traceKind" />
@@ -1107,9 +1107,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6_Ift$_OnOV" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817lC" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6_Ift$_OnOW" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817lD" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/structure.mps
index 790003f80c..e964610987 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/structure.mps
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/org.iets3.core.trace.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/org.iets3.core.trace.mpl
index c79f926004..b9b7141c5e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/org.iets3.core.trace.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/org.iets3.core.trace.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</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" />
@@ -49,7 +48,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/behavior.mps
index 5be820485e..964012eaad 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/behavior.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
@@ -60,12 +60,12 @@
         <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="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.users/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps
index 45df3ab735..a27e1f052b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps
@@ -64,7 +64,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="1187258617779" name="jetbrains.mps.lang.editor.structure.ForegroundNullColorStyleClassItem" flags="ln" index="1I8cUB" />
@@ -115,7 +115,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>
@@ -144,7 +144,7 @@
       <concept id="1397920687864683158" name="de.slisson.mps.tables.structure.Table" flags="ng" index="2rfBfz">
         <child id="1397920687864865354" name="cells" index="2rf8GZ" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
@@ -162,7 +162,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.users/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/structure.mps
index 327e1b7485..5b7240d037 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/structure.mps
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
index 437de99810..f6f80cee12 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
@@ -48,12 +48,13 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -92,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>
@@ -111,7 +112,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="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
@@ -223,7 +223,7 @@
                         <property role="Xl_RC" value="duplicate user name" />
                       </node>
                       <node concept="37vLTw" id="7mG7sQPpng9" role="1urrMF">
-                        <ref role="3cqZAo" node="7mG7sQPplJp" resolve="u" />
+                        <ref role="3cqZAo" node="4z0AnX817lE" />
                       </node>
                     </node>
                   </node>
@@ -234,7 +234,7 @@
                     <node concept="3JPx81" id="7mG7sQPpmg7" role="2OqNvi">
                       <node concept="2OqwBi" id="7mG7sQPpmmQ" role="25WWJ7">
                         <node concept="37vLTw" id="7mG7sQPpmhZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7mG7sQPplJp" resolve="u" />
+                          <ref role="3cqZAo" node="4z0AnX817lE" />
                         </node>
                         <node concept="3TrcHB" id="7mG7sQPpmto" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -251,7 +251,7 @@
                     <node concept="TSZUe" id="7mG7sQPpnMx" role="2OqNvi">
                       <node concept="2OqwBi" id="7mG7sQPpnZH" role="25WWJ7">
                         <node concept="37vLTw" id="7mG7sQPpnQF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7mG7sQPplJp" resolve="u" />
+                          <ref role="3cqZAo" node="4z0AnX817lE" />
                         </node>
                         <node concept="3TrcHB" id="7mG7sQPpo9i" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -261,9 +261,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="7mG7sQPplJp" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817lE" role="1bW2Oz">
                 <property role="TrG5h" value="u" />
-                <node concept="2jxLKc" id="7mG7sQPplJq" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817lF" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl
index 0f2284f87c..527809c5c9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/behavior.mps
index 20e53fb343..2cec746e5d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/behavior.mps
@@ -106,7 +106,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 @@
         <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" />
@@ -202,7 +202,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.glossary/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/constraints.mps
index 5f460ff169..f69cf32d66 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/constraints.mps
@@ -32,7 +32,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps
index 85447691d4..287779f89c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps
@@ -73,7 +73,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>
@@ -90,7 +90,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" />
@@ -114,7 +114,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -218,7 +218,7 @@
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -232,7 +232,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" />
@@ -247,7 +247,7 @@
         <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
+      <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ngI" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
     </language>
@@ -284,7 +284,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.glossary/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/intentions.mps
index 470dd4a86f..bd176806f7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/intentions.mps
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,7 +113,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.glossary/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/structure.mps
index 832a293666..5391615205 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/structure.mps
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
index fc03175925..c34e46e7ca 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
@@ -55,7 +55,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -65,6 +65,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -147,7 +148,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -159,7 +160,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -336,7 +336,7 @@
                             </node>
                             <node concept="2OqwBi" id="6zaFu4oSicV" role="3uHU7B">
                               <node concept="37vLTw" id="6zaFu4oSi7w" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6zaFu4oSeLk" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817lH" />
                               </node>
                               <node concept="2yIwOk" id="6zaFu4oSipx" role="2OqNvi" />
                             </node>
@@ -344,7 +344,7 @@
                           <node concept="3clFbC" id="6zaFu4oSh4b" role="3uHU7B">
                             <node concept="2OqwBi" id="6zaFu4oSeRh" role="3uHU7B">
                               <node concept="37vLTw" id="6zaFu4oSeO8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6zaFu4oSeLk" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817lH" />
                               </node>
                               <node concept="3TrEf2" id="6zaFu4oSgVw" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tuf9:6zaFu4oS5HU" resolve="term" />
@@ -357,9 +357,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6zaFu4oSeLk" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817lH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6zaFu4oSeLl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817lI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/org.iets3.glossary.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/org.iets3.glossary.mpl
index 2076e9bbd3..a05970012e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/org.iets3.glossary.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/org.iets3.glossary.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
index 8158dea46d..d50689fcf0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
@@ -94,7 +94,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -170,7 +170,7 @@
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
       </concept>
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
@@ -212,6 +212,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" />
@@ -312,7 +313,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>
@@ -342,7 +343,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="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
@@ -770,7 +770,7 @@
                                     <node concept="3clFbF" id="AbdozcquA7" role="3cqZAp">
                                       <node concept="2OqwBi" id="AbdozcquA8" role="3clFbG">
                                         <node concept="37vLTw" id="AbdozcquA9" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="AbdozcquAb" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817lL" />
                                         </node>
                                         <node concept="2qgKlT" id="2dXqWF9F$gg" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -778,9 +778,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="AbdozcquAb" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817lL" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="AbdozcquAc" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817lM" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -813,7 +813,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="AbdozcquAr" role="3uHU7B">
                                         <node concept="37vLTw" id="AbdozcquAs" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="AbdozcquAw" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817lN" />
                                         </node>
                                         <node concept="2Xjw5R" id="AbdozcquAt" role="2OqNvi">
                                           <node concept="1xMEDy" id="AbdozcquAu" role="1xVPHs">
@@ -826,9 +826,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="AbdozcquAw" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817lN" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="AbdozcquAx" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817lO" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -900,7 +900,7 @@
                                     <node concept="3clFbF" id="3vNUe1zefqr" role="3cqZAp">
                                       <node concept="2OqwBi" id="3vNUe1zefqs" role="3clFbG">
                                         <node concept="37vLTw" id="3vNUe1zefqt" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3vNUe1zefqv" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817lP" />
                                         </node>
                                         <node concept="2qgKlT" id="3vNUe1zefqu" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -908,9 +908,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3vNUe1zefqv" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817lP" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3vNUe1zefqw" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817lQ" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -946,7 +946,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="3vNUe1zekik" role="3uHU7B">
                                           <node concept="37vLTw" id="3vNUe1zejSX" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3vNUe1zejJ9" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817lR" />
                                           </node>
                                           <node concept="2Xjw5R" id="3vNUe1zelhJ" role="2OqNvi">
                                             <node concept="1xMEDy" id="3vNUe1zelhL" role="1xVPHs">
@@ -959,9 +959,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3vNUe1zejJ9" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817lR" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3vNUe1zejJa" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817lS" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1148,14 +1148,14 @@
                                             <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
                                           </node>
                                           <node concept="37vLTw" id="4hDF5Qkghpr" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4hDF5Qkghps" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817lT" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="4hDF5Qkghps" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817lT" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4hDF5Qkghpt" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817lU" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1287,7 +1287,7 @@
                                             <ref role="2pJxcJ" to="kdzh:QkG2t1bKwB" resolve="path" />
                                             <node concept="WxPPo" id="uuJ7IpZtxf" role="28ntcv">
                                               <node concept="37vLTw" id="4hDF5Qkghq_" role="WxPPp">
-                                                <ref role="3cqZAo" node="4hDF5QkghqA" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817lV" />
                                               </node>
                                             </node>
                                           </node>
@@ -1295,9 +1295,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4hDF5QkghqA" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817lV" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4hDF5QkghqB" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817lW" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/behavior.mps
index cc46eb1bff..d2dc2ea927 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/behavior.mps
@@ -115,7 +115,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>
@@ -132,7 +132,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">
@@ -196,7 +196,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps
index 7cb0ab11be..dd9ad09651 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl
index 3867ab91f4..c847f0fe45 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl
@@ -35,7 +35,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" />
@@ -75,7 +75,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">798100da-4f0a-421a-b991-71f8c50ce5d2(jetbrains.mps.build)</dependency>
     <dependency reexport="false">3600cb0a-44dd-4a5b-9968-22924406419e(jetbrains.mps.build.mps.tests)</dependency>
@@ -88,7 +87,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/languages/org.iets3.req.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/behavior.mps
index c7e8656137..2a7830abda 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/behavior.mps
@@ -98,7 +98,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -106,7 +106,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -175,7 +175,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/constraints.mps
index f79108a3fb..06cf1b577f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/constraints.mps
@@ -45,7 +45,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
index e440b5430c..49213bb487 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
@@ -116,15 +116,15 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <child id="1221064706952" name="query" index="1d8cEk" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -135,10 +135,10 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -175,7 +175,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" />
@@ -191,7 +191,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -310,7 +310,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -328,7 +328,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -352,6 +352,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -393,7 +394,7 @@
       <concept id="1397920687864683158" name="de.slisson.mps.tables.structure.Table" flags="ng" index="2rfBfz">
         <child id="1397920687864865354" name="cells" index="2rf8GZ" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
@@ -479,7 +480,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>
@@ -506,7 +507,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -2921,7 +2921,7 @@
                                     <node concept="2OqwBi" id="5Zn2KFQRMec" role="3fr31v">
                                       <node concept="2OqwBi" id="5Zn2KFQRMed" role="2Oq$k0">
                                         <node concept="37vLTw" id="5Zn2KFQRMee" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5Zn2KFQRMel" resolve="cc" />
+                                          <ref role="3cqZAo" node="4z0AnX817lX" />
                                         </node>
                                         <node concept="3n3YKJ" id="5Zn2KFQRMef" role="2OqNvi" />
                                       </node>
@@ -2931,7 +2931,7 @@
                                   <node concept="3fqX7Q" id="5Zn2KFQRMeh" role="3uHU7B">
                                     <node concept="2OqwBi" id="5Zn2KFQRMei" role="3fr31v">
                                       <node concept="37vLTw" id="5Zn2KFQRMej" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5Zn2KFQRMel" resolve="cc" />
+                                        <ref role="3cqZAo" node="4z0AnX817lX" />
                                       </node>
                                       <node concept="liA8E" id="5Zn2KFQRMek" role="2OqNvi">
                                         <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -2941,9 +2941,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5Zn2KFQRMel" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817lX" role="1bW2Oz">
                               <property role="TrG5h" value="cc" />
-                              <node concept="2jxLKc" id="5Zn2KFQRMem" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817lY" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3229,7 +3229,7 @@
                             <node concept="3fqX7Q" id="1T$QQLd4dsH" role="3clFbG">
                               <node concept="2OqwBi" id="1T$QQLd4dsI" role="3fr31v">
                                 <node concept="37vLTw" id="1T$QQLd4dsJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1T$QQLd4dsL" resolve="tag" />
+                                  <ref role="3cqZAo" node="4z0AnX817lZ" />
                                 </node>
                                 <node concept="liA8E" id="1T$QQLd4dsK" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -3238,9 +3238,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1T$QQLd4dsL" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817lZ" role="1bW2Oz">
                           <property role="TrG5h" value="tag" />
-                          <node concept="2jxLKc" id="1T$QQLd4dsM" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817m0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3254,14 +3254,14 @@
                             <ref role="37wK5l" node="hzYhIjiQKh" resolve="checkTag" />
                             <node concept="7Obwk" id="73kHms33$2H" role="37wK5m" />
                             <node concept="37vLTw" id="1T$QQLd4kmr" role="37wK5m">
-                              <ref role="3cqZAo" node="1T$QQLd4dsU" resolve="tag" />
+                              <ref role="3cqZAo" node="4z0AnX817m1" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1T$QQLd4dsU" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817m1" role="1bW2Oz">
                         <property role="TrG5h" value="tag" />
-                        <node concept="2jxLKc" id="1T$QQLd4dsV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817m2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3513,7 +3513,7 @@
                             <node concept="2OqwBi" id="5Zn2KFQQNO8" role="3fr31v">
                               <node concept="2OqwBi" id="5Zn2KFQQNO9" role="2Oq$k0">
                                 <node concept="37vLTw" id="5Zn2KFQQNOa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5Zn2KFQQNOh" resolve="cc" />
+                                  <ref role="3cqZAo" node="4z0AnX817m3" />
                                 </node>
                                 <node concept="3n3YKJ" id="5Zn2KFQQNOb" role="2OqNvi" />
                               </node>
@@ -3523,7 +3523,7 @@
                           <node concept="3fqX7Q" id="5Zn2KFQQNOd" role="3uHU7B">
                             <node concept="2OqwBi" id="5Zn2KFQQNOe" role="3fr31v">
                               <node concept="37vLTw" id="5Zn2KFQQNOf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5Zn2KFQQNOh" resolve="cc" />
+                                <ref role="3cqZAo" node="4z0AnX817m3" />
                               </node>
                               <node concept="liA8E" id="5Zn2KFQQNOg" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -3533,9 +3533,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5Zn2KFQQNOh" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817m3" role="1bW2Oz">
                       <property role="TrG5h" value="cc" />
-                      <node concept="2jxLKc" id="5Zn2KFQQNOi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817m4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3672,16 +3672,16 @@
                         </node>
                         <node concept="2OqwBi" id="1T$QQLd3_2S" role="3uHU7B">
                           <node concept="37vLTw" id="1T$QQLd3_2T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1T$QQLd3_2V" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817m5" />
                           </node>
                           <node concept="2yIwOk" id="1T$QQLd3_2U" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1T$QQLd3_2V" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817m5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1T$QQLd3_2W" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817m6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/intentions.mps
index 6d15d9cd74..41702f6ebc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/intentions.mps
@@ -92,7 +92,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -184,7 +184,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/structure.mps
index 3aec67e0be..93af67f3c1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/structure.mps
@@ -56,7 +56,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/org.iets3.req.core/org.iets3.req.core.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/org.iets3.req.core.mpl
index 37e9a679f8..8278862a72 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/org.iets3.req.core.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/org.iets3.req.core.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -34,7 +33,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
index 0d871b562f..b233937ab6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
@@ -3,12 +3,12 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="-1" />
     <use id="1f1b4a81-113d-4b88-9b67-2bae3e4f8128" name="com.mbeddr.mpsutil.projectview" version="-1" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
@@ -50,6 +50,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -71,7 +72,7 @@
       <concept id="1205681243813" name="jetbrains.mps.lang.plugin.structure.IsApplicableBlock" flags="in" index="2ScWuX" />
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
       <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
-      <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>
@@ -152,7 +153,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -170,7 +171,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -184,6 +185,7 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -219,7 +221,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>
@@ -295,7 +297,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -367,7 +369,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -1146,7 +1147,7 @@
                             <node concept="2OqwBi" id="5Zn2KFQQNO8" role="3fr31v">
                               <node concept="2OqwBi" id="5Zn2KFQQNO9" role="2Oq$k0">
                                 <node concept="37vLTw" id="5Zn2KFQQNOa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5Zn2KFQQNOh" resolve="cc" />
+                                  <ref role="3cqZAo" node="4z0AnX817mq" />
                                 </node>
                                 <node concept="3n3YKJ" id="5Zn2KFQQNOb" role="2OqNvi" />
                               </node>
@@ -1156,7 +1157,7 @@
                           <node concept="3fqX7Q" id="5Zn2KFQQNOd" role="3uHU7B">
                             <node concept="2OqwBi" id="5Zn2KFQQNOe" role="3fr31v">
                               <node concept="37vLTw" id="5Zn2KFQQNOf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5Zn2KFQQNOh" resolve="cc" />
+                                <ref role="3cqZAo" node="4z0AnX817mq" />
                               </node>
                               <node concept="liA8E" id="5Zn2KFQQNOg" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1166,9 +1167,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5Zn2KFQQNOh" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817mq" role="1bW2Oz">
                       <property role="TrG5h" value="cc" />
-                      <node concept="2jxLKc" id="5Zn2KFQQNOi" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817mr" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1275,7 +1276,7 @@
                         <node concept="2OqwBi" id="5Zn2KFQRMec" role="3fr31v">
                           <node concept="2OqwBi" id="5Zn2KFQRMed" role="2Oq$k0">
                             <node concept="37vLTw" id="5Zn2KFQRMee" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5Zn2KFQRMel" resolve="cc" />
+                              <ref role="3cqZAo" node="4z0AnX817ms" />
                             </node>
                             <node concept="3n3YKJ" id="5Zn2KFQRMef" role="2OqNvi" />
                           </node>
@@ -1285,7 +1286,7 @@
                       <node concept="3fqX7Q" id="5Zn2KFQRMeh" role="3uHU7B">
                         <node concept="2OqwBi" id="5Zn2KFQRMei" role="3fr31v">
                           <node concept="37vLTw" id="5Zn2KFQRMej" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5Zn2KFQRMel" resolve="cc" />
+                            <ref role="3cqZAo" node="4z0AnX817ms" />
                           </node>
                           <node concept="liA8E" id="5Zn2KFQRMek" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1295,9 +1296,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5Zn2KFQRMel" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817ms" role="1bW2Oz">
                   <property role="TrG5h" value="cc" />
-                  <node concept="2jxLKc" id="5Zn2KFQRMem" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mt" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1366,7 +1367,7 @@
                       <node concept="3fqX7Q" id="1T$QQLd4dsH" role="3clFbG">
                         <node concept="2OqwBi" id="1T$QQLd4dsI" role="3fr31v">
                           <node concept="37vLTw" id="1T$QQLd4dsJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1T$QQLd4dsL" resolve="tag" />
+                            <ref role="3cqZAo" node="4z0AnX817mu" />
                           </node>
                           <node concept="liA8E" id="1T$QQLd4dsK" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1375,9 +1376,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1T$QQLd4dsL" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817mu" role="1bW2Oz">
                     <property role="TrG5h" value="tag" />
-                    <node concept="2jxLKc" id="1T$QQLd4dsM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817mv" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1392,14 +1393,14 @@
                         <ref role="3cqZAo" node="34Lz1M9DCrr" resolve="ctx" />
                       </node>
                       <node concept="37vLTw" id="1T$QQLd4kmr" role="37wK5m">
-                        <ref role="3cqZAo" node="1T$QQLd4dsU" resolve="tag" />
+                        <ref role="3cqZAo" node="4z0AnX817mw" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1T$QQLd4dsU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mw" role="1bW2Oz">
                   <property role="TrG5h" value="tag" />
-                  <node concept="2jxLKc" id="1T$QQLd4dsV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mx" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1508,16 +1509,16 @@
                         </node>
                         <node concept="2OqwBi" id="1T$QQLd3_2S" role="3uHU7B">
                           <node concept="37vLTw" id="1T$QQLd3_2T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1T$QQLd3_2V" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817my" />
                           </node>
                           <node concept="2yIwOk" id="1T$QQLd3_2U" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1T$QQLd3_2V" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817my" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1T$QQLd3_2W" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817mz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1675,7 +1676,7 @@
                     <node concept="3fqX7Q" id="1MpR5BkUuFZ" role="3clFbG">
                       <node concept="2OqwBi" id="1MpR5BkUuG0" role="3fr31v">
                         <node concept="37vLTw" id="1MpR5BkUuG1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1MpR5BkUuG4" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817m$" />
                         </node>
                         <node concept="1mIQ4w" id="1MpR5BkUuG2" role="2OqNvi">
                           <node concept="chp4Y" id="1MpR5BkUuG3" role="cj9EA">
@@ -1686,9 +1687,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1MpR5BkUuG4" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817m$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1MpR5BkUuG5" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817m_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1713,7 +1714,7 @@
                   <node concept="3fqX7Q" id="1MpR5BkUpof" role="3clFbG">
                     <node concept="2OqwBi" id="1MpR5BkUpsg" role="3fr31v">
                       <node concept="37vLTw" id="1MpR5BkUpom" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1MpR5BkUtEf" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mA" />
                       </node>
                       <node concept="1mIQ4w" id="1MpR5BkUpC3" role="2OqNvi">
                         <node concept="chp4Y" id="1MpR5BkUpGA" role="cj9EA">
@@ -1724,9 +1725,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1MpR5BkUtEf" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817mA" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1MpR5BkUtEg" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817mB" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -1822,7 +1823,7 @@
                   <node concept="3clFbF" id="5Jew25TJ3VJ" role="3cqZAp">
                     <node concept="2OqwBi" id="5Jew25TJ42F" role="3clFbG">
                       <node concept="37vLTw" id="5Jew25TJ3VI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Jew25TJ3Qg" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mC" />
                       </node>
                       <node concept="2qgKlT" id="5Jew25TJ4ho" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1830,9 +1831,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5Jew25TJ3Qg" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mC" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5Jew25TJ3Qh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mD" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="5Jew25TJ3Qi" role="2S7zOq">
@@ -1883,6 +1884,7 @@
     <property role="TrG5h" value="AddChildRequirement" />
     <property role="2uzpH1" value="New Child Requirement" />
     <property role="3GE5qa" value="actions" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="1ognOHj$di$" role="1NuT2Z">
       <property role="TrG5h" value="req" />
       <node concept="3Tm6S6" id="1ognOHj$di_" role="1B3o_S" />
@@ -1916,6 +1918,7 @@
     <property role="TrG5h" value="NewReqActionInModule" />
     <property role="2uzpH1" value="New Requirement" />
     <property role="3GE5qa" value="actions" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="1ognOHj$IOq" role="1NuT2Z">
       <property role="TrG5h" value="c" />
       <node concept="3Tm6S6" id="1ognOHj$IOr" role="1B3o_S" />
@@ -2002,6 +2005,7 @@
     <property role="TrG5h" value="AddSiblingRequirement" />
     <property role="2uzpH1" value="New Sibling Requirement" />
     <property role="3GE5qa" value="actions" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="6LfBX8Yg5OQ" role="1NuT2Z">
       <property role="TrG5h" value="req" />
       <node concept="3Tm6S6" id="6LfBX8Yg5OR" role="1B3o_S" />
@@ -2035,6 +2039,7 @@
     <property role="TrG5h" value="DeleteRequirement" />
     <property role="2uzpH1" value="Delete" />
     <property role="3GE5qa" value="actions" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="6LfBX8Yg60S" role="1NuT2Z">
       <property role="TrG5h" value="req" />
       <node concept="3Tm6S6" id="6LfBX8Yg60T" role="1B3o_S" />
@@ -2066,6 +2071,7 @@
     <property role="TrG5h" value="NewModuleOnModel" />
     <property role="2uzpH1" value="New Requirements Document" />
     <property role="3GE5qa" value="actions" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6LfBX8YheG2" role="tncku">
       <node concept="3clFbS" id="6LfBX8YheG3" role="2VODD2">
         <node concept="3clFbF" id="6LfBX8Yhl$I" role="3cqZAp">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd
index 788b94970f..7c65b5c98f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.req.plugin" uuid="755feabd-670f-4f86-a6c7-fdff5ea88f8a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.req.plugin" uuid="755feabd-670f-4f86-a6c7-fdff5ea88f8a" 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">a3c6f642-41b7-44cb-951b-463b8427a245(org.iets3.req.core)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -33,10 +32,10 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/languages/test.iest3.component.attribute/models/behavior.mps b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/behavior.mps
index d5cf7d0f1b..55f6ae8d3f 100644
--- a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/behavior.mps
@@ -75,7 +75,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -118,7 +118,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
index 49e8a309f4..fa5244da80 100644
--- a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
@@ -59,7 +59,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -68,6 +68,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -78,7 +79,7 @@
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -87,7 +88,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
     <language id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips">
@@ -125,7 +125,7 @@
                             <node concept="3clFbF" id="48ZWgAGrgZN" role="3cqZAp">
                               <node concept="2OqwBi" id="48ZWgAGrhiK" role="3clFbG">
                                 <node concept="37vLTw" id="48ZWgAGrgZM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="48ZWgAGrgHd" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817m8" />
                                 </node>
                                 <node concept="liA8E" id="48ZWgAGris4" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
@@ -133,9 +133,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="48ZWgAGrgHd" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817m8" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="48ZWgAGrgHe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817m9" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/structure.mps b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/structure.mps
index 50ad5bfbed..8ceaf47a3a 100644
--- a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl
index d92b12b281..d8b08dc740 100644
--- a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl
+++ b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)</dependency>
   </dependencies>
@@ -19,7 +18,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.behavior.mps b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.behavior.mps
index 08f7aa9a35..28e8db1a3c 100644
--- a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.behavior.mps
@@ -41,13 +41,13 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.structure.mps b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.structure.mps
index d6eec20676..6aef4f7e4f 100644
--- a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/models/test.ts.expr.os.validNameConcept.structure.mps
@@ -30,7 +30,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl
index 23146b61e6..3071d4ab00 100644
--- a/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl
+++ b/code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.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.iets3.opensource/solutions/org.iets3.components.core.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/models/plugin.mps
index d1b8875074..db4aac4a77 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd
index 6e1d972b63..183709aef3 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.components.core.interpreter" uuid="0de469bf-07e3-4a54-981b-2edf83928944" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.components.core.interpreter" uuid="0de469bf-07e3-4a54-981b-2edf83928944" 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">f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)</dependency>
   </dependencies>
@@ -18,7 +17,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/models/adapter.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/models/adapter.mps
index c9c23c330b..0d2c61abe6 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/models/adapter.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/models/adapter.mps
@@ -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>
@@ -78,12 +78,12 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd
index 86457c22ce..ee5b057807 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.components.core.sandbox" uuid="956f8ebc-3dd5-4222-b9e9-a48fab8a7f7a" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.components.core.sandbox" uuid="956f8ebc-3dd5-4222-b9e9-a48fab8a7f7a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -22,7 +21,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/models/plugin.mps
index b5bed6a51c..bfe29e9999 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -104,7 +104,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd
index ab2d45250b..39a03d139d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.adt.interpreter" uuid="79d5345e-e919-477c-b448-d9d5f36e2f92" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.adt.interpreter" uuid="79d5345e-e919-477c-b448-d9d5f36e2f92" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -29,7 +28,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
index 4a98fb660e..8953f9cede 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.base.collections.stubs" uuid="b76a0f63-5959-456b-993a-c796cc0d0c13" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.base.collections.stubs" uuid="b76a0f63-5959-456b-993a-c796cc0d0c13" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}/lib" type="java_classes">
       <sourceRoot location="pcollections.jar" />
@@ -8,12 +8,9 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/pcollections.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/pcollections.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
index 504b7c3948..064871049a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
@@ -146,7 +146,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -167,7 +167,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -225,6 +225,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" />
@@ -275,7 +276,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -303,7 +304,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -2461,14 +2461,14 @@
                         <node concept="3clFbF" id="6el_OoxbupW" role="3cqZAp">
                           <node concept="qpA2v" id="6el_OoxbupX" role="3clFbG">
                             <node concept="37vLTw" id="6el_OoxbupY" role="3SLO0q">
-                              <ref role="3cqZAo" node="6el_OoxbupZ" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817mE" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6el_OoxbupZ" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817mE" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6el_Ooxbuq0" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817mF" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3562,7 +3562,7 @@
                         <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
                         <node concept="2OqwBi" id="30MddjY0uts" role="37wK5m">
                           <node concept="37vLTw" id="30MddjY0utt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="30MddjY0utv" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817mG" />
                           </node>
                           <node concept="3TrEf2" id="30MddjY0utu" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -3572,9 +3572,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="30MddjY0utv" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mG" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="30MddjY0utw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3605,7 +3605,7 @@
                           <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                           <node concept="2OqwBi" id="30MddjY0utI" role="37wK5m">
                             <node concept="37vLTw" id="30MddjY0utJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="30MddjY0utL" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817mI" />
                             </node>
                             <node concept="3TrEf2" id="30MddjY0utK" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -3614,9 +3614,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="30MddjY0utL" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817mI" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="30MddjY0utM" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817mJ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd
index 7372513a35..763d84cd2d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.base.interpreter" uuid="cf90f965-8554-4a16-aa0b-6387f27474ab" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.base.interpreter" uuid="cf90f965-8554-4a16-aa0b-6387f27474ab" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" 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.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
index 41af01310a..672116fdb0 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="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" />
@@ -42,7 +42,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -161,7 +161,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -218,6 +218,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
         <child id="1199542501692" name="parameterType" index="1ajw0F" />
@@ -270,7 +271,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -294,7 +295,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -376,7 +376,7 @@
                         <node concept="3clFbF" id="2Qbt$1tTUc0" role="3cqZAp">
                           <node concept="2OqwBi" id="2Qbt$1tTUc1" role="3clFbG">
                             <node concept="37vLTw" id="2Qbt$1tTUc2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2Qbt$1tTUc4" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817mK" />
                             </node>
                             <node concept="liA8E" id="2Qbt$1tTUc3" role="2OqNvi">
                               <ref role="37wK5l" to="oq0c:2Qbt$1tSwXM" resolve="getPriorityLevel" />
@@ -384,9 +384,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2Qbt$1tTUc4" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817mK" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2Qbt$1tTUc5" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817mL" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="3p6$WoEzrLB" role="2S7zOq">
@@ -2053,15 +2053,15 @@
                           <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                         </node>
                         <node concept="37vLTw" id="26cjRAD8YM1" role="2ZW6bz">
-                          <ref role="3cqZAo" node="26cjRAD8RWp" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817mM" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26cjRAD8RWp" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26cjRAD8RWq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2089,14 +2089,14 @@
                         <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACFnDl" role="2ZW6bz">
-                        <ref role="3cqZAo" node="26cjRACFnx3" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mO" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26cjRACFnx3" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26cjRACFnx4" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2124,14 +2124,14 @@
                         <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRADa0ye" role="2ZW6bz">
-                        <ref role="3cqZAo" node="26cjRADa0yf" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mQ" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26cjRADa0yf" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26cjRADa0yg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2159,14 +2159,14 @@
                         <ref role="3uigEE" to="oq0c:UN2ftLWgA8" resolve="NoneValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACFqoi" role="2ZW6bz">
-                        <ref role="3cqZAo" node="26cjRACFqoj" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mS" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26cjRACFqoj" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26cjRACFqok" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2194,14 +2194,14 @@
                         <ref role="3uigEE" to="oq0c:UN2ftLWgA8" resolve="NoneValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACKu_p" role="2ZW6bz">
-                        <ref role="3cqZAo" node="26cjRACKu_q" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817mU" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="26cjRACKu_q" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817mU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="26cjRACKu_r" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817mV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3246,7 +3246,7 @@
                         <node concept="3clFbF" id="26cjRACVUHG" role="3cqZAp">
                           <node concept="2OqwBi" id="26cjRACVUHH" role="3clFbG">
                             <node concept="37vLTw" id="26cjRACVUHI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="26cjRACVUHK" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817mW" />
                             </node>
                             <node concept="liA8E" id="26cjRACVUHJ" role="2OqNvi">
                               <ref role="37wK5l" to="oq0c:26cjRACVPUy" resolve="getPriorityLevel" />
@@ -3254,9 +3254,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="26cjRACVUHK" role="1bW2Oz">
+                      <node concept="gl6BB" id="4z0AnX817mW" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="26cjRACVUHL" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4z0AnX817mX" role="1tU5fm" />
                       </node>
                     </node>
                     <node concept="1nlBCl" id="26cjRACVUHM" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd
index 0329c9bc7b..741949ef8d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.base.runtime" uuid="dbe08fb5-334d-4b64-86a0-622406fa0e87" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.base.runtime" uuid="dbe08fb5-334d-4b64-86a0-622406fa0e87" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/models/org.iets3.core.expr.base.shared.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/models/org.iets3.core.expr.base.shared.runtime.mps
index 12cc8eee15..c964cc6a3a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/models/org.iets3.core.expr.base.shared.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/models/org.iets3.core.expr.base.shared.runtime.mps
@@ -122,7 +122,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>
@@ -140,7 +140,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -170,7 +170,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.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd
index 5d1819ed91..20df990a6b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.base.shared.runtime" uuid="00ca1323-762b-4f39-ab5a-6a6bd602dc4b" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.base.shared.runtime" uuid="00ca1323-762b-4f39-ab5a-6a6bd602dc4b" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
index 88f1c47850..640369fcf2 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
@@ -145,7 +145,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -243,6 +243,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" />
@@ -287,7 +288,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -332,7 +333,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="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
@@ -4180,24 +4180,24 @@
                                 <node concept="3clFbF" id="36hsHVfkcR7" role="3cqZAp">
                                   <node concept="2OqwBi" id="36hsHVfkd3J" role="3clFbG">
                                     <node concept="37vLTw" id="36hsHVfkcR6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="36hsHVfkcEo" resolve="a" />
+                                      <ref role="3cqZAo" node="4z0AnX817mY" />
                                     </node>
                                     <node concept="liA8E" id="36hsHVfkdwB" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Comparable.compareTo(java.lang.Object)" resolve="compareTo" />
                                       <node concept="37vLTw" id="36hsHVfke4a" role="37wK5m">
-                                        <ref role="3cqZAo" node="36hsHVfkcEq" resolve="b" />
+                                        <ref role="3cqZAo" node="4z0AnX817n0" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="36hsHVfkcEo" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817mY" role="1bW2Oz">
                                 <property role="TrG5h" value="a" />
-                                <node concept="2jxLKc" id="36hsHVfkcEp" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817mZ" role="1tU5fm" />
                               </node>
-                              <node concept="Rh6nW" id="36hsHVfkcEq" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817n0" role="1bW2Oz">
                                 <property role="TrG5h" value="b" />
-                                <node concept="2jxLKc" id="36hsHVfkcEr" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817n1" role="1tU5fm" />
                               </node>
                             </node>
                             <node concept="1nlBCl" id="36hsHVfkcEs" role="2Dq5b$">
@@ -4247,24 +4247,24 @@
                                   <node concept="3clFbF" id="36hsHVfke_N" role="3cqZAp">
                                     <node concept="2OqwBi" id="36hsHVfkeL2" role="3clFbG">
                                       <node concept="37vLTw" id="36hsHVfke_M" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="36hsHVfkepp" resolve="a" />
+                                        <ref role="3cqZAo" node="4z0AnX817n2" />
                                       </node>
                                       <node concept="liA8E" id="36hsHVfkf4a" role="2OqNvi">
                                         <ref role="37wK5l" to="wyt6:~Comparable.compareTo(java.lang.Object)" resolve="compareTo" />
                                         <node concept="37vLTw" id="36hsHVfkfBS" role="37wK5m">
-                                          <ref role="3cqZAo" node="36hsHVfkepr" resolve="b" />
+                                          <ref role="3cqZAo" node="4z0AnX817n4" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="36hsHVfkepp" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817n2" role="1bW2Oz">
                                   <property role="TrG5h" value="a" />
-                                  <node concept="2jxLKc" id="36hsHVfkepq" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817n3" role="1tU5fm" />
                                 </node>
-                                <node concept="Rh6nW" id="36hsHVfkepr" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817n4" role="1bW2Oz">
                                   <property role="TrG5h" value="b" />
-                                  <node concept="2jxLKc" id="36hsHVfkeps" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817n5" role="1tU5fm" />
                                 </node>
                               </node>
                               <node concept="1nlBCl" id="36hsHVfmg1U" role="2Dq5b$" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd
index 3bd543d210..7163670cab 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.collections.interpreter" uuid="07f696b4-29e7-4878-aefb-39cac5e8c6cc" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.collections.interpreter" uuid="07f696b4-29e7-4878-aefb-39cac5e8c6cc" 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">2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/models/org.iets3.core.expr.collections.rt.rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/models/org.iets3.core.expr.collections.rt.rt.mps
index 89eadf3b15..cba1d6464c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/models/org.iets3.core.expr.collections.rt.rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/models/org.iets3.core.expr.collections.rt.rt.mps
@@ -31,7 +31,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">
@@ -110,7 +110,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>
@@ -131,7 +131,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -142,7 +142,7 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/org.iets3.core.expr.collections.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/org.iets3.core.expr.collections.rt.msd
index 218bf64f15..f3f17e0da6 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/org.iets3.core.expr.collections.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.rt/org.iets3.core.expr.collections.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.collections.rt" uuid="272bf1ac-d70c-4dac-96a3-976884f641b8" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.collections.rt" uuid="272bf1ac-d70c-4dac-96a3-976884f641b8" 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">b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
index 717becc04b..429f833c21 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
@@ -62,7 +62,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">
@@ -95,7 +95,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>
@@ -138,6 +138,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" />
@@ -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>
@@ -176,7 +177,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
@@ -281,7 +281,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="7MYpJaZ8UQy" role="3uHU7B">
                                     <node concept="37vLTw" id="7MYpJaZ8UQz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7MYpJaZ8UQ_" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817n6" />
                                     </node>
                                     <node concept="3TrEf2" id="7MYpJaZ8UQ$" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -290,9 +290,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7MYpJaZ8UQ_" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817n6" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7MYpJaZ8UQA" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817n7" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -504,12 +504,12 @@
                                   <node concept="3clFbF" id="stdmzxqE62" role="3cqZAp">
                                     <node concept="1Ls8ON" id="stdmzxqE63" role="3clFbG">
                                       <node concept="37vLTw" id="stdmzxqE64" role="1Lso8e">
-                                        <ref role="3cqZAo" node="stdmzxqE6m" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817na" />
                                       </node>
                                       <node concept="2OqwBi" id="stdmzxqE65" role="1Lso8e">
                                         <node concept="2OqwBi" id="stdmzxqE66" role="2Oq$k0">
                                           <node concept="37vLTw" id="stdmzxqE67" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="stdmzxqE6m" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817na" />
                                           </node>
                                           <node concept="3Tsc0h" id="stdmzxqE68" role="2OqNvi">
                                             <ref role="3TtcxE" to="e9k1:cPLa7FpcRm" resolve="cells" />
@@ -525,7 +525,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="stdmzxqE6h" role="3uHU7B">
                                                     <node concept="37vLTw" id="stdmzxqE6i" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="stdmzxqE6k" resolve="it" />
+                                                      <ref role="3cqZAo" node="4z0AnX817n8" />
                                                     </node>
                                                     <node concept="3TrEf2" id="stdmzxqE6j" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -534,9 +534,9 @@
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="stdmzxqE6k" role="1bW2Oz">
+                                            <node concept="gl6BB" id="4z0AnX817n8" role="1bW2Oz">
                                               <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="stdmzxqE6l" role="1tU5fm" />
+                                              <node concept="2jxLKc" id="4z0AnX817n9" role="1tU5fm" />
                                             </node>
                                           </node>
                                         </node>
@@ -544,9 +544,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="stdmzxqE6m" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817na" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="stdmzxqE6n" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817nb" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -565,7 +565,7 @@
                                             <property role="3cmrfH" value="1" />
                                           </node>
                                           <node concept="37vLTw" id="5s2FNgbz1nn" role="1LFl5Q">
-                                            <ref role="3cqZAo" node="stdmzxqE6$" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817nc" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="5s2FNgbz1no" role="2OqNvi">
@@ -579,9 +579,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="stdmzxqE6$" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817nc" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="stdmzxqE6_" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817nd" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd
index b75980e472..ee099ff9dc 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.data.interpreter" uuid="21d0de5b-f228-4080-9857-7315c7a77001" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.data.interpreter" uuid="21d0de5b-f228-4080-9857-7315c7a77001" 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">b25b8ad1-4d3d-4e45-8c78-72091b39fdda(org.iets3.core.expr.data)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-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.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
index 59e0c4049e..f6e60c8e6c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -84,7 +84,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>
@@ -103,7 +103,7 @@
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -145,6 +145,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" />
@@ -175,7 +176,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,7 +202,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -371,7 +371,7 @@
                                 <node concept="qpA2v" id="2vkvJYT7J3M" role="3clFbG">
                                   <node concept="2OqwBi" id="2vkvJYT7Jj7" role="3SLO0q">
                                     <node concept="37vLTw" id="2vkvJYT7J9E" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2vkvJYT7H4s" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817ne" />
                                     </node>
                                     <node concept="3TrEf2" id="2vkvJYT7J$9" role="2OqNvi">
                                       <ref role="3Tt5mk" to="gx5r:2vkvJYT213x" resolve="value" />
@@ -380,9 +380,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2vkvJYT7H4s" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817ne" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2vkvJYT7H4t" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817nf" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -830,7 +830,7 @@
                       <node concept="3clFbF" id="2vkvJYTf3Z9" role="3cqZAp">
                         <node concept="2OqwBi" id="2vkvJYTf3Za" role="3clFbG">
                           <node concept="37vLTw" id="2vkvJYTf3Zb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2vkvJYTf3Ze" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817ng" />
                           </node>
                           <node concept="2qgKlT" id="2vkvJYTf3Zc" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -841,9 +841,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2vkvJYTf3Ze" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ng" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2vkvJYTf3Zf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817nh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -991,7 +991,7 @@
                             <node concept="3clFbF" id="2vkvJYTf_OK" role="3cqZAp">
                               <node concept="2OqwBi" id="2vkvJYTf_OL" role="3clFbG">
                                 <node concept="37vLTw" id="2vkvJYTf_OM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2vkvJYTf_OQ" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ni" />
                                 </node>
                                 <node concept="2qgKlT" id="2vkvJYTf_ON" role="2OqNvi">
                                   <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -1005,9 +1005,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2vkvJYTf_OQ" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817ni" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2vkvJYTf_OR" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817nj" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1094,7 +1094,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="PkV_vHz5MT" role="3uHU7B">
                                   <node concept="37vLTw" id="PkV_vHz5MU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="PkV_vHz5MW" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817nk" />
                                   </node>
                                   <node concept="3TrEf2" id="PkV_vHz5MV" role="2OqNvi">
                                     <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
@@ -1103,9 +1103,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="PkV_vHz5MW" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817nk" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="PkV_vHz5MX" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817nl" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd
index 8b170ade8c..fbe14d5ad1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.dataflow.interpreter" uuid="3a79aca0-f4b1-40f1-a3e9-259162afa77b" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.dataflow.interpreter" uuid="3a79aca0-f4b1-40f1-a3e9-259162afa77b" 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">8ba65567-1c8a-4983-beb8-0482324d7e44(org.iets3.core.expr.lambda.interpreter)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
index 495b1c5e72..191021d027 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -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>
@@ -166,6 +166,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -185,7 +186,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -197,7 +198,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -3334,14 +3334,14 @@
                     <node concept="3clFbF" id="64dkh69VXjd" role="3cqZAp">
                       <node concept="qpA2v" id="64dkh69VXjb" role="3clFbG">
                         <node concept="37vLTw" id="64dkh69VXji" role="3SLO0q">
-                          <ref role="3cqZAo" node="64dkh69VX5G" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817nm" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64dkh69VX5G" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817nm" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64dkh69VX5H" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817nn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3371,14 +3371,14 @@
                     <node concept="3clFbF" id="64dkh69WfI7" role="3cqZAp">
                       <node concept="qpA2v" id="64dkh69WfI8" role="3clFbG">
                         <node concept="37vLTw" id="64dkh69WfI9" role="3SLO0q">
-                          <ref role="3cqZAo" node="64dkh69WfIa" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817no" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="64dkh69WfIa" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817no" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="64dkh69WfIb" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817np" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/org.iets3.core.expr.datetime.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/org.iets3.core.expr.datetime.interpreter.msd
index 9d8558a70b..d281786c2c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/org.iets3.core.expr.datetime.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/org.iets3.core.expr.datetime.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.datetime.interpreter" uuid="356f24c7-748b-463e-a9e4-7973abbf5b8f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.datetime.interpreter" uuid="356f24c7-748b-463e-a9e4-7973abbf5b8f" 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">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps
index a2f858aa25..252013e828 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/models/org.iets3.core.expr.datetime.runtime.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <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="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
@@ -33,7 +33,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -156,7 +156,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -178,7 +178,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -207,7 +207,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/org.iets3.core.expr.datetime.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/org.iets3.core.expr.datetime.runtime.msd
index 8ec774952b..7b69d2bfe9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/org.iets3.core.expr.datetime.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.runtime/org.iets3.core.expr.datetime.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.datetime.runtime" uuid="957f018c-4561-4081-9ad3-b8618bf1160d" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.datetime.runtime" uuid="957f018c-4561-4081-9ad3-b8618bf1160d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
index a9872a3fdb..35993fa239 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,13 +108,14 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <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" />
@@ -163,7 +164,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -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="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -221,7 +221,7 @@
                   <node concept="3fqX7Q" id="4vZ65iK0oId" role="3clFbG">
                     <node concept="2OqwBi" id="4vZ65iK0oIf" role="3fr31v">
                       <node concept="37vLTw" id="4vZ65iK0oIg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4vZ65iK0mXq" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817nq" />
                       </node>
                       <node concept="2qgKlT" id="4vZ65iK0oIh" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2m0pXWMLk6" resolve="hideBookmark" />
@@ -230,9 +230,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="4vZ65iK0mXq" role="1bW2Oz">
+              <node concept="gl6BB" id="4z0AnX817nq" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="4vZ65iK0mXr" role="1tU5fm" />
+                <node concept="2jxLKc" id="4z0AnX817nr" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -244,21 +244,21 @@
                 <node concept="1Ls8ON" id="4vZ65iK1mzm" role="3clFbG">
                   <node concept="2OqwBi" id="4vZ65iK1kT7" role="1Lso8e">
                     <node concept="37vLTw" id="4vZ65iK1kGF" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4vZ65iK1ktI" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817ns" />
                     </node>
                     <node concept="2qgKlT" id="4vZ65iK1loQ" role="2OqNvi">
                       <ref role="37wK5l" to="srqo:4vZ65iK1hOY" resolve="getBookmarkedNode" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="4vZ65iK1mKY" role="1Lso8e">
-                    <ref role="3cqZAo" node="4vZ65iK1ktI" resolve="it" />
+                    <ref role="3cqZAo" node="4z0AnX817ns" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="Rh6nW" id="4vZ65iK1ktI" role="1bW2Oz">
+            <node concept="gl6BB" id="4z0AnX817ns" role="1bW2Oz">
               <property role="TrG5h" value="it" />
-              <node concept="2jxLKc" id="4vZ65iK1ktJ" role="1tU5fm" />
+              <node concept="2jxLKc" id="4z0AnX817nt" role="1tU5fm" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/org.iets3.core.expr.doc.plugin.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/org.iets3.core.expr.doc.plugin.msd
index 6ee1c2a204..2da43a1e8c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/org.iets3.core.expr.doc.plugin.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/org.iets3.core.expr.doc.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.doc.plugin" uuid="e29ad049-74f8-4f02-9561-62d7477f822a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.doc.plugin" uuid="e29ad049-74f8-4f02-9561-62d7477f822a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,11 +21,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/genplan.mps
index 17210fbdcc..5d55e5b50a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/genplan.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="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports />
   <registry>
@@ -17,7 +17,6 @@
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
         <property id="2209292798354050154" name="individualStepPerGenerator" index="1s431M" />
         <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -27,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -35,63 +34,91 @@
   <node concept="2VgMpV" id="6FvSwHlc89Q">
     <property role="TrG5h" value="Java_genplan" />
     <node concept="2VgMA2" id="pogkgseUJX" role="2VgMA7">
-      <node concept="2V$Bhx" id="5Jw72wd6f6i" role="1t_9vn">
-        <property role="2V$B1T" value="15d858db-2d21-4ae9-90c4-f595086d0bdf" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.util" />
+      <node concept="2Qf6Nf" id="4z0AnX816YJ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5Jw72wd6f6i" role="2Qf6Ng">
+          <property role="2V$B1T" value="15d858db-2d21-4ae9-90c4-f595086d0bdf" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.util" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="7bZFIimhGaU" role="2VgMA7">
-      <node concept="2V$Bhx" id="DHMrP91qoC" role="1t_9vn">
-        <property role="2V$B1T" value="e75207bb-7b13-40bd-b80b-c8fe625c4ee2" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.tests" />
+      <node concept="2Qf6Nf" id="4z0AnX816YK" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoC" role="2Qf6Ng">
+          <property role="2V$B1T" value="e75207bb-7b13-40bd-b80b-c8fe625c4ee2" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.tests" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="1Ds3skywDIo" role="1t_9vn">
-        <property role="2V$B1T" value="ddeeec5e-aa31-4c44-bc40-319cd452626e" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.toplevel" />
+      <node concept="2Qf6Nf" id="4z0AnX816YL" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="1Ds3skywDIo" role="2Qf6Ng">
+          <property role="2V$B1T" value="ddeeec5e-aa31-4c44-bc40-319cd452626e" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.toplevel" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="DHMrP91qoA" role="1t_9vn">
-        <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+      <node concept="2Qf6Nf" id="4z0AnX816YM" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoA" role="2Qf6Ng">
+          <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="DHMrP91qoE" role="1t_9vn">
-        <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+      <node concept="2Qf6Nf" id="4z0AnX816YN" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoE" role="2Qf6Ng">
+          <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="3haX89g2uED" role="1t_9vn">
-        <property role="2V$B1T" value="cc59a077-028a-42b0-ad86-6a1d71258691" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.datetime" />
+      <node concept="2Qf6Nf" id="4z0AnX816YO" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="3haX89g2uED" role="2Qf6Ng">
+          <property role="2V$B1T" value="cc59a077-028a-42b0-ad86-6a1d71258691" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.datetime" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="6wzrxL2VOrj" role="1t_9vn">
-        <property role="2V$B1T" value="98560bc9-b823-4181-83c6-33c39e2f5e9b" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.data" />
+      <node concept="2Qf6Nf" id="4z0AnX816YP" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6wzrxL2VOrj" role="2Qf6Ng">
+          <property role="2V$B1T" value="98560bc9-b823-4181-83c6-33c39e2f5e9b" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.data" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5CiP6OGfMcK" role="1t_9vn">
-        <property role="2V$B1T" value="4453335f-7c63-4874-b3b1-ece8c37e6d9b" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.temporal" />
+      <node concept="2Qf6Nf" id="4z0AnX816YQ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5CiP6OGfMcK" role="2Qf6Ng">
+          <property role="2V$B1T" value="4453335f-7c63-4874-b3b1-ece8c37e6d9b" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.temporal" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5LerK4rlVSC" role="1t_9vn">
-        <property role="2V$B1T" value="752cf1d3-84d1-4f2b-bbf5-4ef076a62ec7" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.messages" />
+      <node concept="2Qf6Nf" id="4z0AnX816YR" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5LerK4rlVSC" role="2Qf6Ng">
+          <property role="2V$B1T" value="752cf1d3-84d1-4f2b-bbf5-4ef076a62ec7" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.messages" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="Tm7SWq5JtX" role="1t_9vn">
-        <property role="2V$B1T" value="f9bb00ab-1f7e-40ab-9ec0-b11e02d84d0f" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.stringvalidation" />
+      <node concept="2Qf6Nf" id="4z0AnX816YS" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="Tm7SWq5JtX" role="2Qf6Ng">
+          <property role="2V$B1T" value="f9bb00ab-1f7e-40ab-9ec0-b11e02d84d0f" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.stringvalidation" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="lH$PuhTIAz" role="1t_9vn">
-        <property role="2V$B1T" value="f2abf2a6-552e-4906-ab58-930f9a79aff4" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.contracts" />
+      <node concept="2Qf6Nf" id="4z0AnX816YT" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="lH$PuhTIAz" role="2Qf6Ng">
+          <property role="2V$B1T" value="f2abf2a6-552e-4906-ab58-930f9a79aff4" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.contracts" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="6ii4I_AaKi7" role="1t_9vn">
-        <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+      <node concept="2Qf6Nf" id="4z0AnX816YU" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6ii4I_AaKi7" role="2Qf6Ng">
+          <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="4bh_m841Xu2" role="1t_9vn">
-        <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+      <node concept="2Qf6Nf" id="4z0AnX816YV" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4bh_m841Xu2" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="1URTIF$uG6y" role="1t_9vn">
-        <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+      <node concept="2Qf6Nf" id="4z0AnX816YW" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="1URTIF$uG6y" role="2Qf6Ng">
+          <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="6m3HP9nDSZG" role="2VgMA7">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan.mps
index 887e0e2983..1096e43d77 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan.mps
@@ -2,17 +2,20 @@
 <model ref="r:78ab8770-8b1b-4bd5-b5b0-b1a31a568bff(org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan)">
   <persistence version="9" />
   <languages>
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports />
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -22,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>
@@ -30,125 +33,185 @@
   <node concept="2VgMpV" id="j5CxBK9FkN">
     <property role="TrG5h" value="Interpreter_genplan" />
     <node concept="2VgMA2" id="j5CxBK9H18" role="2VgMA7">
-      <node concept="2V$Bhx" id="j5CxBK9H17" role="1t_9vn">
-        <property role="2V$B1T" value="d441fba0-f46b-43cd-b723-dad7b65da615" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.tests" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H19" role="1t_9vn">
-        <property role="2V$B1T" value="8585453e-6bfb-4d80-98de-b16074f1d86c" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.test" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1a" role="1t_9vn">
-        <property role="2V$B1T" value="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" />
-        <property role="2V$B1Q" value="com.mbeddr.core.base" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1b" role="1t_9vn">
-        <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1c" role="1t_9vn">
-        <property role="2V$B1T" value="90746344-04fd-4286-97d5-b46ae6a81709" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.migration" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1d" role="1t_9vn">
-        <property role="2V$B1T" value="47f075a6-558e-4640-a606-7ce0236c8023" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1e" role="1t_9vn">
-        <property role="2V$B1T" value="c0080a47-7e37-4558-bee9-9ae18e690549" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.extension" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1f" role="1t_9vn">
-        <property role="2V$B1T" value="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.lightweightdsl" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1g" role="1t_9vn">
-        <property role="2V$B1T" value="63e0e566-5131-447e-90e3-12ea330e1a00" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1h" role="1t_9vn">
-        <property role="2V$B1T" value="af65afd8-f0dd-4942-87d9-63a55f2a9db1" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.behavior" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1i" role="1t_9vn">
-        <property role="2V$B1T" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.smodel" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1j" role="1t_9vn">
-        <property role="2V$B1T" value="63650c59-16c8-498a-99c8-005c7ee9515d" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.access" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1k" role="1t_9vn">
-        <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1l" role="1t_9vn">
-        <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1m" role="1t_9vn">
-        <property role="2V$B1T" value="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.classifiers" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1n" role="1t_9vn">
-        <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1o" role="1t_9vn">
-        <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1p" role="1t_9vn">
-        <property role="2V$B1T" value="df345b11-b8c7-4213-ac66-48d2a9b75d88" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguageInternal" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1q" role="1t_9vn">
-        <property role="2V$B1T" value="760a0a8c-eabb-4521-8bfd-65db761a9ba3" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.logging" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1r" role="1t_9vn">
-        <property role="2V$B1T" value="d3a0fd26-445a-466c-900e-10444ddfed52" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.filepicker" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1s" role="1t_9vn">
-        <property role="2V$B1T" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter.test" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1t" role="1t_9vn">
-        <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
-        <property role="2V$B1Q" value="de.slisson.mps.richtext" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1u" role="1t_9vn">
-        <property role="2V$B1T" value="289fb12b-7f53-4ef7-bc2e-1ed2c6a7c998" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.datetime" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1v" role="1t_9vn">
-        <property role="2V$B1T" value="db8bd035-3f51-41d8-8fed-954c202d18be" />
-        <property role="2V$B1Q" value="org.iets3.analysis.base" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1w" role="1t_9vn">
-        <property role="2V$B1T" value="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" />
-        <property role="2V$B1Q" value="org.iets3.core.base" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1x" role="1t_9vn">
-        <property role="2V$B1T" value="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.base" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1y" role="1t_9vn">
-        <property role="2V$B1T" value="9464fa06-5ab9-409b-9274-64ab29588457" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.lambda" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1z" role="1t_9vn">
-        <property role="2V$B1T" value="f3eafff0-30d2-46d6-9150-f0f3b880ce27" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.path" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBK9H1$" role="1t_9vn">
-        <property role="2V$B1T" value="6b277d9a-d52d-416f-a209-1919bd737f50" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.simpleTypes" />
-      </node>
-      <node concept="2V$Bhx" id="j5CxBKgAhX" role="1t_9vn">
-        <property role="2V$B1T" value="4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.temporal" />
+      <node concept="2Qf6Nf" id="4z0AnX816YX" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H17" role="2Qf6Ng">
+          <property role="2V$B1T" value="d441fba0-f46b-43cd-b723-dad7b65da615" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.tests" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816YY" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H19" role="2Qf6Ng">
+          <property role="2V$B1T" value="8585453e-6bfb-4d80-98de-b16074f1d86c" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.test" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816YZ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1a" role="2Qf6Ng">
+          <property role="2V$B1T" value="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" />
+          <property role="2V$B1Q" value="com.mbeddr.core.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z0" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1b" role="2Qf6Ng">
+          <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z1" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1c" role="2Qf6Ng">
+          <property role="2V$B1T" value="90746344-04fd-4286-97d5-b46ae6a81709" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.migration" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z2" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1d" role="2Qf6Ng">
+          <property role="2V$B1T" value="47f075a6-558e-4640-a606-7ce0236c8023" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z3" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1e" role="2Qf6Ng">
+          <property role="2V$B1T" value="c0080a47-7e37-4558-bee9-9ae18e690549" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.extension" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z4" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1f" role="2Qf6Ng">
+          <property role="2V$B1T" value="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.lightweightdsl" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z5" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1g" role="2Qf6Ng">
+          <property role="2V$B1T" value="63e0e566-5131-447e-90e3-12ea330e1a00" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z6" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1h" role="2Qf6Ng">
+          <property role="2V$B1T" value="af65afd8-f0dd-4942-87d9-63a55f2a9db1" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.behavior" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z7" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1i" role="2Qf6Ng">
+          <property role="2V$B1T" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.smodel" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z8" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1j" role="2Qf6Ng">
+          <property role="2V$B1T" value="63650c59-16c8-498a-99c8-005c7ee9515d" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.access" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z9" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1k" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Za" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1l" role="2Qf6Ng">
+          <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zb" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1m" role="2Qf6Ng">
+          <property role="2V$B1T" value="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.classifiers" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zc" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1n" role="2Qf6Ng">
+          <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zd" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1o" role="2Qf6Ng">
+          <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Ze" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1p" role="2Qf6Ng">
+          <property role="2V$B1T" value="df345b11-b8c7-4213-ac66-48d2a9b75d88" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguageInternal" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zf" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1q" role="2Qf6Ng">
+          <property role="2V$B1T" value="760a0a8c-eabb-4521-8bfd-65db761a9ba3" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.logging" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zg" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1r" role="2Qf6Ng">
+          <property role="2V$B1T" value="d3a0fd26-445a-466c-900e-10444ddfed52" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.filepicker" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zh" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1s" role="2Qf6Ng">
+          <property role="2V$B1T" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter.test" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zi" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1t" role="2Qf6Ng">
+          <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
+          <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zj" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1u" role="2Qf6Ng">
+          <property role="2V$B1T" value="289fb12b-7f53-4ef7-bc2e-1ed2c6a7c998" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.datetime" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zk" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1v" role="2Qf6Ng">
+          <property role="2V$B1T" value="db8bd035-3f51-41d8-8fed-954c202d18be" />
+          <property role="2V$B1Q" value="org.iets3.analysis.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zl" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1w" role="2Qf6Ng">
+          <property role="2V$B1T" value="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" />
+          <property role="2V$B1Q" value="org.iets3.core.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zm" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1x" role="2Qf6Ng">
+          <property role="2V$B1T" value="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zn" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1y" role="2Qf6Ng">
+          <property role="2V$B1T" value="9464fa06-5ab9-409b-9274-64ab29588457" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.lambda" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zo" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1z" role="2Qf6Ng">
+          <property role="2V$B1T" value="f3eafff0-30d2-46d6-9150-f0f3b880ce27" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.path" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zp" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBK9H1$" role="2Qf6Ng">
+          <property role="2V$B1T" value="6b277d9a-d52d-416f-a209-1919bd737f50" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.simpleTypes" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Zq" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="j5CxBKgAhX" role="2Qf6Ng">
+          <property role="2V$B1T" value="4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.temporal" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.java_interpreter_genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.java_interpreter_genplan.mps
index ce71563458..1f6e562292 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.java_interpreter_genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/models/org.iets3.core.expr.genjava.advanced.genplan.java_interpreter_genplan.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="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports>
     <import index="csu1" ref="r:78ab8770-8b1b-4bd5-b5b0-b1a31a568bff(org.iets3.core.expr.genjava.advanced.genplan.interpreter_genplan)" />
@@ -22,7 +22,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/org.iets3.core.expr.genjava.advanced.genplan.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/org.iets3.core.expr.genjava.advanced.genplan.msd
index 8d68cdf0d7..cd373a686d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/org.iets3.core.expr.genjava.advanced.genplan.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.advanced.genplan/org.iets3.core.expr.genjava.advanced.genplan.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.advanced.genplan" uuid="a37d732b-a361-4dba-bc6f-f8e645007559" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.advanced.genplan" uuid="a37d732b-a361-4dba-bc6f-f8e645007559" 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:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/models/rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/models/rt.mps
index a95a013de4..db8b6756f8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/models/rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/models/rt.mps
@@ -26,7 +26,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -125,7 +125,7 @@
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -147,7 +147,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" />
@@ -161,7 +161,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/org.iets3.core.expr.genjava.base.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/org.iets3.core.expr.genjava.base.rt.msd
index 593c0d98eb..dc17748c55 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/org.iets3.core.expr.genjava.base.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.base.rt/org.iets3.core.expr.genjava.base.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.base.rt" uuid="3a6ebc02-087e-4791-9854-65244ce22d8d" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.base.rt" uuid="3a6ebc02-087e-4791-9854-65244ce22d8d" 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">646d63c6-d580-4c19-8759-e3a3123f5424(org.iets3.core.expr.genjava.messages.rt)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/interpreter_genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/interpreter_genplan.mps
index 73cfea33d5..a71ff68f8e 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/interpreter_genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/interpreter_genplan.mps
@@ -3,16 +3,19 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports />
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -22,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>
@@ -30,117 +33,173 @@
   <node concept="2VgMpV" id="4Egp0F2svxk">
     <property role="TrG5h" value="Interpreter_genplan" />
     <node concept="2VgMA2" id="6N3Rwqvd0S2" role="2VgMA7">
-      <node concept="2V$Bhx" id="6N3Rwqvd0S1" role="1t_9vn">
-        <property role="2V$B1T" value="8585453e-6bfb-4d80-98de-b16074f1d86c" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.test" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S3" role="1t_9vn">
-        <property role="2V$B1T" value="d441fba0-f46b-43cd-b723-dad7b65da615" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.tests" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S4" role="1t_9vn">
-        <property role="2V$B1T" value="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" />
-        <property role="2V$B1Q" value="com.mbeddr.core.base" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S5" role="1t_9vn">
-        <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S6" role="1t_9vn">
-        <property role="2V$B1T" value="90746344-04fd-4286-97d5-b46ae6a81709" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.migration" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S7" role="1t_9vn">
-        <property role="2V$B1T" value="47f075a6-558e-4640-a606-7ce0236c8023" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S8" role="1t_9vn">
-        <property role="2V$B1T" value="c0080a47-7e37-4558-bee9-9ae18e690549" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.extension" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0S9" role="1t_9vn">
-        <property role="2V$B1T" value="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.lightweightdsl" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sa" role="1t_9vn">
-        <property role="2V$B1T" value="63e0e566-5131-447e-90e3-12ea330e1a00" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sb" role="1t_9vn">
-        <property role="2V$B1T" value="af65afd8-f0dd-4942-87d9-63a55f2a9db1" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.behavior" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sc" role="1t_9vn">
-        <property role="2V$B1T" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.smodel" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sd" role="1t_9vn">
-        <property role="2V$B1T" value="63650c59-16c8-498a-99c8-005c7ee9515d" />
-        <property role="2V$B1Q" value="jetbrains.mps.lang.access" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Se" role="1t_9vn">
-        <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sf" role="1t_9vn">
-        <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sg" role="1t_9vn">
-        <property role="2V$B1T" value="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.classifiers" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sh" role="1t_9vn">
-        <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Si" role="1t_9vn">
-        <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sj" role="1t_9vn">
-        <property role="2V$B1T" value="df345b11-b8c7-4213-ac66-48d2a9b75d88" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguageInternal" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sk" role="1t_9vn">
-        <property role="2V$B1T" value="760a0a8c-eabb-4521-8bfd-65db761a9ba3" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.logging" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sl" role="1t_9vn">
-        <property role="2V$B1T" value="d3a0fd26-445a-466c-900e-10444ddfed52" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.filepicker" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sm" role="1t_9vn">
-        <property role="2V$B1T" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
-        <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter.test" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sn" role="1t_9vn">
-        <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
-        <property role="2V$B1Q" value="de.slisson.mps.richtext" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0So" role="1t_9vn">
-        <property role="2V$B1T" value="db8bd035-3f51-41d8-8fed-954c202d18be" />
-        <property role="2V$B1Q" value="org.iets3.analysis.base" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sp" role="1t_9vn">
-        <property role="2V$B1T" value="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" />
-        <property role="2V$B1Q" value="org.iets3.core.base" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sq" role="1t_9vn">
-        <property role="2V$B1T" value="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.base" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Sr" role="1t_9vn">
-        <property role="2V$B1T" value="9464fa06-5ab9-409b-9274-64ab29588457" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.lambda" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0Ss" role="1t_9vn">
-        <property role="2V$B1T" value="f3eafff0-30d2-46d6-9150-f0f3b880ce27" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.path" />
-      </node>
-      <node concept="2V$Bhx" id="6N3Rwqvd0St" role="1t_9vn">
-        <property role="2V$B1T" value="6b277d9a-d52d-416f-a209-1919bd737f50" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.simpleTypes" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zz" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S1" role="2Qf6Ng">
+          <property role="2V$B1T" value="8585453e-6bfb-4d80-98de-b16074f1d86c" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.test" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z$" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S3" role="2Qf6Ng">
+          <property role="2V$B1T" value="d441fba0-f46b-43cd-b723-dad7b65da615" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.tests" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816Z_" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S4" role="2Qf6Ng">
+          <property role="2V$B1T" value="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" />
+          <property role="2V$B1Q" value="com.mbeddr.core.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZA" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S5" role="2Qf6Ng">
+          <property role="2V$B1T" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.core" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZB" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S6" role="2Qf6Ng">
+          <property role="2V$B1T" value="90746344-04fd-4286-97d5-b46ae6a81709" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.migration" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZC" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S7" role="2Qf6Ng">
+          <property role="2V$B1T" value="47f075a6-558e-4640-a606-7ce0236c8023" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZD" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S8" role="2Qf6Ng">
+          <property role="2V$B1T" value="c0080a47-7e37-4558-bee9-9ae18e690549" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.extension" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZE" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0S9" role="2Qf6Ng">
+          <property role="2V$B1T" value="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.lightweightdsl" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZF" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sa" role="2Qf6Ng">
+          <property role="2V$B1T" value="63e0e566-5131-447e-90e3-12ea330e1a00" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZG" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sb" role="2Qf6Ng">
+          <property role="2V$B1T" value="af65afd8-f0dd-4942-87d9-63a55f2a9db1" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.behavior" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZH" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sc" role="2Qf6Ng">
+          <property role="2V$B1T" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.smodel" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZI" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sd" role="2Qf6Ng">
+          <property role="2V$B1T" value="63650c59-16c8-498a-99c8-005c7ee9515d" />
+          <property role="2V$B1Q" value="jetbrains.mps.lang.access" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZJ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Se" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZK" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sf" role="2Qf6Ng">
+          <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZL" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sg" role="2Qf6Ng">
+          <property role="2V$B1T" value="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.classifiers" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZM" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sh" role="2Qf6Ng">
+          <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZN" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Si" role="2Qf6Ng">
+          <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZO" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sj" role="2Qf6Ng">
+          <property role="2V$B1T" value="df345b11-b8c7-4213-ac66-48d2a9b75d88" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguageInternal" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZP" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sk" role="2Qf6Ng">
+          <property role="2V$B1T" value="760a0a8c-eabb-4521-8bfd-65db761a9ba3" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.logging" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZQ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sl" role="2Qf6Ng">
+          <property role="2V$B1T" value="d3a0fd26-445a-466c-900e-10444ddfed52" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.filepicker" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZR" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sm" role="2Qf6Ng">
+          <property role="2V$B1T" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+          <property role="2V$B1Q" value="com.mbeddr.mpsutil.interpreter.test" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZS" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sn" role="2Qf6Ng">
+          <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
+          <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZT" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0So" role="2Qf6Ng">
+          <property role="2V$B1T" value="db8bd035-3f51-41d8-8fed-954c202d18be" />
+          <property role="2V$B1Q" value="org.iets3.analysis.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZU" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sp" role="2Qf6Ng">
+          <property role="2V$B1T" value="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" />
+          <property role="2V$B1Q" value="org.iets3.core.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZV" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sq" role="2Qf6Ng">
+          <property role="2V$B1T" value="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.base" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZW" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Sr" role="2Qf6Ng">
+          <property role="2V$B1T" value="9464fa06-5ab9-409b-9274-64ab29588457" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.lambda" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZX" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0Ss" role="2Qf6Ng">
+          <property role="2V$B1T" value="f3eafff0-30d2-46d6-9150-f0f3b880ce27" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.path" />
+        </node>
+      </node>
+      <node concept="2Qf6Nf" id="4z0AnX816ZY" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6N3Rwqvd0St" role="2Qf6Ng">
+          <property role="2V$B1T" value="6b277d9a-d52d-416f-a209-1919bd737f50" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.simpleTypes" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_genplan.mps
index eced802a14..1f1222e8d5 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_genplan.mps
@@ -3,16 +3,19 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="-1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports />
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -22,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>
@@ -30,37 +33,53 @@
   <node concept="2VgMpV" id="6FvSwHlc883">
     <property role="TrG5h" value="Java_genplan" />
     <node concept="2VgMA2" id="7bZFIimhGaU" role="2VgMA7">
-      <node concept="2V$Bhx" id="DHMrP91qoC" role="1t_9vn">
-        <property role="2V$B1T" value="e75207bb-7b13-40bd-b80b-c8fe625c4ee2" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.tests" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zr" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoC" role="2Qf6Ng">
+          <property role="2V$B1T" value="e75207bb-7b13-40bd-b80b-c8fe625c4ee2" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.tests" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="1Ds3skywDIo" role="1t_9vn">
-        <property role="2V$B1T" value="ddeeec5e-aa31-4c44-bc40-319cd452626e" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.toplevel" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zs" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="1Ds3skywDIo" role="2Qf6Ng">
+          <property role="2V$B1T" value="ddeeec5e-aa31-4c44-bc40-319cd452626e" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.toplevel" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="DHMrP91qoA" role="1t_9vn">
-        <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zt" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoA" role="2Qf6Ng">
+          <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="DHMrP91qoE" role="1t_9vn">
-        <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zu" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="DHMrP91qoE" role="2Qf6Ng">
+          <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="lH$PuhTIAz" role="1t_9vn">
-        <property role="2V$B1T" value="f2abf2a6-552e-4906-ab58-930f9a79aff4" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.contracts" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zv" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="lH$PuhTIAz" role="2Qf6Ng">
+          <property role="2V$B1T" value="f2abf2a6-552e-4906-ab58-930f9a79aff4" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.contracts" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="6ii4I_AaKi7" role="1t_9vn">
-        <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zw" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="6ii4I_AaKi7" role="2Qf6Ng">
+          <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="4bh_m841Xu2" role="1t_9vn">
-        <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zx" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4bh_m841Xu2" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="1URTIF$uG6y" role="1t_9vn">
-        <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+      <node concept="2Qf6Nf" id="4z0AnX816Zy" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="1URTIF$uG6y" role="2Qf6Ng">
+          <property role="2V$B1T" value="f61473f9-130f-42f6-b98d-6c438812c2f6" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.unitTest" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_interpreter_genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_interpreter_genplan.mps
index 7d4f9b44db..5cfce3ccc1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_interpreter_genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/models/java_interpreter_genplan.mps
@@ -2,7 +2,7 @@
 <model ref="r:5a45d31c-961e-446a-984a-d453af8ce385(org.iets3.core.expr.genjava.core.genplan.java_interpreter_genplan)">
   <persistence version="9" />
   <languages>
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports>
     <import index="g6e4" ref="r:44582398-dfcf-40ad-bb09-b88bb3cc5de2(org.iets3.core.expr.genjava.core.genplan.genplan)" />
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/org.iets3.core.expr.genjava.core.genplan.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/org.iets3.core.expr.genjava.core.genplan.msd
index 6dbd94a2d5..6dd642211e 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/org.iets3.core.expr.genjava.core.genplan.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.core.genplan/org.iets3.core.expr.genjava.core.genplan.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.core.genplan" uuid="72f3ce09-f244-46a5-88ca-7b98cd2dfb22" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.core.genplan" uuid="72f3ce09-f244-46a5-88ca-7b98cd2dfb22" 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:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.functionalJava/org.iets3.core.expr.genjava.functionalJava.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.functionalJava/org.iets3.core.expr.genjava.functionalJava.msd
index 0bbaf39182..b903dd7ec2 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.functionalJava/org.iets3.core.expr.genjava.functionalJava.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.functionalJava/org.iets3.core.expr.genjava.functionalJava.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.functionalJava" uuid="708a03ad-8699-43c9-821a-6cd00b68e9f8" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.functionalJava" uuid="708a03ad-8699-43c9-821a-6cd00b68e9f8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="java_classes">
       <sourceRoot location="lib/functionaljava_1.8-4.8-SNAPSHOT.jar" />
@@ -8,12 +8,9 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/functionaljava_1.8-4.8-SNAPSHOT.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/functionaljava_1.8-4.8-SNAPSHOT.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/models/rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/models/rt.mps
index 30ed8826f9..051d8c18a2 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/models/rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/models/rt.mps
@@ -22,7 +22,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">
@@ -110,7 +110,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -130,7 +130,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
@@ -146,7 +146,7 @@
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/org.iets3.core.expr.genjava.messages.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/org.iets3.core.expr.genjava.messages.rt.msd
index e4a92831f9..aa16bcc1e1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/org.iets3.core.expr.genjava.messages.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.messages.rt/org.iets3.core.expr.genjava.messages.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.messages.rt" uuid="646d63c6-d580-4c19-8759-e3a3123f5424" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.messages.rt" uuid="646d63c6-d580-4c19-8759-e3a3123f5424" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
   </dependencies>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/models/org.iets3.core.expr.genjava.stateMachineExample.genplan.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/models/org.iets3.core.expr.genjava.stateMachineExample.genplan.mps
index 573aa57530..7aa11aab7f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/models/org.iets3.core.expr.genjava.stateMachineExample.genplan.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/models/org.iets3.core.expr.genjava.stateMachineExample.genplan.mps
@@ -3,16 +3,19 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
+    <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
   <imports />
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
+        <child id="1152961914448136208" name="language" index="2Qf6Ng" />
+      </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
-        <child id="2944629966652439181" name="languages" index="1t_9vn" />
+        <child id="1152961914448142326" name="entries" index="2Qf7GQ" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -22,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>
@@ -30,25 +33,35 @@
   <node concept="2VgMpV" id="4NM7IHyHqGk">
     <property role="TrG5h" value="Plan" />
     <node concept="2VgMA2" id="4NM7IHyHqGI" role="2VgMA7">
-      <node concept="2V$Bhx" id="4NM7IHyHqGY" role="1t_9vn">
-        <property role="2V$B1T" value="a15685d6-531e-45b7-9e72-af80302071ea" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.stateMachineExample" />
+      <node concept="2Qf6Nf" id="4z0AnX816ZZ" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4NM7IHyHqGY" role="2Qf6Ng">
+          <property role="2V$B1T" value="a15685d6-531e-45b7-9e72-af80302071ea" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.stateMachineExample" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="4NM7IHyHqGR" role="1t_9vn">
-        <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+      <node concept="2Qf6Nf" id="4z0AnX81700" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4NM7IHyHqGR" role="2Qf6Ng">
+          <property role="2V$B1T" value="30254c5b-f87e-4bb3-a60a-77a7ec6ed411" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.base" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="1NbTIKoZNg3" role="1t_9vn">
-        <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+      <node concept="2Qf6Nf" id="4z0AnX81701" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="1NbTIKoZNg3" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="13L4QXvOSrD" role="1t_9vn">
-        <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
-        <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
+      <node concept="2Qf6Nf" id="4z0AnX81702" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="13L4QXvOSrD" role="2Qf6Ng">
+          <property role="2V$B1T" value="f3061a53-9226-4cc5-a443-f952ceaf5816" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="4NM7IHyHqGM" role="1t_9vn">
-        <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
-        <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+      <node concept="2Qf6Nf" id="4z0AnX81703" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4NM7IHyHqGM" role="2Qf6Ng">
+          <property role="2V$B1T" value="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40" />
+          <property role="2V$B1Q" value="org.iets3.core.expr.genjava.simpleTypes" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/org.iets3.core.expr.genjava.stateMachineExample.genplan.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/org.iets3.core.expr.genjava.stateMachineExample.genplan.msd
index 87a414a6b7..99498d3a80 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/org.iets3.core.expr.genjava.stateMachineExample.genplan.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/org.iets3.core.expr.genjava.stateMachineExample.genplan.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.stateMachineExample.genplan" uuid="889f307c-31c8-4d64-9e24-a83f15c85f02" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.stateMachineExample.genplan" uuid="889f307c-31c8-4d64-9e24-a83f15c85f02" 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:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
index 9950f0deb3..c4acb53785 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
@@ -109,7 +109,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,13 +129,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="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" />
@@ -149,7 +150,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -176,7 +177,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>
@@ -467,13 +467,13 @@
                 <node concept="3clFbS" id="3nGzaxUtfSw" role="1bW5cS">
                   <node concept="3clFbF" id="3nGzaxUtfSx" role="3cqZAp">
                     <node concept="37vLTw" id="3nGzaxUtfSy" role="3clFbG">
-                      <ref role="3cqZAo" node="3nGzaxUtfSz" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817nu" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3nGzaxUtfSz" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3nGzaxUtfS$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nv" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="3nGzaxUtfS_" role="2S7zOq">
@@ -798,13 +798,13 @@
                 <node concept="3clFbS" id="4eVSC65wKJe" role="1bW5cS">
                   <node concept="3clFbF" id="4eVSC65wKJf" role="3cqZAp">
                     <node concept="37vLTw" id="4eVSC65wKJg" role="3clFbG">
-                      <ref role="3cqZAo" node="4eVSC65wKJh" resolve="it" />
+                      <ref role="3cqZAo" node="4z0AnX817nw" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4eVSC65wKJh" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4eVSC65wKJi" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nx" role="1tU5fm" />
                 </node>
               </node>
               <node concept="1nlBCl" id="4eVSC65wKJj" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/org.iets3.core.expr.genjava.temporal.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/org.iets3.core.expr.genjava.temporal.rt.msd
index f284a0a0db..692ae458e9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/org.iets3.core.expr.genjava.temporal.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/org.iets3.core.expr.genjava.temporal.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.temporal.rt" uuid="fde59617-0336-493b-a7ec-21148c3507f1" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.temporal.rt" uuid="fde59617-0336-493b-a7ec-21148c3507f1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">17ecc6b6-d106-4b60-87a9-3fde52f92301(org.iets3.core.expr.temporal.runtime)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/models/org.iets3.core.expr.genjava.tests.rt.rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/models/org.iets3.core.expr.genjava.tests.rt.rt.mps
index ba0473a10b..5d9db13e52 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/models/org.iets3.core.expr.genjava.tests.rt.rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/models/org.iets3.core.expr.genjava.tests.rt.rt.mps
@@ -94,7 +94,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,14 +113,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/org.iets3.core.expr.genjava.tests.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/org.iets3.core.expr.genjava.tests.rt.msd
index cdb80e47fc..a83de874c7 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/org.iets3.core.expr.genjava.tests.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.tests.rt/org.iets3.core.expr.genjava.tests.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.tests.rt" uuid="68da6d9d-3ccf-4255-b4f7-37603cd89090" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.tests.rt" uuid="68da6d9d-3ccf-4255-b4f7-37603cd89090" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,14 +10,13 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-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.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/models/rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/models/rt.mps
index e6171b9313..e4af51d269 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/models/rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/models/rt.mps
@@ -57,7 +57,7 @@
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
@@ -70,13 +70,13 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/org.iets3.core.expr.genjava.toplevel.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/org.iets3.core.expr.genjava.toplevel.rt.msd
index 262381422e..4fb5cbd2d5 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/org.iets3.core.expr.genjava.toplevel.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.toplevel.rt/org.iets3.core.expr.genjava.toplevel.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.genjava.toplevel.rt" uuid="336cc7f4-18d3-473b-81a1-d8df1c0ad27a" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.genjava.toplevel.rt" uuid="336cc7f4-18d3-473b-81a1-d8df1c0ad27a" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
@@ -25,7 +24,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
index 8f910dd54c..98cdfb24cb 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -99,7 +99,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -171,6 +171,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" />
@@ -213,7 +214,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -244,7 +245,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -1258,16 +1258,16 @@
                           <node concept="liA8E" id="3TIaSh_f2Uo" role="2OqNvi">
                             <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                             <node concept="37vLTw" id="Om1N8Vect_" role="37wK5m">
-                              <ref role="3cqZAo" node="Om1N8VecfG" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817ny" />
                             </node>
                             <node concept="10Nm6u" id="3TIaSh_f3vR" role="37wK5m" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="Om1N8VecfG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817ny" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="Om1N8VecfH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817nz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/org.iets3.core.expr.lambda.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/org.iets3.core.expr.lambda.interpreter.msd
index 33af632ee7..0499abeac9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/org.iets3.core.expr.lambda.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/org.iets3.core.expr.lambda.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.lambda.interpreter" uuid="8ba65567-1c8a-4983-beb8-0482324d7e44" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.lambda.interpreter" uuid="8ba65567-1c8a-4983-beb8-0482324d7e44" 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">cf90f965-8554-4a16-aa0b-6387f27474ab(org.iets3.core.expr.base.interpreter)</dependency>
     <dependency reexport="false">9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/models/org/iets3/core/expr/lambda/plugin/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/models/org/iets3/core/expr/lambda/plugin/plugin.mps
index 3123eee2f6..d55ff82d94 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/models/org/iets3/core/expr/lambda/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/models/org/iets3/core/expr/lambda/plugin/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:b0b9fb83-efa1-4dfe-9517-bc19da8392b2(org.iets3.core.expr.lambda.plugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
   </languages>
@@ -20,7 +20,7 @@
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/org.iets3.core.expr.lambda.plugin.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/org.iets3.core.expr.lambda.plugin.msd
index 0ca6a61d7b..a76fcc2292 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/org.iets3.core.expr.lambda.plugin.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.plugin/org.iets3.core.expr.lambda.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.lambda.plugin" uuid="0495221f-9fd1-41d6-bf26-b3b8aeb7eb7b" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.lambda.plugin" uuid="0495221f-9fd1-41d6-bf26-b3b8aeb7eb7b" 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">9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)</dependency>
   </dependencies>
@@ -20,7 +19,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
index f63f1a9935..2ec824e984 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
@@ -73,7 +73,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,6 +118,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" />
@@ -133,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -149,7 +150,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="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
@@ -383,7 +383,7 @@
                                         <node concept="3clFbC" id="4bt45uNvmcE" role="3uHU7w">
                                           <node concept="2OqwBi" id="4bt45uNvmcF" role="3uHU7B">
                                             <node concept="37vLTw" id="4bt45uNvmcG" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bt45uNvmcQ" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcH" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -391,7 +391,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="4bt45uNvmcI" role="3uHU7w">
                                             <node concept="37vLTw" id="4bt45uNvmcJ" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bt45uNvmcQ" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcK" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -401,7 +401,7 @@
                                         <node concept="3clFbC" id="4bt45uNvmcL" role="3uHU7B">
                                           <node concept="2OqwBi" id="4bt45uNvmcM" role="3uHU7B">
                                             <node concept="37vLTw" id="4bt45uNvmcN" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4bt45uNvmcQ" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcO" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -414,9 +414,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="4bt45uNvmcQ" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817n$" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4bt45uNvmcR" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817n_" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/org.iets3.core.expr.lookup.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/org.iets3.core.expr.lookup.interpreter.msd
index 24bde33bdc..acf50e4454 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/org.iets3.core.expr.lookup.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/org.iets3.core.expr.lookup.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.lookup.interpreter" uuid="847dec6c-8460-4c2a-9e6e-039d9d12e815" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.lookup.interpreter" uuid="847dec6c-8460-4c2a-9e6e-039d9d12e815" 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">0406e4b3-cffd-4d16-8533-6bc50680ab3b(org.iets3.core.expr.lookup)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/models/plugin.mps
index aa8352a281..87aa457ede 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -64,7 +64,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -185,7 +185,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -216,7 +216,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">
@@ -362,7 +362,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd
index f93c211b2c..c0d9e4275b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.math.interpreter" uuid="b804a851-ecf0-4ad4-a0af-ae720b39191a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.math.interpreter" uuid="b804a851-ecf0-4ad4-a0af-ae720b39191a" 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">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</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:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/models/plugin.mps
index 89a55e41c3..bf53887f79 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -82,7 +82,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -164,7 +164,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/org.iets3.core.expr.messages.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/org.iets3.core.expr.messages.interpreter.msd
index d344fc6324..001f6e15bc 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/org.iets3.core.expr.messages.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.messages.interpreter/org.iets3.core.expr.messages.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.messages.interpreter" uuid="2bd330e3-1cae-4049-bed7-7d39e93cece4" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.messages.interpreter" uuid="2bd330e3-1cae-4049-bed7-7d39e93cece4" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/models/plugin.mps
index 239d1eb90a..698dd632bf 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -55,7 +55,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/org.iets3.core.expr.metafunction.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/org.iets3.core.expr.metafunction.interpreter.msd
index f1e6d8bba2..fcdc2b357b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/org.iets3.core.expr.metafunction.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.metafunction.interpreter/org.iets3.core.expr.metafunction.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.metafunction.interpreter" uuid="dff61827-7f11-4bfe-aeb1-6491ed8a49b2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.metafunction.interpreter" uuid="dff61827-7f11-4bfe-aeb1-6491ed8a49b2" 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">cf90f965-8554-4a16-aa0b-6387f27474ab(org.iets3.core.expr.base.interpreter)</dependency>
     <dependency reexport="false">711a16d7-99e8-4e1d-b20c-99c0b7309cd8(org.iets3.core.expr.metafunction)</dependency>
@@ -19,7 +18,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
index f5cbb8a37f..0714c51ce8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
@@ -106,7 +106,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -166,6 +166,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -207,7 +208,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -230,7 +231,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -719,7 +719,7 @@
                               <node concept="2OqwBi" id="Z4fkwz7eS2" role="3clFbG">
                                 <node concept="2OqwBi" id="Z4fkwz7eS3" role="2Oq$k0">
                                   <node concept="37vLTw" id="Z4fkwz7eS4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="Z4fkwz7eSa" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817nA" />
                                   </node>
                                   <node concept="2OwXpG" id="Z4fkwz7eS5" role="2OqNvi">
                                     <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -737,9 +737,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="Z4fkwz7eSa" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817nA" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="Z4fkwz7eSb" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817nB" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -922,7 +922,7 @@
                               <node concept="2OqwBi" id="Z4fkwz7bCB" role="3clFbG">
                                 <node concept="2OqwBi" id="Z4fkwz7bCC" role="2Oq$k0">
                                   <node concept="37vLTw" id="Z4fkwz7bCD" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="Z4fkwz7bCJ" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817nC" />
                                   </node>
                                   <node concept="2OwXpG" id="Z4fkwz7bCE" role="2OqNvi">
                                     <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -940,9 +940,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="Z4fkwz7bCJ" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817nC" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="Z4fkwz7bCK" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817nD" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/org.iets3.core.expr.mutable.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/org.iets3.core.expr.mutable.interpreter.msd
index 8b8b70674a..e2c55525f6 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/org.iets3.core.expr.mutable.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/org.iets3.core.expr.mutable.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.mutable.interpreter" uuid="1c56daef-6a92-4d68-8014-fbbd0240d553" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.mutable.interpreter" uuid="1c56daef-6a92-4d68-8014-fbbd0240d553" 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">fbba5118-5fc6-49ff-9c3b-0b4469830440(org.iets3.core.expr.mutable)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</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: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.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/models/plugin.mps
index aeba0c38d5..bb811bcdb2 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -101,7 +101,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/org.iets3.core.expr.natlang.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/org.iets3.core.expr.natlang.interpreter.msd
index ebdf1928ca..bf9f2dc3fe 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/org.iets3.core.expr.natlang.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.natlang.interpreter/org.iets3.core.expr.natlang.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.natlang.interpreter" uuid="efafd749-49c6-482f-8a14-68061c57dd08" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.natlang.interpreter" uuid="efafd749-49c6-482f-8a14-68061c57dd08" 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">64e79176-30a1-4836-821c-bf62ff6c6091(org.iets3.core.expr.natlang)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/models/plugin.mps
index c7680b85c7..dec3bc21e0 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -85,7 +85,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -136,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>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/org.iets3.core.expr.path.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/org.iets3.core.expr.path.interpreter.msd
index 31809a0b26..67249ff071 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/org.iets3.core.expr.path.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.path.interpreter/org.iets3.core.expr.path.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.path.interpreter" uuid="c008c84a-6d05-4b6f-82f0-5cb6c0231a11" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.path.interpreter" uuid="c008c84a-6d05-4b6f-82f0-5cb6c0231a11" 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">f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index 5d88578c03..74962b50f4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:e3e5593b-dfcd-4a2e-b10f-f1ed4a43f093(org.iets3.core.expr.plugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <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="-1" />
@@ -110,6 +110,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="997079742910640235" name="fillActionContext" index="1teQrl" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -136,7 +137,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" />
@@ -146,7 +147,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -189,7 +190,7 @@
       <concept id="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">
@@ -266,7 +267,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -335,7 +336,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -362,7 +363,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -423,6 +424,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
       </concept>
@@ -461,7 +463,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <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="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
@@ -527,7 +529,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">
@@ -587,7 +589,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -623,6 +624,7 @@
     <property role="TrG5h" value="showTracer" />
     <property role="2uzpH1" value="Show Trace" />
     <property role="1teQrl" value="true" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="1rUbSenCeC" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -3050,15 +3052,15 @@
                       <node concept="3clFbF" id="6l5633bp3R9" role="3cqZAp">
                         <node concept="2OqwBi" id="6l5633bp3WB" role="3clFbG">
                           <node concept="37vLTw" id="6l5633bp3R8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6l5633bp3F8" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817nE" />
                           </node>
                           <node concept="1Bd96e" id="6l5633bp414" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6l5633bp3F8" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817nE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6l5633bp3F9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817nF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5114,6 +5116,7 @@
   <node concept="sE7Ow" id="4yQfyMjrpAh">
     <property role="TrG5h" value="selectNextTraceNodeInCurrentTrace" />
     <property role="2uzpH1" value="Trace: select next trace of this node" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="4yQfyMjrpAi" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -5226,6 +5229,7 @@
   <node concept="sE7Ow" id="4yQfyMjvYR7">
     <property role="TrG5h" value="selectAllTraceNodeInCurrentTrace" />
     <property role="2uzpH1" value="Trace: select all traces of this node" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="4yQfyMjvYR8" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -6244,6 +6248,7 @@
     <property role="TrG5h" value="deleteValuesInspectors" />
     <property role="2uzpH1" value="Clear Inspectors" />
     <property role="3GE5qa" value="inspect" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2ufoZQISyNn" role="tncku">
       <node concept="3clFbS" id="2ufoZQISyNo" role="2VODD2">
         <node concept="3clFbF" id="2ufoZQISyNp" role="3cqZAp">
@@ -6269,7 +6274,7 @@
                         <node concept="10Nm6u" id="2ufoZQISyNC" role="3uHU7w" />
                         <node concept="2OqwBi" id="2ufoZQISyND" role="3uHU7B">
                           <node concept="37vLTw" id="2ufoZQISyNE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ufoZQISyNH" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817nG" />
                           </node>
                           <node concept="3CFZ6_" id="2ufoZQISyNF" role="2OqNvi">
                             <node concept="3CFYIy" id="2ufoZQISyNG" role="3CFYIz">
@@ -6280,9 +6285,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2ufoZQISyNH" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817nG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2ufoZQISyNI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817nH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6294,7 +6299,7 @@
                     <node concept="2OqwBi" id="2ufoZQISyNN" role="3clFbG">
                       <node concept="2OqwBi" id="2ufoZQISyNO" role="2Oq$k0">
                         <node concept="37vLTw" id="2ufoZQISyNP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ufoZQISyNT" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817nI" />
                         </node>
                         <node concept="3CFZ6_" id="2ufoZQISyNQ" role="2OqNvi">
                           <node concept="3CFYIy" id="2ufoZQISyNR" role="3CFYIz">
@@ -6306,9 +6311,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ufoZQISyNT" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ufoZQISyNU" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -6350,6 +6355,7 @@
     <property role="TrG5h" value="addValueInspector" />
     <property role="2uzpH1" value="Add Inspector" />
     <property role="3GE5qa" value="inspect" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2ufoZQIRClY" role="tncku">
       <node concept="3clFbS" id="2ufoZQIRClZ" role="2VODD2">
         <node concept="3clFbF" id="2ufoZQISkoz" role="3cqZAp">
@@ -6412,6 +6418,7 @@
     <property role="TrG5h" value="clearValuesInspector" />
     <property role="2uzpH1" value="Clear Inspectors" />
     <property role="3GE5qa" value="inspect" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2ufoZQISnwB" role="tncku">
       <node concept="3clFbS" id="2ufoZQISnwC" role="2VODD2">
         <node concept="3clFbF" id="2ufoZQISnwT" role="3cqZAp">
@@ -6437,7 +6444,7 @@
                         <node concept="10Nm6u" id="2ufoZQISvSj" role="3uHU7w" />
                         <node concept="2OqwBi" id="2ufoZQISvbs" role="3uHU7B">
                           <node concept="37vLTw" id="2ufoZQISurh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ufoZQISuaB" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817nK" />
                           </node>
                           <node concept="3CFZ6_" id="2ufoZQISvnu" role="2OqNvi">
                             <node concept="3CFYIy" id="2ufoZQISvwo" role="3CFYIz">
@@ -6448,9 +6455,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2ufoZQISuaB" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817nK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2ufoZQISuaC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817nL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6462,7 +6469,7 @@
                     <node concept="2OqwBi" id="2ufoZQISx$9" role="3clFbG">
                       <node concept="2OqwBi" id="2ufoZQISwXH" role="2Oq$k0">
                         <node concept="37vLTw" id="2ufoZQISwO1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2ufoZQISwEK" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817nM" />
                         </node>
                         <node concept="3CFZ6_" id="2ufoZQISxdN" role="2OqNvi">
                           <node concept="3CFYIy" id="2ufoZQISxjY" role="3CFYIz">
@@ -6476,9 +6483,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2ufoZQISwEK" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2ufoZQISwEL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7279,7 +7286,7 @@
                   <node concept="3clFbF" id="3TIaSh$QwGh" role="3cqZAp">
                     <node concept="17R0WA" id="3TIaSh$QxnK" role="3clFbG">
                       <node concept="37vLTw" id="3TIaSh$QwGg" role="3uHU7B">
-                        <ref role="3cqZAo" node="3TIaSh$Qwzv" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817nO" />
                       </node>
                       <node concept="37vLTw" id="3TIaSh$Qxwr" role="3uHU7w">
                         <ref role="3cqZAo" node="3TIaSh$Qxwp" resolve="cvg" />
@@ -7287,9 +7294,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3TIaSh$Qwzv" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3TIaSh$Qwzw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7444,7 +7451,7 @@
                   <node concept="3clFbF" id="1m$qA_Y_gGw" role="3cqZAp">
                     <node concept="17R0WA" id="1m$qA_Y_gGx" role="3clFbG">
                       <node concept="37vLTw" id="1m$qA_Y_gGy" role="3uHU7B">
-                        <ref role="3cqZAo" node="1m$qA_Y_gG$" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817nQ" />
                       </node>
                       <node concept="37vLTw" id="1m$qA_Y_gGz" role="3uHU7w">
                         <ref role="3cqZAo" node="1m$qA_Y_hIW" resolve="cvg" />
@@ -7452,9 +7459,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1m$qA_Y_gG$" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1m$qA_Y_gG_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -7472,6 +7479,7 @@
   <node concept="sE7Ow" id="2JfTTG8itTT">
     <property role="TrG5h" value="selectNextTraceNodeAndInspectSource" />
     <property role="2uzpH1" value="Trace: select next trace and inspect source" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2JfTTG8itTU" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -8619,7 +8627,7 @@
                       <node concept="1Wc70l" id="kZqQ80hiGK" role="3uHU7B">
                         <node concept="2OqwBi" id="kZqQ80hiGQ" role="3uHU7B">
                           <node concept="37vLTw" id="kZqQ80hiGR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kZqQ80hiGU" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817nS" />
                           </node>
                           <node concept="1mIQ4w" id="kZqQ80hiGS" role="2OqNvi">
                             <node concept="chp4Y" id="kZqQ80hiGT" role="cj9EA">
@@ -8633,7 +8641,7 @@
                               <ref role="cht4Q" to="hm2y:7obiejCh8R2" resolve="ITraceRoot" />
                             </node>
                             <node concept="37vLTw" id="kZqQ80hiGO" role="1m5AlR">
-                              <ref role="3cqZAo" node="kZqQ80hiGU" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817nS" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="kZqQ80hiGP" role="2OqNvi">
@@ -8649,7 +8657,7 @@
                                 <ref role="cht4Q" to="hm2y:XblfskIwr9" resolve="IMultiTraceRoot" />
                               </node>
                               <node concept="37vLTw" id="4_BA2XOIPvt" role="1m5AlR">
-                                <ref role="3cqZAo" node="kZqQ80hiGU" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817nS" />
                               </node>
                             </node>
                             <node concept="2qgKlT" id="4_BA2XOIPvu" role="2OqNvi">
@@ -8660,7 +8668,7 @@
                         </node>
                         <node concept="2OqwBi" id="4_BA2XOIPvw" role="3uHU7B">
                           <node concept="37vLTw" id="4_BA2XOIPvx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="kZqQ80hiGU" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817nS" />
                           </node>
                           <node concept="1mIQ4w" id="4_BA2XOIPvy" role="2OqNvi">
                             <node concept="chp4Y" id="4_BA2XOIPvz" role="cj9EA">
@@ -8672,9 +8680,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="kZqQ80hiGU" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817nS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="kZqQ80hiGV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817nT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9826,7 +9834,7 @@
                           <node concept="3clFbF" id="3ApArNFCjJI" role="3cqZAp">
                             <node concept="2OqwBi" id="3ApArNFCjJJ" role="3clFbG">
                               <node concept="37vLTw" id="3ApArNFCjJK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3ApArNFCjJM" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817nU" />
                               </node>
                               <node concept="liA8E" id="3ApArNFCjJL" role="2OqNvi">
                                 <ref role="37wK5l" node="3ApArNFAK9d" resolve="getPriority" />
@@ -9834,9 +9842,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3ApArNFCjJM" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817nU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3ApArNFCjJN" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817nV" role="1tU5fm" />
                         </node>
                       </node>
                       <node concept="1nlBCl" id="3ApArNFCjJO" role="2S7zOq" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/org.iets3.core.expr.plugin.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/org.iets3.core.expr.plugin.msd
index 301aa61e45..2a30552bdb 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/org.iets3.core.expr.plugin.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/org.iets3.core.expr.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.plugin" uuid="cbb71b24-470d-4374-b77c-ebd0d3b3bb27" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.plugin" uuid="cbb71b24-470d-4374-b77c-ebd0d3b3bb27" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -44,7 +43,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -54,7 +53,7 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l: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" />
@@ -104,7 +103,6 @@
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
     <module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
     <module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="3" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/models/plugin.mps
index 95a6772de6..9af9f8f353 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <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" />
@@ -78,7 +78,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -152,7 +152,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/org.iets3.core.expr.process.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/org.iets3.core.expr.process.interpreter.msd
index a23e627212..dde54cdb05 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/org.iets3.core.expr.process.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.process.interpreter/org.iets3.core.expr.process.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.process.interpreter" uuid="0a9d9bba-15ce-45fa-ba85-2c2dddcd1ff0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.process.interpreter" uuid="0a9d9bba-15ce-45fa-ba85-2c2dddcd1ff0" 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">1c56daef-6a92-4d68-8014-fbbd0240d553(org.iets3.core.expr.mutable.interpreter)</dependency>
     <dependency reexport="false">50b470e7-14ad-46c3-b540-4586f56d2e9c(org.iets3.core.expr.process)</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: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" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/models/org.iets3.core.expr.query.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/models/org.iets3.core.expr.query.interpreter.plugin.mps
index 8356260e3b..b83c4d142f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/models/org.iets3.core.expr.query.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/models/org.iets3.core.expr.query.interpreter.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
   </languages>
@@ -96,7 +96,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -144,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/org.iets3.core.expr.query.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/org.iets3.core.expr.query.interpreter.msd
index 16f39cbe57..67333a981b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/org.iets3.core.expr.query.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/org.iets3.core.expr.query.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.query.interpreter" uuid="559a13ae-59fa-4b70-a9f1-3ea16a0e218f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.query.interpreter" uuid="559a13ae-59fa-4b70-a9f1-3ea16a0e218f" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
index bc76e2f8d7..2637807bdf 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -90,7 +90,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -145,6 +145,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -179,7 +180,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -201,7 +202,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
@@ -343,7 +343,7 @@
                                 <node concept="10Nm6u" id="3_Nra3Ea5Wu" role="3uHU7w" />
                                 <node concept="2OqwBi" id="3_Nra3Ea5cb" role="3uHU7B">
                                   <node concept="37vLTw" id="3_Nra3Ea51Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3_Nra3Ea4Vd" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817nW" />
                                   </node>
                                   <node concept="3TrEf2" id="3_Nra3Ea5tW" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -352,9 +352,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="3_Nra3Ea4Vd" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817nW" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="3_Nra3Ea4Ve" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817nX" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/org.iets3.core.expr.repl.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/org.iets3.core.expr.repl.interpreter.msd
index 80600d5e86..9c456b8bd4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/org.iets3.core.expr.repl.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/org.iets3.core.expr.repl.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.repl.interpreter" uuid="bd5d2f0b-399d-4cb7-b981-7a3f9ce7bc78" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.repl.interpreter" uuid="bd5d2f0b-399d-4cb7-b981-7a3f9ce7bc78" 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">18001c94-33a7-4f68-a7c1-ffddc4b39be1(org.iets3.core.expr.repl)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
index 15c97a51f2..00ef1e208e 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:30a02cdb-e4b8-4d67-ad0c-3a3b7f24540c(org.iets3.core.expr.repl.plugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -24,6 +24,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -37,7 +38,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" />
@@ -46,7 +47,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>
@@ -148,7 +149,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -167,13 +168,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -181,7 +183,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>
@@ -240,7 +242,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -261,7 +263,6 @@
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -287,6 +288,7 @@
   <node concept="sE7Ow" id="3FexrMiQJ5z">
     <property role="TrG5h" value="openREPL" />
     <property role="2uzpH1" value="Open REPL for Node" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="31wEG_giQ1F" role="1NuT2Z">
       <property role="TrG5h" value="selected" />
       <node concept="3Tm6S6" id="31wEG_giQ1G" role="1B3o_S" />
@@ -327,6 +329,7 @@
   <node concept="sE7Ow" id="3FexrMiRon9">
     <property role="TrG5h" value="InlineNode" />
     <property role="2uzpH1" value="Open REPL for Node" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="3FexrMiRona" role="1NuT2Z">
       <property role="TrG5h" value="selected" />
       <node concept="3Tm6S6" id="3FexrMiRonb" role="1B3o_S" />
@@ -741,6 +744,7 @@
     <property role="TrG5h" value="PressF3" />
     <property role="2uzpH1" value="Highlight Outgoing Deps" />
     <property role="3GE5qa" value="f2" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1mFXz_FXKg5" role="tncku">
       <node concept="3clFbS" id="1mFXz_FXKg6" role="2VODD2">
         <node concept="3clFbJ" id="1mFXz_FYnfj" role="3cqZAp">
@@ -1192,6 +1196,7 @@
     <property role="TrG5h" value="PressShiftF3" />
     <property role="2uzpH1" value="Highlight Incoming Deps" />
     <property role="3GE5qa" value="f2" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1mFXz_G2Fl4" role="tncku">
       <node concept="3clFbS" id="1mFXz_G2Fl5" role="2VODD2">
         <node concept="3clFbJ" id="1mFXz_G2Fl6" role="3cqZAp">
@@ -1274,7 +1279,7 @@
                         <node concept="2OqwBi" id="1mFXz_G2Tdq" role="3clFbG">
                           <node concept="2OqwBi" id="1mFXz_G2SDg" role="2Oq$k0">
                             <node concept="37vLTw" id="1mFXz_G2SuZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1mFXz_G2Sl8" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817nY" />
                             </node>
                             <node concept="3TrEf2" id="1mFXz_G2SS2" role="2OqNvi">
                               <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -1284,9 +1289,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1mFXz_G2Sl8" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817nY" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1mFXz_G2Sl9" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817nZ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1330,7 +1335,7 @@
                               </node>
                               <node concept="2OqwBi" id="1mFXz_G34hU" role="3uHU7B">
                                 <node concept="37vLTw" id="1mFXz_G3465" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1mFXz_G33MS" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817o0" />
                                 </node>
                                 <node concept="2qgKlT" id="1mFXz_G34yw" role="2OqNvi">
                                   <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
@@ -1339,9 +1344,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1mFXz_G33MS" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817o0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1mFXz_G33MT" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817o1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/org.iets3.core.expr.repl.plugin.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/org.iets3.core.expr.repl.plugin.msd
index 333fc80bd8..3e71db847c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/org.iets3.core.expr.repl.plugin.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/org.iets3.core.expr.repl.plugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.repl.plugin" uuid="1157d4c9-6175-4550-96aa-aae0a9fdc06f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.repl.plugin" uuid="1157d4c9-6175-4550-96aa-aae0a9fdc06f" 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">18001c94-33a7-4f68-a7c1-ffddc4b39be1(org.iets3.core.expr.repl)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -20,11 +19,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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
index 103e06014a..40a68fa2fb 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -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>
@@ -246,7 +246,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd
index 5913bb0306..4f8f1dd4f1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.simpleTypes.interpreter" uuid="197e2a32-ff26-4358-af5c-731ae2b35f83" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.simpleTypes.interpreter" uuid="197e2a32-ff26-4358-af5c-731ae2b35f83" 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">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
@@ -32,7 +31,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/models/org.iets3.core.expr.simpleTypes.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/models/org.iets3.core.expr.simpleTypes.runtime.mps
index 16e136da2b..8e327f9a95 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/models/org.iets3.core.expr.simpleTypes.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/models/org.iets3.core.expr.simpleTypes.runtime.mps
@@ -6,7 +6,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
@@ -144,7 +144,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -166,7 +166,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -210,7 +210,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/org.iets3.core.expr.simpleTypes.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/org.iets3.core.expr.simpleTypes.runtime.msd
index 93159c8455..8ddf97efe8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/org.iets3.core.expr.simpleTypes.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.runtime/org.iets3.core.expr.simpleTypes.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.simpleTypes.runtime" uuid="52a8c4c0-f4b0-4243-bf00-9dfac3472876" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.simpleTypes.runtime" uuid="52a8c4c0-f4b0-4243-bf00-9dfac3472876" 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">00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</dependency>
@@ -19,7 +18,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/models/plugin.mps
index a955bf4885..df297cf514 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -82,7 +82,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +135,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/org.iets3.core.expr.statemachines.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/org.iets3.core.expr.statemachines.interpreter.msd
index 30bd80fc45..a72dfa4fe0 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/org.iets3.core.expr.statemachines.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.statemachines.interpreter/org.iets3.core.expr.statemachines.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.statemachines.interpreter" uuid="b10553c8-9d54-444d-bb92-a27be823b74f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.statemachines.interpreter" uuid="b10553c8-9d54-444d-bb92-a27be823b74f" 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">cd87ddab-6434-448e-a011-1e1c898de18e(org.iets3.core.expr.statemachines)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
index be99d4d242..5eb2f56530 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
@@ -63,7 +63,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,6 +98,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -113,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -125,7 +126,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="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -229,7 +229,7 @@
                               <node concept="3clFbF" id="5wF$o0BESlN" role="3cqZAp">
                                 <node concept="2OqwBi" id="5wF$o0BESlO" role="3clFbG">
                                   <node concept="37vLTw" id="5wF$o0BESlP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5wF$o0BESlR" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817o2" />
                                   </node>
                                   <node concept="2qgKlT" id="5wF$o0BESlQ" role="2OqNvi">
                                     <ref role="37wK5l" to="lxua:5wF$o0BEPkN" resolve="makeX" />
@@ -237,9 +237,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5wF$o0BESlR" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817o2" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5wF$o0BESlS" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817o3" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/org.iets3.core.expr.stringvalidation.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/org.iets3.core.expr.stringvalidation.interpreter.msd
index 6c2ca6d724..efe76b8823 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/org.iets3.core.expr.stringvalidation.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/org.iets3.core.expr.stringvalidation.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.stringvalidation.interpreter" uuid="ad2cd2ae-226c-4046-9241-9790f9c3a35e" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.stringvalidation.interpreter" uuid="ad2cd2ae-226c-4046-9241-9790f9c3a35e" 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">f003a0fe-c140-41d7-a145-ea42368e581c(org.iets3.core.expr.stringvalidation)</dependency>
     <dependency reexport="false">f38b69a3-1d33-4f9b-84e0-ac1095df2998(org.iets3.core.expr.stringvalidation.runtime)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps
index 7d414a6619..d2054ca472 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.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="be5191a9-3476-47ca-b2a7-a426623add55" name="org.iets3.core.assessment" version="0" />
   </languages>
@@ -168,7 +168,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -191,7 +191,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -215,6 +215,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" />
@@ -224,7 +225,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -257,7 +258,6 @@
       <concept id="1227022196108" name="jetbrains.mps.baseLanguage.collections.structure.RemoveAtElementOperation" flags="nn" index="2KedMh">
         <child id="1227022274197" name="index" index="2KewY8" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -2005,7 +2005,7 @@
                           <node concept="3clFbF" id="2LaXqmVKYpf" role="3cqZAp">
                             <node concept="2OqwBi" id="2LaXqmVKYpg" role="3clFbG">
                               <node concept="37vLTw" id="2LaXqmVKYph" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2LaXqmVKYpj" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817o4" />
                               </node>
                               <node concept="2OwXpG" id="2LaXqmVKYpi" role="2OqNvi">
                                 <ref role="2Oxat5" node="4lCUG7OtVap" resolve="whatWasFound" />
@@ -2013,9 +2013,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2LaXqmVKYpj" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817o4" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2LaXqmVKYpk" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817o5" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2230,14 +2230,14 @@
                         <ref role="3cqZAo" node="2LaXqmXpWen" resolve="c" />
                       </node>
                       <node concept="37vLTw" id="2LaXqmXpZtf" role="3uHU7B">
-                        <ref role="3cqZAo" node="2LaXqmXpZs1" resolve="it" />
+                        <ref role="3cqZAo" node="4z0AnX817o6" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2LaXqmXpZs1" role="1bW2Oz">
+                <node concept="gl6BB" id="4z0AnX817o6" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2LaXqmXpZs2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4z0AnX817o7" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2958,7 +2958,7 @@
                               <ref role="1Pybhc" node="4lCUG7OtWrX" resolve="Runtime" />
                               <node concept="2OqwBi" id="2LaXqmXq4Ra" role="37wK5m">
                                 <node concept="37vLTw" id="2LaXqmXq4KA" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2LaXqmXq4vF" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817o8" />
                                 </node>
                                 <node concept="2OwXpG" id="2LaXqmXq54J" role="2OqNvi">
                                   <ref role="2Oxat5" node="4lCUG7OtVap" resolve="whatWasFound" />
@@ -2967,9 +2967,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2LaXqmXq4vF" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817o8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2LaXqmXq4vG" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817o9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -6186,15 +6186,15 @@
                                     <ref role="3uigEE" node="5wF$o0BPZ8y" resolve="XMaxCountCheck" />
                                   </node>
                                   <node concept="37vLTw" id="5wF$o0BTX9H" role="2ZW6bz">
-                                    <ref role="3cqZAo" node="5wF$o0BTNt6" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817oa" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5wF$o0BTNt6" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817oa" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5wF$o0BTNt7" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817ob" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/org.iets3.core.expr.stringvalidation.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/org.iets3.core.expr.stringvalidation.runtime.msd
index 820f576c2c..7b7f2bf69e 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/org.iets3.core.expr.stringvalidation.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/org.iets3.core.expr.stringvalidation.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.stringvalidation.runtime" uuid="f38b69a3-1d33-4f9b-84e0-ac1095df2998" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.stringvalidation.runtime" uuid="f38b69a3-1d33-4f9b-84e0-ac1095df2998" 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">00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/models/plugin.mps
index 7ca98ced6a..bfd3e0a8e8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
@@ -124,7 +124,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -254,7 +254,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd
index 3a62398b90..84fe9e3985 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.temporal.interpreter" uuid="06aa4a64-087b-49de-99ac-5bfea95ff839" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.temporal.interpreter" uuid="06aa4a64-087b-49de-99ac-5bfea95ff839" 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">4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68(org.iets3.core.expr.temporal)</dependency>
@@ -29,7 +28,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/models/org.iets3.core.expr.temporal.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/models/org.iets3.core.expr.temporal.runtime.mps
index 91aa0369d3..e50e2bae37 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/models/org.iets3.core.expr.temporal.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/models/org.iets3.core.expr.temporal.runtime.mps
@@ -36,7 +36,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -159,7 +159,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
       <concept id="1214918975462" name="jetbrains.mps.baseLanguage.structure.PostfixDecrementExpression" flags="nn" index="3uO5VW" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="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">
@@ -212,7 +212,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="779128492853369165" name="jetbrains.mps.lang.core.structure.SideTransformInfo" flags="ng" index="1KehLL">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd
index ad342db40b..a9901745d4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.temporal.runtime" uuid="17ecc6b6-d106-4b60-87a9-3fde52f92301" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.temporal.runtime" uuid="17ecc6b6-d106-4b60-87a9-3fde52f92301" 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">957f018c-4561-4081-9ad3-b8618bf1160d(org.iets3.core.expr.datetime.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/models/plugin.mps
index 490f857ef5..724f864ea4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
   </languages>
@@ -76,7 +76,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -134,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/org.iets3.core.expr.tests.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/org.iets3.core.expr.tests.interpreter.msd
index a5ec3f72eb..1297987aa1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/org.iets3.core.expr.tests.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.interpreter/org.iets3.core.expr.tests.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.tests.interpreter" uuid="7a4a0378-45ed-4612-99b5-b72416acc630" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.tests.interpreter" uuid="7a4a0378-45ed-4612-99b5-b72416acc630" 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">cf90f965-8554-4a16-aa0b-6387f27474ab(org.iets3.core.expr.base.interpreter)</dependency>
     <dependency reexport="false">d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)</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: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.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/models/runtime.mps
index 5adcba3c93..051d594684 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/models/runtime.mps
@@ -52,7 +52,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -64,7 +64,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -77,7 +77,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>
@@ -88,7 +88,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd
index ae328bd553..749ae68940 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.tests.rt" uuid="6effa8ea-ddf9-441a-a29e-80a73b7d0fc7" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.tests.rt" uuid="6effa8ea-ddf9-441a-a29e-80a73b7d0fc7" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,14 +10,13 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d441fba0-f46b-43cd-b723-dad7b65da615(org.iets3.core.expr.tests)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-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.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
index 0ed0f220d2..3d4c20a0b8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
   </languages>
@@ -122,7 +122,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>
@@ -195,6 +195,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" />
@@ -243,7 +244,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -270,7 +271,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -2765,16 +2765,16 @@
                               <node concept="liA8E" id="3FGeL_$Ge17" role="2OqNvi">
                                 <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                 <node concept="37vLTw" id="3FGeL_$Ge9c" role="37wK5m">
-                                  <ref role="3cqZAo" node="3FGeL_$Gdp0" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817oc" />
                                 </node>
                                 <node concept="10Nm6u" id="3FGeL_$J3CX" role="37wK5m" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3FGeL_$Gdp0" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817oc" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3FGeL_$Gdp1" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817od" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd
index 958f2d83a9..9bc382bb37 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.toplevel.interpreter" uuid="9c16e638-297e-41f0-b9e1-a1e04a4aea54" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.toplevel.interpreter" uuid="9c16e638-297e-41f0-b9e1-a1e04a4aea54" 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">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
     <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/models/plugin.mps
index 00657d6999..4ca5e62eb9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/models/plugin.mps
@@ -78,7 +78,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -92,7 +92,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -156,7 +156,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd
index 7ba5f6648a..9a3b025814 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.typetags.lib.interpreter" uuid="b4ec5624-2e67-4a4e-9ece-34bcbf966115" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.typetags.lib.interpreter" uuid="b4ec5624-2e67-4a4e-9ece-34bcbf966115" 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">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/models/org.iets3.core.expr.typetags.units.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/models/org.iets3.core.expr.typetags.units.interpreter.plugin.mps
index 99c2f28019..b3190d081d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/models/org.iets3.core.expr.typetags.units.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/models/org.iets3.core.expr.typetags.units.interpreter.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:fab092f1-cf48-4d80-ac99-7ec1d2e9a36b(org.iets3.core.expr.typetags.units.interpreter.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -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" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -91,7 +91,7 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -152,7 +152,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd
index ed504b50f8..54eddf1d1a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.typetags.units.interpreter" uuid="616c1a94-9ced-468d-8c3a-fbdcf9734823" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.typetags.units.interpreter" uuid="616c1a94-9ced-468d-8c3a-fbdcf9734823" 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">cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,12 +21,12 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps
index 53c9cbda31..c26aecdda1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps
@@ -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>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd
index 5da5873639..079e80b70f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.typetags.units.si" uuid="1c761cfd-81b1-4794-9999-148fa76881b8" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.core.expr.typetags.units.si" uuid="1c761cfd-81b1-4794-9999-148fa76881b8" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -22,7 +21,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
index af84fabdb3..f08767b214 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
@@ -147,7 +147,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -222,6 +222,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -280,7 +281,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>
@@ -323,7 +324,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>
@@ -673,7 +673,7 @@
                                   <node concept="2OqwBi" id="7FuUjk_r6Mq" role="3clFbG">
                                     <node concept="qpA2v" id="7FuUjk_r6Mr" role="2Oq$k0">
                                       <node concept="37vLTw" id="7FuUjk_r6Ms" role="3SLO0q">
-                                        <ref role="3cqZAo" node="7FuUjk_r6Mv" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817oe" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="7FuUjk_r6Mt" role="2OqNvi">
@@ -685,9 +685,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7FuUjk_r6Mv" role="1bW2Oz">
+                              <node concept="gl6BB" id="4z0AnX817oe" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7FuUjk_r6Mw" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4z0AnX817of" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -778,7 +778,7 @@
                                           <node concept="2OqwBi" id="7FuUjk_r6Nc" role="3SLO0q">
                                             <node concept="2OqwBi" id="7FuUjk_r6Nd" role="2Oq$k0">
                                               <node concept="37vLTw" id="7FuUjk_r6Ne" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7FuUjk_r6Nh" resolve="it" />
+                                                <ref role="3cqZAo" node="4z0AnX817og" />
                                               </node>
                                               <node concept="3Tsc0h" id="7FuUjk_r6Nf" role="2OqNvi">
                                                 <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -789,9 +789,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7FuUjk_r6Nh" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817og" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7FuUjk_r6Ni" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817oh" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -1000,7 +1000,7 @@
                               <node concept="1Ls8ON" id="7EKPeISQ4_O" role="3clFbG">
                                 <node concept="2OqwBi" id="7EKPeISQ4_P" role="1Lso8e">
                                   <node concept="37vLTw" id="7EKPeISQ4_Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7EKPeISQ4_W" resolve="it" />
+                                    <ref role="3cqZAo" node="4z0AnX817oi" />
                                   </node>
                                   <node concept="3TrEf2" id="7EKPeISQ4_R" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:7FuUjk_mXBR" resolve="col" />
@@ -1009,7 +1009,7 @@
                                 <node concept="qpA2v" id="7EKPeISQ4_S" role="1Lso8e">
                                   <node concept="2OqwBi" id="7EKPeISQ4_T" role="3SLO0q">
                                     <node concept="37vLTw" id="7EKPeISQ4_U" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7EKPeISQ4_W" resolve="it" />
+                                      <ref role="3cqZAo" node="4z0AnX817oi" />
                                     </node>
                                     <node concept="3TrEf2" id="7EKPeISQ4_V" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:7FuUjk_mXBU" resolve="value" />
@@ -1019,9 +1019,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="7EKPeISQ4_W" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817oi" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="7EKPeISQ4_X" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817oj" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1230,16 +1230,16 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="7EKPeISPBEu" role="1LFl5Q">
-                            <ref role="3cqZAo" node="7EKPeISPBEw" resolve="it" />
+                            <ref role="3cqZAo" node="4z0AnX817ok" />
                           </node>
                         </node>
                         <node concept="2bSWHS" id="7EKPeISPBEv" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7EKPeISPBEw" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817ok" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7EKPeISPBEx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817ol" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="7EKPeISPBEy" role="2S7zOq">
@@ -1932,16 +1932,16 @@
                                   <node concept="liA8E" id="AfAutuJGc1" role="2OqNvi">
                                     <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                     <node concept="37vLTw" id="AfAutuJGc2" role="37wK5m">
-                                      <ref role="3cqZAo" node="AfAutuJGc4" resolve="n" />
+                                      <ref role="3cqZAo" node="4z0AnX817om" />
                                     </node>
                                     <node concept="10Nm6u" id="AfAutuJGc3" role="37wK5m" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="AfAutuJGc4" role="1bW2Oz">
+                            <node concept="gl6BB" id="4z0AnX817om" role="1bW2Oz">
                               <property role="TrG5h" value="n" />
-                              <node concept="2jxLKc" id="AfAutuJGc5" role="1tU5fm" />
+                              <node concept="2jxLKc" id="4z0AnX817on" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2278,16 +2278,16 @@
                                           <node concept="liA8E" id="AfAutuJGdD" role="2OqNvi">
                                             <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                             <node concept="37vLTw" id="AfAutuJGdE" role="37wK5m">
-                                              <ref role="3cqZAo" node="AfAutuJGdG" resolve="n" />
+                                              <ref role="3cqZAo" node="4z0AnX817oo" />
                                             </node>
                                             <node concept="10Nm6u" id="AfAutuJGdF" role="37wK5m" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="AfAutuJGdG" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817oo" role="1bW2Oz">
                                       <property role="TrG5h" value="n" />
-                                      <node concept="2jxLKc" id="AfAutuJGdH" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817op" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -2516,7 +2516,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="AfAutuJGeP" role="3uHU7B">
                                             <node concept="37vLTw" id="AfAutuJGeQ" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="AfAutuJGeX" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817oq" />
                                             </node>
                                             <node concept="3TrEf2" id="AfAutuJGeR" role="2OqNvi">
                                               <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -2526,7 +2526,7 @@
                                         <node concept="3clFbC" id="AfAutuJGeS" role="3uHU7B">
                                           <node concept="2OqwBi" id="AfAutuJGeT" role="3uHU7B">
                                             <node concept="37vLTw" id="AfAutuJGeU" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="AfAutuJGeX" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817oq" />
                                             </node>
                                             <node concept="3TrEf2" id="AfAutuJGeV" role="2OqNvi">
                                               <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -2539,9 +2539,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="AfAutuJGeX" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oq" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="AfAutuJGeY" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817or" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3296,7 +3296,7 @@
                                   <node concept="2OqwBi" id="Om1N8TzGwU" role="3clFbG">
                                     <node concept="2OqwBi" id="Om1N8TzAyo" role="2Oq$k0">
                                       <node concept="37vLTw" id="Om1N8TzAfI" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4LQ7f3j_ypV" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817ou" />
                                       </node>
                                       <node concept="2Rf3mk" id="Om1N8TzB7w" role="2OqNvi">
                                         <node concept="1xIGOp" id="Om1N8TzEKL" role="1xVPHs" />
@@ -3313,16 +3313,16 @@
                                               <node concept="liA8E" id="Om1N8V9h9v" role="2OqNvi">
                                                 <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                                 <node concept="37vLTw" id="Om1N8V9h9y" role="37wK5m">
-                                                  <ref role="3cqZAo" node="Om1N8TzIZy" resolve="n" />
+                                                  <ref role="3cqZAo" node="4z0AnX817os" />
                                                 </node>
                                                 <node concept="10Nm6u" id="Om1N8V9hAh" role="37wK5m" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="Om1N8TzIZy" role="1bW2Oz">
+                                        <node concept="gl6BB" id="4z0AnX817os" role="1bW2Oz">
                                           <property role="TrG5h" value="n" />
-                                          <node concept="2jxLKc" id="Om1N8TzIZz" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="4z0AnX817ot" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3341,7 +3341,7 @@
                                             <ref role="cht4Q" to="kfo3:6OunYCfi$ob" resolve="RangeValueExpr" />
                                           </node>
                                           <node concept="37vLTw" id="6OunYCflTUH" role="1m5AlR">
-                                            <ref role="3cqZAo" node="4LQ7f3j_ypV" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817ou" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="6OunYCflTUI" role="2OqNvi">
@@ -3391,7 +3391,7 @@
                               </node>
                               <node concept="2OqwBi" id="6OunYCfl5TB" role="3clFbw">
                                 <node concept="37vLTw" id="6OunYCfkUGr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4LQ7f3j_ypV" resolve="it" />
+                                  <ref role="3cqZAo" node="4z0AnX817ou" />
                                 </node>
                                 <node concept="1mIQ4w" id="6OunYCfl6iJ" role="2OqNvi">
                                   <node concept="chp4Y" id="6OunYCfl6pU" role="cj9EA">
@@ -3406,7 +3406,7 @@
                                       <node concept="1rXfSq" id="4rjLou3wq_C" role="2Oq$k0">
                                         <ref role="37wK5l" node="4rjLou3w8Cv" resolve="exec" />
                                         <node concept="37vLTw" id="4rjLou3wqVT" role="37wK5m">
-                                          <ref role="3cqZAo" node="4LQ7f3j_ypV" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817ou" />
                                         </node>
                                         <node concept="37vLTw" id="4rjLou3wrxP" role="37wK5m">
                                           <ref role="3cqZAo" node="5sWTAJ3pqdU" resolve="rowTrace" />
@@ -3424,9 +3424,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4LQ7f3j_ypV" role="1bW2Oz">
+                          <node concept="gl6BB" id="4z0AnX817ou" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4LQ7f3j_ypW" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4z0AnX817ov" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3626,7 +3626,7 @@
                           <node concept="3clFbF" id="6OunYCf7RWR" role="3cqZAp">
                             <node concept="2OqwBi" id="6OunYCf7RWS" role="3clFbG">
                               <node concept="37vLTw" id="6OunYCf7RWT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6OunYCf7RWW" resolve="it" />
+                                <ref role="3cqZAo" node="4z0AnX817ow" />
                               </node>
                               <node concept="1mIQ4w" id="6OunYCf7RWU" role="2OqNvi">
                                 <node concept="chp4Y" id="6OunYCf7RWV" role="cj9EA">
@@ -3636,9 +3636,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6OunYCf7RWW" role="1bW2Oz">
+                        <node concept="gl6BB" id="4z0AnX817ow" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6OunYCf7RWX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4z0AnX817ox" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3744,7 +3744,7 @@
                                         <node concept="2OqwBi" id="MOCoK$zSTw" role="37wK5m">
                                           <node concept="2OqwBi" id="MOCoK$zSTx" role="2Oq$k0">
                                             <node concept="37vLTw" id="MOCoK$zSTy" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="MOCoK$zSTA" resolve="it" />
+                                              <ref role="3cqZAo" node="4z0AnX817oy" />
                                             </node>
                                             <node concept="3Tsc0h" id="MOCoK$zSTz" role="2OqNvi">
                                               <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -3758,9 +3758,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="MOCoK$zSTA" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oy" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="MOCoK$zSTB" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817oz" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd
index 8ae6d4b63d..2801d30e8b 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.core.expr.util.interpreter" uuid="4289e037-cc03-4bfe-bf89-2db268aec73a" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="org.iets3.core.expr.util.interpreter" uuid="4289e037-cc03-4bfe-bf89-2db268aec73a" 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">8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-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.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build/build.mps
index 3246e01126..af4db94d24 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/models/org/iets3/opensource/allScripts/build/build.mps
@@ -60,7 +60,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" />
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd
index 82bbaff461..5bedf14158 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.allScripts.build" uuid="ed0abc8f-2bd9-460c-b01c-761f3a610483" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.opensource.allScripts.build" uuid="ed0abc8f-2bd9-460c-b01c-761f3a610483" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/models/org.iets3.opensource.build.gentests.rt.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/models/org.iets3.opensource.build.gentests.rt.mps
index 355d0d57bb..135318800f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/models/org.iets3.opensource.build.gentests.rt.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/models/org.iets3.opensource.build.gentests.rt.mps
@@ -14,7 +14,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -31,7 +31,7 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="2580416627845338977" name="jetbrains.mps.baseLanguage.structure.ImplicitAnnotationInstanceValue" flags="ng" index="1SXeKx" />
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd
index ec04ee7080..3a80c538a4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.build.gentests.rt" uuid="e70ad515-8ff0-4a50-8cb4-41406f14e348" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.opensource.build.gentests.rt" uuid="e70ad515-8ff0-4a50-8cb4-41406f14e348" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,12 +11,9 @@
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/takari-cpsuite-1.2.7.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/takari-cpsuite-1.2.7.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd
index 041c58b07e..8b321a5a9f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.build" uuid="31dfb853-8304-435d-b27c-e29ef9a627cf" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.opensource.build" uuid="31dfb853-8304-435d-b27c-e29ef9a627cf" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
index d1c79be450..231e4d01cc 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
     <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="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" />
   </languages>
@@ -61,7 +61,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">
@@ -100,7 +100,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>
@@ -145,6 +145,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" />
@@ -157,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>
@@ -215,7 +216,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -635,7 +635,7 @@
                                       <node concept="3clFbF" id="6wumyRU9QhV" role="3cqZAp">
                                         <node concept="2OqwBi" id="6wumyRU9Qq_" role="3clFbG">
                                           <node concept="37vLTw" id="6wumyRU9QhU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6wumyRU9QhG" resolve="it" />
+                                            <ref role="3cqZAo" node="4z0AnX817o$" />
                                           </node>
                                           <node concept="liA8E" id="6wumyRU9QDF" role="2OqNvi">
                                             <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -646,9 +646,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="6wumyRU9QhG" role="1bW2Oz">
+                                    <node concept="gl6BB" id="4z0AnX817o$" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="6wumyRU9QhH" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="4z0AnX817o_" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -660,14 +660,14 @@
                                       <node concept="3y3z36" id="6wumyRU9Sfd" role="3clFbG">
                                         <node concept="10Nm6u" id="6wumyRU9SsW" role="3uHU7w" />
                                         <node concept="37vLTw" id="6wumyRU9S78" role="3uHU7B">
-                                          <ref role="3cqZAo" node="6wumyRU9RY8" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817oA" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6wumyRU9RY8" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oA" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="6wumyRU9RY9" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817oB" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -678,7 +678,7 @@
                                   <node concept="3clFbF" id="6lwqIIdXhJ7" role="3cqZAp">
                                     <node concept="2OqwBi" id="6lwqIIdXhVl" role="3clFbG">
                                       <node concept="37vLTw" id="6lwqIIdXhJ6" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6lwqIIdXhDQ" resolve="it" />
+                                        <ref role="3cqZAo" node="4z0AnX817oC" />
                                       </node>
                                       <node concept="liA8E" id="6lwqIIdXobt" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
@@ -686,9 +686,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6lwqIIdXhDQ" role="1bW2Oz">
+                                <node concept="gl6BB" id="4z0AnX817oC" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6lwqIIdXhDR" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="4z0AnX817oD" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -945,7 +945,7 @@
                                     <node concept="3clFbF" id="6lwqIIdYoD0" role="3cqZAp">
                                       <node concept="2OqwBi" id="6lwqIIdYoIj" role="3clFbG">
                                         <node concept="37vLTw" id="6lwqIIdYoCZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6lwqIIdYo_i" resolve="it" />
+                                          <ref role="3cqZAo" node="4z0AnX817oE" />
                                         </node>
                                         <node concept="liA8E" id="6lwqIIdYpkX" role="2OqNvi">
                                           <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -953,9 +953,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6lwqIIdYo_i" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oE" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="6lwqIIdYo_j" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817oF" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -978,24 +978,24 @@
                                     <node concept="3clFbF" id="6lwqIIdYqmp" role="3cqZAp">
                                       <node concept="2OqwBi" id="6lwqIIdYqLn" role="3clFbG">
                                         <node concept="37vLTw" id="6lwqIIdYqmo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6lwqIIdYqi6" resolve="a" />
+                                          <ref role="3cqZAo" node="4z0AnX817oG" />
                                         </node>
                                         <node concept="liA8E" id="6lwqIIdYrF6" role="2OqNvi">
                                           <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                                           <node concept="37vLTw" id="6lwqIIdYrR0" role="37wK5m">
-                                            <ref role="3cqZAo" node="6lwqIIdYqi6" resolve="a" />
+                                            <ref role="3cqZAo" node="4z0AnX817oG" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6lwqIIdYqi6" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oG" role="1bW2Oz">
                                     <property role="TrG5h" value="a" />
-                                    <node concept="2jxLKc" id="6lwqIIdYqi7" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817oH" role="1tU5fm" />
                                   </node>
-                                  <node concept="Rh6nW" id="6lwqIIdYqi8" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4z0AnX817oI" role="1bW2Oz">
                                     <property role="TrG5h" value="b" />
-                                    <node concept="2jxLKc" id="6lwqIIdYqi9" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4z0AnX817oJ" role="1tU5fm" />
                                   </node>
                                 </node>
                                 <node concept="1nlBCl" id="6lwqIIdYqia" role="2Dq5b$">
@@ -1127,7 +1127,7 @@
                     <node concept="3clFbF" id="6lwqIIdZ5Bo" role="3cqZAp">
                       <node concept="2OqwBi" id="6lwqIIdZ6XX" role="3clFbG">
                         <node concept="37vLTw" id="6lwqIIdZ5Bn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6lwqIIdZ3Nj" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817oK" />
                         </node>
                         <node concept="2OwXpG" id="6lwqIIdZ9mB" role="2OqNvi">
                           <ref role="2Oxat5" to="zn9m:~Pair.first" resolve="first" />
@@ -1135,9 +1135,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6lwqIIdZ3Nj" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817oK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6lwqIIdZ3Nk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817oL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
index c478ac105a..f9b1e12f2d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.iets3.opensource.linters" uuid="d513acb5-1eac-4906-826c-9fbe0a028e42" moduleVersion="0" compileInMPS="true">
+<solution name="org.iets3.opensource.linters" uuid="d513acb5-1eac-4906-826c-9fbe0a028e42" 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">a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9(org.mpsqa.lint.generic.linters_library)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
diff --git a/code/languages/org.iets3.opensource/solutions/playground/models/m1.mps b/code/languages/org.iets3.opensource/solutions/playground/models/m1.mps
index c7fc989cac..2fdbcb612a 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/models/m1.mps
+++ b/code/languages/org.iets3.opensource/solutions/playground/models/m1.mps
@@ -36,10 +36,10 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="5115872837157187871" name="org.iets3.core.expr.base.structure.ParensExpression" flags="ng" index="30bsCy">
@@ -168,7 +168,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -189,7 +189,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -211,11 +211,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -231,7 +231,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/solutions/playground/models/playground.bindingtimes.mps b/code/languages/org.iets3.opensource/solutions/playground/models/playground.bindingtimes.mps
index cb799eefbd..116a897637 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/models/playground.bindingtimes.mps
+++ b/code/languages/org.iets3.opensource/solutions/playground/models/playground.bindingtimes.mps
@@ -9,7 +9,7 @@
   <imports />
   <registry>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156578546" name="org.iets3.core.expr.base.structure.PlusExpression" flags="ng" index="30dDZf" />
@@ -76,7 +76,7 @@
       <concept id="1759375669591494838" name="org.iets3.core.expr.typetags.structure.TaggedType" flags="ng" index="2c7tTJ">
         <child id="1759375669591494841" name="baseType" index="2c7tTw" />
       </concept>
-      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ng" index="3ciMKZ">
+      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ngI" index="3ciMKZ">
         <child id="1759375669591494839" name="tags" index="2c7tTI" />
       </concept>
     </language>
@@ -84,7 +84,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/playground/models/playground.priorisationInCC.mps b/code/languages/org.iets3.opensource/solutions/playground/models/playground.priorisationInCC.mps
index 29f017c3e4..511dd86af1 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/models/playground.priorisationInCC.mps
+++ b/code/languages/org.iets3.opensource/solutions/playground/models/playground.priorisationInCC.mps
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
     </language>
@@ -42,7 +42,7 @@
       <concept id="4790956042240148643" name="org.iets3.core.expr.toplevel.structure.Function" flags="ng" index="1aga60" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -50,16 +50,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/playground/models/sheets.mps b/code/languages/org.iets3.opensource/solutions/playground/models/sheets.mps
index 82e2d2cc2c..4224a0febd 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/models/sheets.mps
+++ b/code/languages/org.iets3.opensource/solutions/playground/models/sheets.mps
@@ -32,7 +32,7 @@
       <concept id="7782108600708168956" name="org.iets3.core.expr.base.structure.ReferenceType" flags="ng" index="nhQpQ">
         <child id="7782108600708168957" name="baseType" index="nhQpR" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -106,7 +106,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -221,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>
@@ -243,11 +243,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -260,7 +260,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/solutions/playground/models/wgld.mps b/code/languages/org.iets3.opensource/solutions/playground/models/wgld.mps
index b726e43e73..5a34a8ece6 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/models/wgld.mps
+++ b/code/languages/org.iets3.opensource/solutions/playground/models/wgld.mps
@@ -146,7 +146,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -154,16 +154,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/playground/playground.msd b/code/languages/org.iets3.opensource/solutions/playground/playground.msd
index 688e477229..5d0f18f075 100644
--- a/code/languages/org.iets3.opensource/solutions/playground/playground.msd
+++ b/code/languages/org.iets3.opensource/solutions/playground/playground.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="playground" uuid="8f993025-dae8-4316-bd1e-c16bb4dc37fc" moduleVersion="0" compileInMPS="true">
+<solution name="playground" uuid="8f993025-dae8-4316-bd1e-c16bb4dc37fc" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/models/messages@tests.mps b/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/models/messages@tests.mps
index 182f35c018..fa5cf405d5 100644
--- a/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/models/messages@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/models/messages@tests.mps
@@ -18,7 +18,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -33,7 +33,7 @@
       <concept id="411710798114972602" name="org.iets3.core.expr.base.structure.FailExpr" flags="ng" index="qoPdK">
         <child id="411710798114972606" name="message" index="qoPdO" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -43,7 +43,7 @@
         <child id="6541611649051509994" name="err" index="2izrR8" />
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -129,7 +129,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -164,7 +164,7 @@
       </concept>
       <concept id="4026566441521058530" name="org.iets3.core.expr.messages.structure.CoercionIt" flags="ng" index="1WJySU" />
       <concept id="4026566441518088795" name="org.iets3.core.expr.messages.structure.Group" flags="ng" index="1WOfU3" />
-      <concept id="4026566441518088787" name="org.iets3.core.expr.messages.structure.IMessageNamespace" flags="ng" index="1WOfUb">
+      <concept id="4026566441518088787" name="org.iets3.core.expr.messages.structure.IMessageNamespace" flags="ngI" index="1WOfUb">
         <child id="4026566441518088822" name="contents" index="1WOfUI" />
       </concept>
       <concept id="4026566441518088783" name="org.iets3.core.expr.messages.structure.MessageContainer" flags="ng" index="1WOfUn">
@@ -195,7 +195,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -215,10 +215,10 @@
       <concept id="4790956042240983401" name="org.iets3.core.expr.lambda.structure.BlockExpression" flags="ng" index="1aduha">
         <child id="4790956042240983402" name="expressions" index="1aduh9" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd b/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd
index 1ffaae7bea..0744fb8662 100644
--- a/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd
+++ b/code/languages/org.iets3.opensource/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ex.core.expr.genjava" uuid="0a68022c-4e89-4403-a717-1caf19c68980" moduleVersion="0" compileInMPS="true">
+<solution name="test.ex.core.expr.genjava" uuid="0a68022c-4e89-4403-a717-1caf19c68980" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input1.mps b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input1.mps
index 7fa0867acd..07c9502e68 100644
--- a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input1.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input1.mps
@@ -16,11 +16,11 @@
   </imports>
   <registry>
     <language id="7d21cc4b-4c24-41db-9868-8af4a7f3eba9" name="org.iets3.core.trace">
-      <concept id="2117670517801950028" name="org.iets3.core.trace.structure.ITraceTargetProvider" flags="ng" index="2Dx65h">
+      <concept id="2117670517801950028" name="org.iets3.core.trace.structure.ITraceTargetProvider" flags="ngI" index="2Dx65h">
         <reference id="2117670517801950029" name="traceTarget" index="2Dx65g" />
       </concept>
       <concept id="2117670517801951066" name="org.iets3.core.trace.structure.NamedTargetProvider" flags="ng" index="2Dx6l7" />
-      <concept id="2117670517801898047" name="org.iets3.core.trace.structure.ITrace" flags="ng" index="2DxiCy">
+      <concept id="2117670517801898047" name="org.iets3.core.trace.structure.ITrace" flags="ngI" index="2DxiCy">
         <child id="2117670517801898058" name="traceTarget" index="2DxiDn" />
         <child id="2117670517801898048" name="traceKind" index="2DxiDt" />
       </concept>
@@ -34,10 +34,10 @@
       <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$" />
     </language>
     <language id="583939be-ded0-4735-a055-a74f8477fc34" name="org.iets3.core.attributes">
-      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ng" index="18DfD4">
+      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ngI" index="18DfD4">
         <child id="4388710048722005710" name="attributes" index="18DfD7" />
       </concept>
-      <concept id="1970998948978453245" name="org.iets3.core.attributes.structure.IValueAttribute" flags="ng" index="3PRgZ$">
+      <concept id="1970998948978453245" name="org.iets3.core.attributes.structure.IValueAttribute" flags="ngI" index="3PRgZ$">
         <child id="1970998948979996854" name="value" index="3PL9QJ" />
       </concept>
     </language>
@@ -77,7 +77,7 @@
       </concept>
       <concept id="596856272727148586" name="org.iets3.components.core.structure.EmptyComponentInterfaceContent" flags="ng" index="H_vQO" />
       <concept id="7804632404593342574" name="org.iets3.components.core.structure.EmptyComponentsChunkContent" flags="ng" index="1i1AuW" />
-      <concept id="7804632404593342035" name="org.iets3.components.core.structure.IComponentsChunkContent" flags="ng" index="1i1AA1">
+      <concept id="7804632404593342035" name="org.iets3.components.core.structure.IComponentsChunkContent" flags="ngI" index="1i1AA1">
         <property id="6142232665969969516" name="public" index="13Nl5X" />
       </concept>
       <concept id="7804632404593341326" name="org.iets3.components.core.structure.ComponentsChunk" flags="ng" index="1i1ALs">
@@ -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.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input2.mps b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input2.mps
index 0ff8ca5154..c083fe1244 100644
--- a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input2.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/input2.mps
@@ -13,11 +13,11 @@
   </imports>
   <registry>
     <language id="7d21cc4b-4c24-41db-9868-8af4a7f3eba9" name="org.iets3.core.trace">
-      <concept id="2117670517801950028" name="org.iets3.core.trace.structure.ITraceTargetProvider" flags="ng" index="2Dx65h">
+      <concept id="2117670517801950028" name="org.iets3.core.trace.structure.ITraceTargetProvider" flags="ngI" index="2Dx65h">
         <reference id="2117670517801950029" name="traceTarget" index="2Dx65g" />
       </concept>
       <concept id="2117670517801951066" name="org.iets3.core.trace.structure.NamedTargetProvider" flags="ng" index="2Dx6l7" />
-      <concept id="2117670517801898047" name="org.iets3.core.trace.structure.ITrace" flags="ng" index="2DxiCy">
+      <concept id="2117670517801898047" name="org.iets3.core.trace.structure.ITrace" flags="ngI" index="2DxiCy">
         <child id="2117670517801898058" name="traceTarget" index="2DxiDn" />
         <child id="2117670517801898048" name="traceKind" index="2DxiDt" />
       </concept>
@@ -25,10 +25,10 @@
       <concept id="2117670517802470200" name="org.iets3.core.trace.structure.TraceAttribute" flags="ng" index="2Dz74_" />
     </language>
     <language id="583939be-ded0-4735-a055-a74f8477fc34" name="org.iets3.core.attributes">
-      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ng" index="18DfD4">
+      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ngI" index="18DfD4">
         <child id="4388710048722005710" name="attributes" index="18DfD7" />
       </concept>
-      <concept id="1970998948978453245" name="org.iets3.core.attributes.structure.IValueAttribute" flags="ng" index="3PRgZ$">
+      <concept id="1970998948978453245" name="org.iets3.core.attributes.structure.IValueAttribute" flags="ngI" index="3PRgZ$">
         <child id="1970998948979996854" name="value" index="3PL9QJ" />
       </concept>
     </language>
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
index 9e4ea554fe..3f0d9fa140 100644
--- a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
@@ -107,7 +107,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="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>
@@ -134,6 +134,7 @@
       <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -220,7 +221,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -240,7 +241,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -273,7 +273,7 @@
                     <node concept="3clFbF" id="mhbzaHpB8$" role="3cqZAp">
                       <node concept="2OqwBi" id="mhbzaHpBkD" role="3clFbG">
                         <node concept="37vLTw" id="mhbzaHpB8z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="mhbzaHpB2Q" resolve="it" />
+                          <ref role="3cqZAo" node="4z0AnX817oM" />
                         </node>
                         <node concept="2qgKlT" id="mhbzaHpBEa" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -281,9 +281,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="mhbzaHpB2Q" role="1bW2Oz">
+                  <node concept="gl6BB" id="4z0AnX817oM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="mhbzaHpB2R" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4z0AnX817oN" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="1nlBCl" id="mhbzaHpB2S" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd
index f81745e647..3cd1577323 100644
--- a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd
+++ b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.iets3.core.tracequery" uuid="785e2843-aa64-4743-afec-47634f9d78a4" moduleVersion="0" compileInMPS="true">
+<solution name="test.iets3.core.tracequery" uuid="785e2843-aa64-4743-afec-47634f9d78a4" 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">be5191a9-3476-47ca-b2a7-a426623add55(org.iets3.core.assessment)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
@@ -32,7 +31,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/test.org.iets3.core.comments/models/tests@tests.mps b/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/models/tests@tests.mps
index 0bc33c82a5..6720a5d625 100644
--- a/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/models/tests@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/models/tests@tests.mps
@@ -82,7 +82,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd b/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd
index abea84a07a..ca4fc7d10c 100644
--- a/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd
+++ b/code/languages/org.iets3.opensource/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.org.iets3.core.comments" uuid="5b2a22be-3ce2-4929-be5b-e39b8b142a74" moduleVersion="0" compileInMPS="true">
+<solution name="test.org.iets3.core.comments" uuid="5b2a22be-3ce2-4929-be5b-e39b8b142a74" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,6 @@
     </facet>
     <facet type="tests" />
   </facets>
-  <sourcePath />
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/solutions/test.ts.components.core/models/tests@tests.mps b/code/languages/org.iets3.opensource/solutions/test.ts.components.core/models/tests@tests.mps
index 31b81c0f38..a452aa4f04 100644
--- a/code/languages/org.iets3.opensource/solutions/test.ts.components.core/models/tests@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.ts.components.core/models/tests@tests.mps
@@ -28,7 +28,7 @@
         <reference id="5449224527592117654" name="checkingReference" index="1BTHP0" />
         <child id="3655334166513314307" name="nodes" index="3KTr4d" />
       </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" />
@@ -47,7 +47,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -88,10 +88,10 @@
       <concept id="806329106163335739" name="org.iets3.core.attributes.structure.AttributeContainer" flags="ng" index="33R2CR">
         <child id="806329106163335756" name="nestedAttributes" index="33R2D0" />
       </concept>
-      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ng" index="18DfD4">
+      <concept id="4388710048722005709" name="org.iets3.core.attributes.structure.IAttributed" flags="ngI" index="18DfD4">
         <child id="4388710048722005710" name="attributes" index="18DfD7" />
       </concept>
-      <concept id="4886573260946228671" name="org.iets3.core.attributes.structure.IAttributeWithContext" flags="ng" index="3ojXR2">
+      <concept id="4886573260946228671" name="org.iets3.core.attributes.structure.IAttributeWithContext" flags="ngI" index="3ojXR2">
         <child id="4886573260946228672" name="ctx" index="3ojXQX" />
       </concept>
       <concept id="4886573260947348600" name="org.iets3.core.attributes.structure.EmptyAttribute" flags="ng" index="3oocg5" />
@@ -164,7 +164,7 @@
         <reference id="7804632404593436655" name="ref" index="1i1fwX" />
       </concept>
       <concept id="7804632404593342574" name="org.iets3.components.core.structure.EmptyComponentsChunkContent" flags="ng" index="1i1AuW" />
-      <concept id="7804632404593342035" name="org.iets3.components.core.structure.IComponentsChunkContent" flags="ng" index="1i1AA1">
+      <concept id="7804632404593342035" name="org.iets3.components.core.structure.IComponentsChunkContent" flags="ngI" index="1i1AA1">
         <property id="6142232665969969516" name="public" index="13Nl5X" />
       </concept>
       <concept id="7804632404593341326" name="org.iets3.components.core.structure.ComponentsChunk" flags="ng" index="1i1ALs">
@@ -197,7 +197,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -233,7 +233,7 @@
       <concept id="4773799153887154601" name="test.iest3.component.attribute.structure.TestConnectorType" flags="ng" index="3IJI2w" />
     </language>
     <language id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda">
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/test.ts.components.core/test.ts.components.core.msd b/code/languages/org.iets3.opensource/solutions/test.ts.components.core/test.ts.components.core.msd
index 10508ab32e..53d1e16c14 100644
--- a/code/languages/org.iets3.opensource/solutions/test.ts.components.core/test.ts.components.core.msd
+++ b/code/languages/org.iets3.opensource/solutions/test.ts.components.core/test.ts.components.core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.components.core" uuid="8239233b-13cc-4bd1-842b-cf2561ff9a12" moduleVersion="0" compileInMPS="true">
+<solution name="test.ts.components.core" uuid="8239233b-13cc-4bd1-842b-cf2561ff9a12" 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">f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)</dependency>
   </dependencies>
@@ -28,7 +27,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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.iets3.opensource/tests/test.in.expr.os/models/algebraic@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/algebraic@tests.mps
index 94093524b6..0139e121c3 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/algebraic@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/algebraic@tests.mps
@@ -24,7 +24,7 @@
         <child id="8694548031077039770" name="typeConstraint" index="ygwf4" />
       </concept>
       <concept id="8872269265511400449" name="org.iets3.core.expr.collections.structure.DistinctOp" flags="ng" index="2Tjeny" />
-      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ng" index="1bLd8V">
+      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ngI" index="1bLd8V">
         <child id="527291771311128762" name="arg" index="26Ft6C" />
       </concept>
       <concept id="7554398283340640412" name="org.iets3.core.expr.collections.structure.MapOp" flags="ng" index="3iw6QE" />
@@ -43,10 +43,10 @@
       <concept id="4618483580248255217" name="org.iets3.core.expr.collections.structure.UnpackOptionsOp" flags="ng" index="3LGWMD" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -71,10 +71,10 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="2807135271608145920" name="org.iets3.core.expr.base.structure.IsSomeExpression" flags="ng" index="UmaEC">
@@ -186,7 +186,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -309,7 +309,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -327,17 +327,17 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="3880322347437217307" name="effect" index="28QfE6" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/dataflow@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/dataflow@tests.mps
index 4263d6fbba..54c88b7066 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/dataflow@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/dataflow@tests.mps
@@ -32,7 +32,7 @@
       <concept id="1019070541450015930" name="org.iets3.core.expr.base.structure.TupleType" flags="ng" index="m5gfS">
         <child id="1019070541450015931" name="elementTypes" index="m5gfT" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837157187871" name="org.iets3.core.expr.base.structure.ParensExpression" flags="ng" index="30bsCy">
@@ -87,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -185,16 +185,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/datetime@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/datetime@tests.mps
index 2481fec1b0..ddbe0e0eae 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/datetime@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/datetime@tests.mps
@@ -31,10 +31,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt" />
@@ -318,7 +318,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/math@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/math@tests.mps
index 17ca689a2d..a7d6a52fd6 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/math@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/math@tests.mps
@@ -20,7 +20,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" />
@@ -36,12 +36,12 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837157187871" name="org.iets3.core.expr.base.structure.ParensExpression" flags="ng" index="30bsCy">
@@ -200,7 +200,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -208,11 +208,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -225,7 +225,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/messages@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/messages@tests.mps
index 596921b5ea..322b59a195 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/messages@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/messages@tests.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -41,7 +41,7 @@
       <concept id="411710798114972602" name="org.iets3.core.expr.base.structure.FailExpr" flags="ng" index="qoPdK">
         <child id="411710798114972606" name="message" index="qoPdO" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -51,7 +51,7 @@
         <child id="6541611649051509994" name="err" index="2izrR8" />
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -143,7 +143,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -180,7 +180,7 @@
       </concept>
       <concept id="4026566441521058530" name="org.iets3.core.expr.messages.structure.CoercionIt" flags="ng" index="1WJySU" />
       <concept id="4026566441518088795" name="org.iets3.core.expr.messages.structure.Group" flags="ng" index="1WOfU3" />
-      <concept id="4026566441518088787" name="org.iets3.core.expr.messages.structure.IMessageNamespace" flags="ng" index="1WOfUb">
+      <concept id="4026566441518088787" name="org.iets3.core.expr.messages.structure.IMessageNamespace" flags="ngI" index="1WOfUb">
         <child id="4026566441518088822" name="contents" index="1WOfUI" />
       </concept>
       <concept id="4026566441518088783" name="org.iets3.core.expr.messages.structure.MessageContainer" flags="ng" index="1WOfUn">
@@ -211,7 +211,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -231,10 +231,10 @@
       <concept id="4790956042240983401" name="org.iets3.core.expr.lambda.structure.BlockExpression" flags="ng" index="1aduha">
         <child id="4790956042240983402" name="expressions" index="1aduh9" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/mutable@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/mutable@tests.mps
index 369329a74a..e6687b6664 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/mutable@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/mutable@tests.mps
@@ -175,7 +175,7 @@
         <child id="8694548031077660261" name="typeConstraint" index="ynoGV" />
       </concept>
       <concept id="8872269265518788050" name="org.iets3.core.expr.collections.structure.AllOp" flags="ng" index="2TZ5KL" />
-      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ng" index="1bLd8V">
+      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ngI" index="1bLd8V">
         <child id="527291771311128762" name="arg" index="26Ft6C" />
       </concept>
       <concept id="5291952221899372124" name="org.iets3.core.expr.collections.structure.MapLikeType" flags="ng" index="1bPBNu">
@@ -187,7 +187,7 @@
       </concept>
       <concept id="7757419675876255273" name="org.iets3.core.expr.collections.structure.MapKeysOp" flags="ng" index="1hBg8L" />
       <concept id="7757419675876240958" name="org.iets3.core.expr.collections.structure.MapValuesOp" flags="ng" index="1hBkCA" />
-      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ng" index="1idJ_1">
+      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ngI" index="1idJ_1">
         <child id="7757419675865128346" name="arg" index="1idJA2" />
       </concept>
       <concept id="7554398283340640412" name="org.iets3.core.expr.collections.structure.MapOp" flags="ng" index="3iw6QE" />
@@ -224,10 +224,10 @@
       <concept id="9097157441620016186" name="org.iets3.core.expr.collections.structure.ForeachOp" flags="ng" index="3NG6h4" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -261,10 +261,10 @@
         <reference id="7089558164910719191" name="try" index="2zAAH1" />
       </concept>
       <concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -274,7 +274,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -458,7 +458,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -548,7 +548,7 @@
         <child id="5456956546147356870" name="count" index="1co17n" />
       </concept>
       <concept id="5456956546137040126" name="org.iets3.core.expr.mutable.structure.ThrowInterceptor" flags="ng" index="1cxEnJ" />
-      <concept id="5456956546136473372" name="org.iets3.core.expr.mutable.structure.IInterceptorContainer" flags="ng" index="1czZSd">
+      <concept id="5456956546136473372" name="org.iets3.core.expr.mutable.structure.IInterceptorContainer" flags="ngI" index="1czZSd">
         <child id="5456956546136477250" name="interceptors" index="1czwXj" />
       </concept>
       <concept id="5456956546137624418" name="org.iets3.core.expr.mutable.structure.ContextArgValue" flags="ng" index="1cZoTN">
@@ -598,7 +598,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>
@@ -616,7 +616,7 @@
         <child id="5994308065059740883" name="args" index="1v5heY" />
         <child id="5994308065059743871" name="type" index="1v5isi" />
       </concept>
-      <concept id="5994308065059776299" name="org.iets3.core.expr.metafunction.structure.IMetaFunctionContext" flags="ng" index="1v5qx6">
+      <concept id="5994308065059776299" name="org.iets3.core.expr.metafunction.structure.IMetaFunctionContext" flags="ngI" index="1v5qx6">
         <child id="5994308065059799377" name="function" index="1v5wSW" />
       </concept>
       <concept id="5994308065068956525" name="org.iets3.core.expr.metafunction.structure.MetaFunArgRef" flags="ng" index="1vwrg0">
@@ -640,11 +640,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <property id="2861782275883660525" name="ext" index="1HeIcW" />
         <child id="3880322347437217307" name="effect" index="28QfE6" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
@@ -662,7 +662,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
index d747de277e..e3efff9a65 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
@@ -23,7 +23,7 @@
       </concept>
       <concept id="8560722270289800014" name="org.iets3.core.expr.base.structure.PlusTag" flags="ng" index="zEY32" />
       <concept id="8560722270290706287" name="org.iets3.core.expr.base.structure.MulTag" flags="ng" index="zJzjz" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="8006404979729416973" name="org.iets3.core.expr.base.structure.OrTag" flags="ng" index="2BFbn_" />
@@ -72,7 +72,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/statemachines@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/statemachines@tests.mps
index 3a51c6a8b8..b748d1e23f 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/statemachines@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/statemachines@tests.mps
@@ -111,7 +111,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.iets3.opensource/tests/test.in.expr.os/models/temporal@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/temporal@tests.mps
index bf50257dc5..aa6de6a726 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/temporal@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/temporal@tests.mps
@@ -74,7 +74,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">
@@ -101,7 +101,7 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,17 +116,17 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -137,10 +137,10 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt" />
@@ -294,7 +294,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -447,7 +447,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>
       <concept id="8243879142738608185" name="jetbrains.mps.baseLanguage.unitTest.structure.BeforeTest" flags="in" index="1KhYhu" />
@@ -462,7 +462,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -470,11 +470,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -487,7 +487,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.alt@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.alt@tests.mps
index b26db8a8f4..4f252847f9 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.alt@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.alt@tests.mps
@@ -15,10 +15,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -36,7 +36,7 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -46,7 +46,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="195141004745644975" name="org.iets3.core.expr.base.structure.AssignmentExpr" flags="ng" index="2YjPKq" />
@@ -119,7 +119,7 @@
       <concept id="4790956042240148643" name="org.iets3.core.expr.toplevel.structure.Function" flags="ng" index="1aga60" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -143,16 +143,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.applicationExamples@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.applicationExamples@tests.mps
index aef3fed9ee..8f039630f3 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.applicationExamples@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.applicationExamples@tests.mps
@@ -24,10 +24,10 @@
       <concept id="7971844778466793028" name="org.iets3.core.expr.base.structure.AlternativesExpression" flags="ng" index="2fGnzi">
         <child id="7971844778466793162" name="alternatives" index="2fGnxs" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -37,7 +37,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="6527211908668938616" name="org.iets3.core.expr.base.structure.DocWordRef" flags="ng" index="2Jv0Bt">
@@ -145,7 +145,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -180,7 +180,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -194,17 +194,17 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <property id="2861782275883660525" name="ext" index="1HeIcW" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.base@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.base@tests.mps
index 0aeb9b2cb8..93c6d04dfa 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.base@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.base@tests.mps
@@ -17,10 +17,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -35,10 +35,10 @@
         <child id="7275867333401405429" name="type" index="4IRkZ" />
         <child id="411710798114972606" name="message" index="qoPdO" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -47,7 +47,7 @@
       <concept id="867786408877811036" name="org.iets3.core.expr.base.structure.ContractItem" flags="ng" index="I61DS">
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -179,7 +179,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -217,7 +217,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -239,16 +239,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps
index 99ea67e645..ad908b1a7b 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps
@@ -22,7 +22,7 @@
       </concept>
     </language>
     <language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
-      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ng" index="24uAI7">
+      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ngI" index="24uAI7">
         <child id="527291771330969242" name="arg" index="24uAY8" />
       </concept>
       <concept id="2156530943179855331" name="org.iets3.core.expr.collections.structure.SetWithOp" flags="ng" index="2iGxMk" />
@@ -66,7 +66,7 @@
       </concept>
       <concept id="8872269265518788050" name="org.iets3.core.expr.collections.structure.AllOp" flags="ng" index="2TZ5KL" />
       <concept id="2554784455264825928" name="org.iets3.core.expr.collections.structure.FlattenOp" flags="ng" index="YMTy_" />
-      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ng" index="1bLd8V">
+      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ngI" index="1bLd8V">
         <child id="527291771311128762" name="arg" index="26Ft6C" />
       </concept>
       <concept id="3989687177013570767" name="org.iets3.core.expr.collections.structure.UpToTarget" flags="ng" index="1hzhIm">
@@ -75,7 +75,7 @@
       <concept id="7757419675876255273" name="org.iets3.core.expr.collections.structure.MapKeysOp" flags="ng" index="1hBg8L" />
       <concept id="7757419675876240958" name="org.iets3.core.expr.collections.structure.MapValuesOp" flags="ng" index="1hBkCA" />
       <concept id="7757419675876236259" name="org.iets3.core.expr.collections.structure.MapContainsKeyOp" flags="ng" index="1hBnZV" />
-      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ng" index="1idJ_1">
+      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ngI" index="1idJ_1">
         <child id="7757419675865128346" name="arg" index="1idJA2" />
       </concept>
       <concept id="7554398283340640412" name="org.iets3.core.expr.collections.structure.MapOp" flags="ng" index="3iw6QE" />
@@ -129,10 +129,10 @@
       <concept id="4931785860342338319" name="org.iets3.core.expr.collections.structure.FoldLeftOp" flags="ng" index="1XzICj" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -160,10 +160,10 @@
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt">
         <child id="2390066428848651933" name="optionValue" index="wdKps" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -172,7 +172,7 @@
       <concept id="867786408877811036" name="org.iets3.core.expr.base.structure.ContractItem" flags="ng" index="I61DS">
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -313,7 +313,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -343,7 +343,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -362,17 +362,17 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJii" />
       </concept>
-      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
+      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
         <reference id="4790956042240745579" name="fun" index="1aeol8" />
       </concept>
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -385,7 +385,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.contracts@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.contracts@tests.mps
index 2cfa6a8239..07440fcb11 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.contracts@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.contracts@tests.mps
@@ -50,7 +50,7 @@
       <concept id="4931785860342338319" name="org.iets3.core.expr.collections.structure.FoldLeftOp" flags="ng" index="1XzICj" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -69,10 +69,10 @@
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -84,7 +84,7 @@
       </concept>
       <concept id="867786408877811037" name="org.iets3.core.expr.base.structure.Precondition" flags="ng" index="I61DT" />
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -197,7 +197,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -231,7 +231,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -255,11 +255,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -272,7 +272,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.coverage@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.coverage@tests.mps
index 3b5e016e5d..cffc80cbf4 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.coverage@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.coverage@tests.mps
@@ -116,7 +116,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatable@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatable@tests.mps
index 8dd9fbcdf3..0278275349 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatable@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatable@tests.mps
@@ -18,13 +18,13 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -75,7 +75,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatablegen@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatablegen@tests.mps
index f135616b73..0441cedb49 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatablegen@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.datatablegen@tests.mps
@@ -58,7 +58,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
index 8f5d03918b..1dc1e98109 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
@@ -58,7 +58,7 @@
         <child id="161551962036658065" name="expr" index="1fMUOQ" />
       </concept>
       <concept id="161551962036658012" name="org.iets3.core.expr.util.structure.MultiDecTab" flags="ng" index="1fMURV" />
-      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ng" index="1vMD3l">
+      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ngI" index="1vMD3l">
         <child id="8853770331921611296" name="colDefs" index="1vMDcl" />
         <child id="8853770331921611812" name="rows" index="1vMDkh" />
       </concept>
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -75,7 +75,7 @@
       <concept id="1019070541450015930" name="org.iets3.core.expr.base.structure.TupleType" flags="ng" index="m5gfS">
         <child id="1019070541450015931" name="elementTypes" index="m5gfT" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -166,7 +166,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -177,16 +177,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.enums@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.enums@tests.mps
index efb0039fe0..16316f20e4 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.enums@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.enums@tests.mps
@@ -27,15 +27,15 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt" />
@@ -114,7 +114,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -134,7 +134,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -144,10 +144,10 @@
       </concept>
     </language>
     <language id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda">
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.error@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.error@tests.mps
index dcfea9bddf..c61665d037 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.error@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.error@tests.mps
@@ -15,10 +15,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -43,7 +43,7 @@
       <concept id="7089558164910719190" name="org.iets3.core.expr.base.structure.SuccessValueExpr" flags="ng" index="2zAAH0">
         <reference id="7089558164910719191" name="try" index="2zAAH1" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -53,7 +53,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="6481804410367607231" name="org.iets3.core.expr.base.structure.TrySuccessClause" flags="ng" index="2YtBXV">
@@ -148,7 +148,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -157,16 +157,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.functions@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.functions@tests.mps
index c6cdfda255..f571fe37db 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.functions@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.functions@tests.mps
@@ -15,10 +15,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -33,7 +33,7 @@
         <child id="1019070541450015931" name="elementTypes" index="m5gfT" />
       </concept>
       <concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -43,7 +43,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="195141004745644975" name="org.iets3.core.expr.base.structure.AssignmentExpr" flags="ng" index="2YjPKq" />
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -124,17 +124,17 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <property id="2861782275883660525" name="ext" index="1HeIcW" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.ignoredTests@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.ignoredTests@tests.mps
index bbf3e42839..ed0087f07f 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.ignoredTests@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.ignoredTests@tests.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lambda@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lambda@tests.mps
index 1519ed556f..b91d562075 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lambda@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lambda@tests.mps
@@ -31,7 +31,7 @@
       <concept id="7554398283339757344" name="org.iets3.core.expr.collections.structure.ListType" flags="ng" index="3iBYCm" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -46,10 +46,10 @@
       <concept id="7971844778466793028" name="org.iets3.core.expr.base.structure.AlternativesExpression" flags="ng" index="2fGnzi">
         <child id="7971844778466793162" name="alternatives" index="2fGnxs" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -59,7 +59,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="5115872837157187871" name="org.iets3.core.expr.base.structure.ParensExpression" flags="ng" index="30bsCy">
@@ -116,7 +116,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -129,7 +129,7 @@
       <concept id="4790956042240148643" name="org.iets3.core.expr.toplevel.structure.Function" flags="ng" index="1aga60" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -152,17 +152,17 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJii" />
       </concept>
-      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
+      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
         <reference id="4790956042240745579" name="fun" index="1aeol8" />
       </concept>
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -178,7 +178,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lookuptable@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lookuptable@tests.mps
index 36597cac9d..6ffd8d4603 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lookuptable@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.lookuptable@tests.mps
@@ -72,7 +72,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
index f1fa0f68ea..53ed3d1040 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -30,7 +30,7 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -144,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.numbers@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.numbers@tests.mps
index df2331a57b..0d2d1f3925 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.numbers@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.numbers@tests.mps
@@ -20,7 +20,7 @@
         <child id="8219602584757553934" name="tp" index="hiESe" />
       </concept>
       <concept id="8219602584758209317" name="org.iets3.core.expr.base.structure.OkTarget" flags="ng" index="htaS_" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -30,7 +30,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -151,7 +151,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -166,16 +166,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <property id="2861782275883660525" name="ext" index="1HeIcW" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.options@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.options@tests.mps
index ed2a8dbaf5..c9c3641c0e 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.options@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.options@tests.mps
@@ -37,7 +37,7 @@
       <concept id="6414340278546763815" name="org.iets3.core.expr.collections.structure.AsSingletonList" flags="ng" index="3MhG1o" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -50,10 +50,10 @@
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -63,7 +63,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -207,7 +207,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -261,7 +261,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -284,16 +284,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.query@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.query@tests.mps
index b8615de625..4f431bc27a 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.query@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.query@tests.mps
@@ -39,7 +39,7 @@
       <concept id="24388123216554083" name="org.iets3.core.expr.collections.structure.FindFirstOp" flags="ng" index="1HmgMX" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -137,7 +137,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -147,7 +147,7 @@
       <concept id="8811147530084018358" name="org.iets3.core.expr.toplevel.structure.RecordDeclaration" flags="ng" index="2Ss9d8" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -165,7 +165,7 @@
         <child id="5994308065059740883" name="args" index="1v5heY" />
         <child id="5994308065059743871" name="type" index="1v5isi" />
       </concept>
-      <concept id="5994308065059776299" name="org.iets3.core.expr.metafunction.structure.IMetaFunctionContext" flags="ng" index="1v5qx6">
+      <concept id="5994308065059776299" name="org.iets3.core.expr.metafunction.structure.IMetaFunctionContext" flags="ngI" index="1v5qx6">
         <child id="5994308065059799377" name="function" index="1v5wSW" />
       </concept>
       <concept id="5994308065068956525" name="org.iets3.core.expr.metafunction.structure.MetaFunArgRef" flags="ng" index="1vwrg0">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.records@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.records@tests.mps
index 7d2d3248fd..e0a0e52f68 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.records@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.records@tests.mps
@@ -59,7 +59,7 @@
       <concept id="4931785860342338319" name="org.iets3.core.expr.collections.structure.FoldLeftOp" flags="ng" index="1XzICj" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -72,10 +72,10 @@
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt">
         <child id="2390066428848651933" name="optionValue" index="wdKps" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -84,7 +84,7 @@
       <concept id="867786408877811036" name="org.iets3.core.expr.base.structure.ContractItem" flags="ng" index="I61DS">
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -208,7 +208,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="7492452870509527020" name="comparisonOrder" index="4Uvns" />
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
@@ -259,7 +259,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -288,11 +288,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -305,7 +305,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.strings@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.strings@tests.mps
index fe686c2c8b..c1d726fbaa 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.strings@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.strings@tests.mps
@@ -19,7 +19,7 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="2807135271608145920" name="org.iets3.core.expr.base.structure.IsSomeExpression" flags="ng" index="UmaEC">
@@ -130,7 +130,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.stringvalidation@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.stringvalidation@tests.mps
index 74af5beff4..e72ee261b2 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.stringvalidation@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.stringvalidation@tests.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -41,7 +41,7 @@
       <concept id="7971844778466793028" name="org.iets3.core.expr.base.structure.AlternativesExpression" flags="ng" index="2fGnzi">
         <child id="7971844778466793162" name="alternatives" index="2fGnxs" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837157187871" name="org.iets3.core.expr.base.structure.ParensExpression" flags="ng" index="30bsCy">
@@ -202,7 +202,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -213,16 +213,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tests@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tests@tests.mps
index 9141bfa7f1..0ee7c8259e 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tests@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tests@tests.mps
@@ -29,7 +29,7 @@
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt">
@@ -86,7 +86,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -95,11 +95,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -107,7 +107,7 @@
       <concept id="8237981399438528802" name="org.iets3.core.expr.lambda.structure.AssertExpr" flags="ng" index="3hB25d">
         <child id="8237981399438528812" name="expr" index="3hB253" />
       </concept>
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tolerance@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tolerance@tests.mps
index 4a250bec53..3e9761053b 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tolerance@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tolerance@tests.mps
@@ -15,7 +15,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -63,7 +63,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tuples@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tuples@tests.mps
index 7ce7a5cc63..b7bf881a51 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tuples@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.tuples@tests.mps
@@ -15,7 +15,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -29,7 +29,7 @@
       <concept id="1019070541450015930" name="org.iets3.core.expr.base.structure.TupleType" flags="ng" index="m5gfS">
         <child id="1019070541450015931" name="elementTypes" index="m5gfT" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="2527679671886479690" name="org.iets3.core.expr.base.structure.TupleAccessExpr" flags="ng" index="3nOhSe">
@@ -77,7 +77,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="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.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.typedefs@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.typedefs@tests.mps
index afe935dc98..206256821e 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.typedefs@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.typedefs@tests.mps
@@ -27,10 +27,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -42,10 +42,10 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -54,7 +54,7 @@
       <concept id="867786408877811036" name="org.iets3.core.expr.base.structure.ContractItem" flags="ng" index="I61DS">
         <child id="867786408877811038" name="expr" index="I61DU" />
       </concept>
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -141,7 +141,7 @@
       </concept>
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
       <concept id="3315773615451992747" name="org.iets3.core.expr.toplevel.structure.TypedefContractValExpr" flags="ng" index="QCKKy" />
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -162,7 +162,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,16 +181,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/todo@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/todo@tests.mps
index 6524488c54..fa967f85d6 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/todo@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/todo@tests.mps
@@ -36,7 +36,7 @@
       <concept id="593359455454548610" name="org.iets3.core.expr.util.structure.RootTreeNode" flags="ng" index="3AgdJ5" />
     </language>
     <language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
-      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ng" index="24uAI7">
+      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ngI" index="24uAI7">
         <child id="527291771330969242" name="arg" index="24uAY8" />
       </concept>
       <concept id="2156530943179855331" name="org.iets3.core.expr.collections.structure.SetWithOp" flags="ng" index="2iGxMk" />
@@ -63,10 +63,10 @@
         <child id="8694548031077660261" name="typeConstraint" index="ynoGV" />
         <child id="8872269265520081294" name="elements" index="2TO1xH" />
       </concept>
-      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ng" index="1bLd8V">
+      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ngI" index="1bLd8V">
         <child id="527291771311128762" name="arg" index="26Ft6C" />
       </concept>
-      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ng" index="1idJ_1">
+      <concept id="7757419675865128281" name="org.iets3.core.expr.collections.structure.IMapOneArgOp" flags="ngI" index="1idJ_1">
         <child id="7757419675865128346" name="arg" index="1idJA2" />
       </concept>
       <concept id="7554398283340715406" name="org.iets3.core.expr.collections.structure.WhereOp" flags="ng" index="3izCyS" />
@@ -96,10 +96,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -137,10 +137,10 @@
       <concept id="7089558164910719190" name="org.iets3.core.expr.base.structure.SuccessValueExpr" flags="ng" index="2zAAH0">
         <reference id="7089558164910719191" name="try" index="2zAAH1" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -152,7 +152,7 @@
       </concept>
       <concept id="867786408877811037" name="org.iets3.core.expr.base.structure.Precondition" flags="ng" index="I61DT" />
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -318,7 +318,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -378,7 +378,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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" />
@@ -409,17 +409,17 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJij" />
       </concept>
-      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
+      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
         <reference id="4790956042240745579" name="fun" index="1aeol8" />
       </concept>
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -435,7 +435,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/utils@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/utils@tests.mps
index 1eed8ccb8d..97b41b07cd 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/utils@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/utils@tests.mps
@@ -73,7 +73,7 @@
         <child id="8853770331932198877" name="target" index="1vqeVC" />
         <child id="8853770331926305952" name="values" index="1vwJml" />
       </concept>
-      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ng" index="1vMD3l">
+      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ngI" index="1vMD3l">
         <child id="8853770331921611296" name="colDefs" index="1vMDcl" />
         <child id="8853770331921611812" name="rows" index="1vMDkh" />
       </concept>
@@ -87,10 +87,10 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -115,10 +115,10 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="195141004745644975" name="org.iets3.core.expr.base.structure.AssignmentExpr" flags="ng" index="2YjPKq" />
@@ -218,7 +218,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -235,16 +235,16 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/test.in.expr.os.msd b/code/languages/org.iets3.opensource/tests/test.in.expr.os/test.in.expr.os.msd
index d0e4aaf761..3128cb7e98 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/test.in.expr.os.msd
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/test.in.expr.os.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.in.expr.os" uuid="2614fab6-e994-4127-9a5d-8c8cd7ba2833" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.in.expr.os" uuid="2614fab6-e994-4127-9a5d-8c8cd7ba2833" 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">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
     <dependency reexport="false">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
@@ -39,7 +38,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-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.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.IValidNamedConcept@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.IValidNamedConcept@tests.mps
index 7d4b52612d..ed9ae985cc 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.IValidNamedConcept@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.IValidNamedConcept@tests.mps
@@ -39,7 +39,7 @@
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
@@ -120,7 +120,7 @@
         <child id="1160998896846" name="condition" index="1gVkn0" />
         <child id="1160998916832" name="message" index="1gVpfI" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -128,7 +128,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="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -141,7 +141,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -163,7 +163,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.LeastCommonSuperType@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.LeastCommonSuperType@tests.mps
index 21ca0afb9c..af820b5cc2 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.LeastCommonSuperType@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.LeastCommonSuperType@tests.mps
@@ -58,7 +58,7 @@
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
       <concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt" />
@@ -113,7 +113,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -133,7 +133,7 @@
       <concept id="1759375669591494838" name="org.iets3.core.expr.typetags.structure.TaggedType" flags="ng" index="2c7tTJ">
         <child id="1759375669591494841" name="baseType" index="2c7tTw" />
       </concept>
-      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ng" index="3ciMKZ">
+      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ngI" index="3ciMKZ">
         <child id="1759375669591494839" name="tags" index="2c7tTI" />
       </concept>
       <concept id="3359996257534647723" name="org.iets3.core.expr.typetags.structure.TaggedExpression" flags="ng" index="1YnStw">
@@ -144,7 +144,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -165,15 +165,15 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.base@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.base@tests.mps
index 0eeb5a12e0..ec5d0d69a8 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.base@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.base@tests.mps
@@ -32,7 +32,7 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156687890" name="org.iets3.core.expr.base.structure.LessExpression" flags="ng" index="30d6GJ" />
@@ -81,7 +81,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.bindingtimes@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.bindingtimes@tests.mps
index 7ab097e46d..0319e3fbbd 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.bindingtimes@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.bindingtimes@tests.mps
@@ -21,7 +21,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" />
@@ -36,7 +36,7 @@
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156578546" name="org.iets3.core.expr.base.structure.PlusExpression" flags="ng" index="30dDZf" />
@@ -106,7 +106,7 @@
       <concept id="1759375669591494838" name="org.iets3.core.expr.typetags.structure.TaggedType" flags="ng" index="2c7tTJ">
         <child id="1759375669591494841" name="baseType" index="2c7tTw" />
       </concept>
-      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ng" index="3ciMKZ">
+      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ngI" index="3ciMKZ">
         <child id="1759375669591494839" name="tags" index="2c7tTI" />
       </concept>
     </language>
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.plugin.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.plugin.mps
index fbfbd34ed3..5e287186f7 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.plugin.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:df6d55ea-0ac0-4364-9581-8cb45ef224d6(test.ts.expr.os.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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
@@ -22,7 +22,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">
@@ -43,7 +43,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">
@@ -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="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.records@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.records@tests.mps
index a228f2a62c..00f8734763 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.records@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.records@tests.mps
@@ -30,7 +30,7 @@
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="5115872837156761033" name="org.iets3.core.expr.base.structure.EqualsExpression" flags="ng" index="30cPrO" />
@@ -60,7 +60,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.temporal@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.temporal@tests.mps
index fe1fdfb504..81fd42564b 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.temporal@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.temporal@tests.mps
@@ -28,7 +28,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400486526326" name="jetbrains.mps.lang.test.structure.WarningStatementReference" flags="ng" index="2PQEqo" />
@@ -56,13 +56,13 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
       <concept id="2390066428848651932" name="org.iets3.core.expr.base.structure.BangOp" flags="ng" index="wdKpt" />
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -107,7 +107,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -153,7 +153,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -166,7 +166,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
index 09f8ec337d..5be5d6088f 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
@@ -53,7 +53,7 @@
         <child id="6626913010124294914" name="migration" index="3ea0P7" />
       </concept>
       <concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr">
@@ -100,7 +100,7 @@
         <child id="161551962036658065" name="expr" index="1fMUOQ" />
       </concept>
       <concept id="161551962036658012" name="org.iets3.core.expr.util.structure.MultiDecTab" flags="ng" index="1fMURV" />
-      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ng" index="1vMD3l">
+      <concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ngI" index="1vMD3l">
         <child id="8853770331921611296" name="colDefs" index="1vMDcl" />
         <child id="8853770331921611812" name="rows" index="1vMDkh" />
       </concept>
@@ -109,7 +109,7 @@
       </concept>
     </language>
     <language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
-      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ng" index="24uAI7">
+      <concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ngI" index="24uAI7">
         <child id="527291771330969242" name="arg" index="24uAY8" />
       </concept>
       <concept id="1330041117646892901" name="org.iets3.core.expr.collections.structure.CollectionSizeSpec" flags="ng" index="2gteSW">
@@ -128,7 +128,7 @@
         <child id="8872269265520081294" name="elements" index="2TO1xH" />
       </concept>
       <concept id="2554784455264825928" name="org.iets3.core.expr.collections.structure.FlattenOp" flags="ng" index="YMTy_" />
-      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ng" index="1bLd8V">
+      <concept id="5291952221900249273" name="org.iets3.core.expr.collections.structure.IListOneArgOp" flags="ngI" index="1bLd8V">
         <child id="527291771311128762" name="arg" index="26Ft6C" />
       </concept>
       <concept id="7554398283340640412" name="org.iets3.core.expr.collections.structure.MapOp" flags="ng" index="3iw6QE" />
@@ -199,16 +199,16 @@
       </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>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -247,10 +247,10 @@
         <reference id="7089558164910719191" name="try" index="2zAAH1" />
       </concept>
       <concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
-      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
+      <concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
         <child id="8811147530085329321" name="type" index="2S399n" />
       </concept>
       <concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -262,7 +262,7 @@
       </concept>
       <concept id="867786408877811037" name="org.iets3.core.expr.base.structure.Precondition" flags="ng" index="I61DT" />
       <concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
-      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
+      <concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
         <child id="867786408877811042" name="contract" index="I61D6" />
       </concept>
       <concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -484,7 +484,7 @@
       <concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
         <child id="8811147530085329323" name="memberValues" index="2S399l" />
       </concept>
-      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
+      <concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
         <child id="602952467877562565" name="members" index="S5Trm" />
       </concept>
       <concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -656,7 +656,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>
@@ -680,7 +680,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">
@@ -745,17 +745,17 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJij" />
       </concept>
-      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
+      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
         <reference id="4790956042240745579" name="fun" index="1aeol8" />
       </concept>
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <property id="2861782275883660525" name="ext" index="1HeIcW" />
         <child id="3880322347437217307" name="effect" index="28QfE6" />
         <child id="4790956042240100927" name="args" index="1ahQWs" />
@@ -773,7 +773,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60">
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps
index dcb3fd4ab9..18196db3d1 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/typetags@tests.mps
@@ -24,7 +24,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="852155438140865198" name="allowWarnings" index="G7GLP" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -42,7 +42,7 @@
     </language>
     <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
       <concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="2807135271608265973" name="org.iets3.core.expr.base.structure.NoneLiteral" flags="ng" index="UmHTt" />
@@ -113,7 +113,7 @@
       <concept id="7791618349053218919" name="org.iets3.core.expr.typetags.lib.structure.SanitizeExpression" flags="ng" index="WAJfW" />
     </language>
     <language id="5186c6ce-428c-4f09-a9df-73d9e86c27d3" name="org.iets3.core.expr.typetags">
-      <concept id="5805388625439268916" name="org.iets3.core.expr.typetags.structure.ITagModifier" flags="ng" index="2X$86">
+      <concept id="5805388625439268916" name="org.iets3.core.expr.typetags.structure.ITagModifier" flags="ngI" index="2X$86">
         <child id="2147137078514310917" name="tag" index="t9Br9" />
       </concept>
       <concept id="5805388625439269019" name="org.iets3.core.expr.typetags.structure.AtLeastTag" flags="ng" index="2X$aD" />
@@ -122,7 +122,7 @@
         <child id="1759375669591494841" name="baseType" index="2c7tTw" />
       </concept>
       <concept id="2147137078514310913" name="org.iets3.core.expr.typetags.structure.TagNegation" flags="ng" index="t9Brd" />
-      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ng" index="3ciMKZ">
+      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ngI" index="3ciMKZ">
         <child id="1759375669591494839" name="tags" index="2c7tTI" />
       </concept>
     </language>
@@ -130,7 +130,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -145,22 +145,22 @@
       <concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid">
         <child id="4790956042241053105" name="expr" index="1adJii" />
       </concept>
-      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
+      <concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
         <reference id="4790956042240745579" name="fun" index="1aeol8" />
       </concept>
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
       <concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
       <concept id="7554398283340107702" name="org.iets3.core.expr.lambda.structure.FunctionType" flags="ng" index="3iA5a0">
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
index b0e3e05f0e..c2c13e3895 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
@@ -51,7 +51,7 @@
         <property id="852155438140865198" name="allowWarnings" index="G7GLP" />
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -158,7 +158,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 @@
         <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">
@@ -184,10 +184,10 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
-      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
+      <concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
         <child id="229512757698888936" name="optionalName" index="pfQ1b" />
       </concept>
       <concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -259,7 +259,7 @@
       <concept id="7089558164910719190" name="org.iets3.core.expr.base.structure.SuccessValueExpr" flags="ng" index="2zAAH0">
         <reference id="7089558164910719191" name="try" index="2zAAH1" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="6481804410367607231" name="org.iets3.core.expr.base.structure.TrySuccessClause" flags="ng" index="2YtBXV">
@@ -386,6 +386,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" />
@@ -415,7 +416,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -505,7 +506,7 @@
       <concept id="1759375669591494838" name="org.iets3.core.expr.typetags.structure.TaggedType" flags="ng" index="2c7tTJ">
         <child id="1759375669591494841" name="baseType" index="2c7tTw" />
       </concept>
-      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ng" index="3ciMKZ">
+      <concept id="8196347919645043518" name="org.iets3.core.expr.typetags.structure.IWithTags" flags="ngI" index="3ciMKZ">
         <child id="1759375669591494839" name="tags" index="2c7tTI" />
       </concept>
       <concept id="3359996257534647723" name="org.iets3.core.expr.typetags.structure.TaggedExpression" flags="ng" index="1YnStw">
@@ -524,7 +525,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>
@@ -565,7 +566,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -573,11 +574,11 @@
       <concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
         <reference id="4790956042240460422" name="arg" index="1afue_" />
       </concept>
-      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
+      <concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
         <reference id="4790956042240522408" name="function" index="1afhQb" />
         <child id="4790956042240522406" name="args" index="1afhQ5" />
       </concept>
-      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
+      <concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
         <child id="4790956042240100927" name="args" index="1ahQWs" />
         <child id="4790956042240100950" name="body" index="1ahQXP" />
       </concept>
@@ -587,7 +588,7 @@
         <child id="7554398283340318471" name="args" index="3ix9CL" />
       </concept>
       <concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
-      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
+      <concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
         <child id="7554398283340318476" name="type" index="3ix9CU" />
       </concept>
     </language>
@@ -602,7 +603,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="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -2518,7 +2518,7 @@
                         <node concept="2OqwBi" id="6q$NxWg9syf" role="3clFbG">
                           <node concept="2OqwBi" id="6q$NxWg9syg" role="2Oq$k0">
                             <node concept="37vLTw" id="6q$NxWg9syh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6q$NxWg9syk" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817oO" />
                             </node>
                             <node concept="3TrEf2" id="6q$NxWg9syi" role="2OqNvi">
                               <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -2530,9 +2530,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6q$NxWg9syk" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817oO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6q$NxWg9syl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817oP" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="6q$NxWg9sym" role="2S7zOq">
@@ -2564,7 +2564,7 @@
                         <node concept="2OqwBi" id="6q$NxWg9yyB" role="3clFbG">
                           <node concept="2OqwBi" id="6q$NxWg9yyC" role="2Oq$k0">
                             <node concept="37vLTw" id="6q$NxWg9yyD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6q$NxWg9yyG" resolve="it" />
+                              <ref role="3cqZAo" node="4z0AnX817oQ" />
                             </node>
                             <node concept="3TrEf2" id="6q$NxWg9yyE" role="2OqNvi">
                               <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -2576,9 +2576,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6q$NxWg9yyG" role="1bW2Oz">
+                    <node concept="gl6BB" id="4z0AnX817oQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6q$NxWg9yyH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4z0AnX817oR" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="6q$NxWg9yyI" role="2S7zOq">
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
index c2a131fd13..6ccf9ff0c1 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.ts.expr.os" uuid="cf55cddb-d431-4f2e-93f4-3a4305c63d12" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.ts.expr.os" uuid="cf55cddb-d431-4f2e-93f4-3a4305c63d12" 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">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
     <dependency reexport="false">9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)</dependency>
@@ -44,14 +43,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:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />

From 567357b42738eb7ed058e86aeb15583d7ca6bea4 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 08:09:59 +0100
Subject: [PATCH 07/19] Generate missing type parameter in FailExpr

---
 CHANGELOG.md                                    |  2 ++
 ...g.iets3.core.expr.genjava.base@generator.mps | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95b4c45b45..011abde05e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,9 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - The PCollections library was updated to version 4.0.1.
 
 ### Fixed
+
 - Uncatched `DateTimeException` during check DateLiteral
+- The type parameter is now used in the Java generation of the FailExpr.
 
 ## December 2023
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
index 25660b1fb1..40ab2d6dd3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
@@ -16107,6 +16107,23 @@
               </node>
             </node>
           </node>
+          <node concept="3uibUv" id="4z0AnX8fdEl" role="3PaCim">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            <node concept="29HgVG" id="4z0AnX8fqou" role="lGtFl">
+              <node concept="3NFfHV" id="4z0AnX8fqov" role="3NFExx">
+                <node concept="3clFbS" id="4z0AnX8fqow" role="2VODD2">
+                  <node concept="3clFbF" id="4z0AnX8fqoA" role="3cqZAp">
+                    <node concept="2OqwBi" id="4z0AnX8fqox" role="3clFbG">
+                      <node concept="3TrEf2" id="4z0AnX8fqo$" role="2OqNvi">
+                        <ref role="3Tt5mk" to="hm2y:6jT4GDwgAvP" resolve="type" />
+                      </node>
+                      <node concept="30H73N" id="4z0AnX8fqo_" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>

From 1fb866e54df2333e5b5f77d51da0fd431ee939e5 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 08:13:34 +0100
Subject: [PATCH 08/19] Change classloading of collections.stubs

---
 .../org.iets3.core.expr.base.collections.stubs.msd            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
index 8953f9cede..d8dde92422 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="org.iets3.core.expr.base.collections.stubs" uuid="b76a0f63-5959-456b-993a-c796cc0d0c13" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="pcollections.jar" />
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/pcollections.jar" />
     </facet>

From 89e34af2bced3820eb536eec8b8121cd50f30640 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 08:22:55 +0100
Subject: [PATCH 09/19] Add a missing import

---
 .../org.iets3.core.expr.toplevel.mpl                         | 2 ++
 .../models/org/iets3/opensource/build/build.mps              | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
index ee027be5e3..b1e27d062a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
@@ -33,6 +33,7 @@
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)</dependency>
     <dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
+    <dependency reexport="false">98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" version="0" />
@@ -124,6 +125,7 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
+    <module reference="98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 835d91b21a..c8163eaea1 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -3923,6 +3923,11 @@
             <ref role="3bR37D" node="7jAOwAVRc2S" resolve="org.iets3.core.expr.simpleTypes.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6ZD7qzEAhqn" role="3bR37C">
+          <node concept="3bR9La" id="6ZD7qzEAhqo" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:4X1d9kMCbcv" resolve="jetbrains.mps.ide.refactoring.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5a_u3OzLedQ" role="2G$12L">
         <property role="BnDLt" value="true" />

From fdd2f8b8fd33f1af770fd0c882b7e76fc761d4b4 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 08:32:44 +0100
Subject: [PATCH 10/19] Don't update some trace actions in the background

tool<TraceExplorer>.getSelectedTab needs to be called on the EDT thread.
---
 .../models/plugin.mps                          | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index 74962b50f4..d20dce47be 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -5116,17 +5116,11 @@
   <node concept="sE7Ow" id="4yQfyMjrpAh">
     <property role="TrG5h" value="selectNextTraceNodeInCurrentTrace" />
     <property role="2uzpH1" value="Trace: select next trace of this node" />
-    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="4yQfyMjrpAi" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4yQfyMjrpAj" role="1oa70y" />
     </node>
-    <node concept="1DS2jV" id="4yQfyMjrpAk" role="1NuT2Z">
-      <property role="TrG5h" value="mpsProject" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
-      <node concept="1oajcY" id="4yQfyMjrpAl" role="1oa70y" />
-    </node>
     <node concept="2S4$dB" id="4yQfyMjrpAm" role="1NuT2Z">
       <property role="TrG5h" value="someNode" />
       <node concept="3Tm6S6" id="4yQfyMjrpAn" role="1B3o_S" />
@@ -5229,17 +5223,11 @@
   <node concept="sE7Ow" id="4yQfyMjvYR7">
     <property role="TrG5h" value="selectAllTraceNodeInCurrentTrace" />
     <property role="2uzpH1" value="Trace: select all traces of this node" />
-    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="4yQfyMjvYR8" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4yQfyMjvYR9" role="1oa70y" />
     </node>
-    <node concept="1DS2jV" id="4yQfyMjvYRa" role="1NuT2Z">
-      <property role="TrG5h" value="mpsProject" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
-      <node concept="1oajcY" id="4yQfyMjvYRb" role="1oa70y" />
-    </node>
     <node concept="2S4$dB" id="4yQfyMjvYRc" role="1NuT2Z">
       <property role="TrG5h" value="someNode" />
       <node concept="3Tm6S6" id="4yQfyMjvYRd" role="1B3o_S" />
@@ -7479,17 +7467,11 @@
   <node concept="sE7Ow" id="2JfTTG8itTT">
     <property role="TrG5h" value="selectNextTraceNodeAndInspectSource" />
     <property role="2uzpH1" value="Trace: select next trace and inspect source" />
-    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="2JfTTG8itTU" role="1NuT2Z">
       <property role="TrG5h" value="ideaProject" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="2JfTTG8itTV" role="1oa70y" />
     </node>
-    <node concept="1DS2jV" id="2JfTTG8itTW" role="1NuT2Z">
-      <property role="TrG5h" value="mpsProject" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
-      <node concept="1oajcY" id="2JfTTG8itTX" role="1oa70y" />
-    </node>
     <node concept="2S4$dB" id="2JfTTG8itTY" role="1NuT2Z">
       <property role="TrG5h" value="someNode" />
       <node concept="3Tm6S6" id="2JfTTG8itTZ" role="1B3o_S" />

From 6a9bfa80bfafd5c07b38e00323926905c57af455 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 09:15:09 +0100
Subject: [PATCH 11/19] Ignore exceptions when trying to close the trace
 explorer tab

---
 .../models/plugin.mps                         | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index d20dce47be..afb703ae26 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -9600,15 +9600,30 @@
             </node>
             <node concept="1bVj0M" id="kZqQ80bey0" role="37wK5m">
               <node concept="3clFbS" id="kZqQ80bey1" role="1bW5cS">
-                <node concept="3clFbF" id="kZqQ80bey2" role="3cqZAp">
-                  <node concept="2OqwBi" id="kZqQ80bey3" role="3clFbG">
-                    <node concept="37vLTw" id="kZqQ80bey4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="kZqQ80bex_" resolve="tool" />
-                    </node>
-                    <node concept="liA8E" id="kZqQ80bey5" role="2OqNvi">
-                      <ref role="37wK5l" to="71xd:~BaseTabbedProjectTool.closeTab(javax.swing.JComponent)" resolve="closeTab" />
-                      <node concept="37vLTw" id="kZqQ80bey6" role="37wK5m">
-                        <ref role="3cqZAo" node="kZqQ80bex1" resolve="tab" />
+                <node concept="3J1_TO" id="4Yyd4M7l0my" role="3cqZAp">
+                  <node concept="3uVAMA" id="4Yyd4M7l3Yp" role="1zxBo5">
+                    <node concept="XOnhg" id="4Yyd4M7l3Yq" role="1zc67B">
+                      <property role="TrG5h" value="e" />
+                      <node concept="nSUau" id="4Yyd4M7l3Yr" role="1tU5fm">
+                        <node concept="3uibUv" id="4Yyd4M7l5uf" role="nSUat">
+                          <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="4Yyd4M7l3Ys" role="1zc67A" />
+                  </node>
+                  <node concept="3clFbS" id="4Yyd4M7l0m$" role="1zxBo7">
+                    <node concept="3clFbF" id="kZqQ80bey2" role="3cqZAp">
+                      <node concept="2OqwBi" id="kZqQ80bey3" role="3clFbG">
+                        <node concept="37vLTw" id="kZqQ80bey4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="kZqQ80bex_" resolve="tool" />
+                        </node>
+                        <node concept="liA8E" id="kZqQ80bey5" role="2OqNvi">
+                          <ref role="37wK5l" to="71xd:~BaseTabbedProjectTool.closeTab(javax.swing.JComponent)" resolve="closeTab" />
+                          <node concept="37vLTw" id="kZqQ80bey6" role="37wK5m">
+                            <ref role="3cqZAo" node="kZqQ80bex1" resolve="tab" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>

From 5a8129d59c058722a906b012b3f5357bb526bb48 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 09:16:41 +0100
Subject: [PATCH 12/19] Update the list of supported versions

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc6101c238..260088592c 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,8 @@ We take care of porting changes done in older supported MPS versions to the newe
 For details see [wiki](https://github.com/IETS3/iets3.opensource/wiki/Supported-MPS-Versions).
 
 ### What MPS versions are currently supported? 
-- MPS 2022.3 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master)) 
+- MPS 2023.2 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master)) 
+- MPS 2022.3 (branch: [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223)) 
 - MPS 2022.2 (branch: [maintenance/mps20222](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20222)) 
 - MPS 2021.3 (branch: [maintenance/mps20213](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20213)) 
 - MPS 2021.2 (branch: [maintenance/mps20212](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20212)) 

From 47a09d8a0020929a11c70d5a46a937ba4c6918a2 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 29 Jan 2024 11:22:36 +0100
Subject: [PATCH 13/19] Try to fix the test suit generation

---
 .../generator/template/main@generator.mps     | 174 +++++++++---------
 .../org.iets3.core.expr.tests.mpl             |   2 +
 .../org/iets3/opensource/build/build.mps      |   5 +
 3 files changed, 99 insertions(+), 82 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
index d1cb5cff80..80cef57452 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
@@ -16,6 +16,7 @@
     <import index="y9hc" ref="r:2a717231-f4f6-48f0-b28c-75987331b4d9(org.iets3.core.expr.tests.rt.runtime)" />
     <import index="xk6s" ref="r:7961970e-5737-42e2-b144-9bef3ad8d077(org.iets3.core.expr.tests.behavior)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="rbkg" ref="63b449db-0918-4a4a-a891-2c430ab133e4/java:org.junit.jupiter.api.extension(org.junit.junit5/)" />
     <import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" implicit="true" />
@@ -42,10 +43,7 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA">
-        <property id="6468716278899126575" name="isVolatile" index="2dlcS1" />
-        <property id="6468716278899125786" name="isTransient" index="2dld4O" />
-      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
@@ -54,6 +52,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
         <property id="8606350594693632173" name="isTransient" index="eg7rD" />
@@ -119,6 +120,7 @@
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
@@ -259,87 +261,91 @@
   <node concept="312cEu" id="21ieoTcCJQ7">
     <property role="TrG5h" value="MPSTestCase" />
     <node concept="2tJIrI" id="36bouteoEbE" role="jymVt" />
-    <node concept="Wx3nA" id="5iphLhCeqoT" role="jymVt">
-      <property role="TrG5h" value="ourParamCache" />
-      <property role="2dlcS1" value="false" />
+    <node concept="Wx3nA" id="4dqLDEZ0eMU" role="jymVt">
       <property role="3TUv4t" value="true" />
-      <property role="2dld4O" value="false" />
-      <node concept="3uibUv" id="5iphLhCeqoU" role="1tU5fm">
-        <ref role="3uigEE" to="tp6m:wQDhRCClc9" resolve="TestParametersCache" />
+      <property role="TrG5h" value="ourParametersCacheExtension" />
+      <node concept="3Tm6S6" id="4dqLDEZ0eMW" role="1B3o_S" />
+      <node concept="3uibUv" id="4dqLDEZ0gjZ" role="1tU5fm">
+        <ref role="3uigEE" to="tp6m:4dqLDEYYwgD" resolve="TestParametersCacheExtension" />
       </node>
-      <node concept="2ShNRf" id="5iphLhCeqoV" role="33vP2m">
-        <node concept="1pGfFk" id="5iphLhCeqoW" role="2ShVmc">
-          <ref role="37wK5l" to="tp6m:5LbRjS1nRFZ" resolve="TestParametersCache" />
-          <node concept="3VsKOn" id="5iphLhCeqoX" role="37wK5m">
-            <ref role="3VsUkX" node="21ieoTcCJQ7" resolve="MPSTestCase" />
-          </node>
-          <node concept="Xl_RD" id="1thG8hDHxlT" role="37wK5m">
-            <property role="Xl_RC" value="project path" />
-            <node concept="17Uvod" id="1thG8hDHxlU" role="lGtFl">
-              <property role="2qtEX9" value="value" />
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <node concept="3zFVjK" id="1thG8hDHxlV" role="3zH0cK">
-                <node concept="3clFbS" id="1thG8hDHxlW" role="2VODD2">
-                  <node concept="3clFbF" id="1thG8hDHxlX" role="3cqZAp">
-                    <node concept="2YIFZM" id="1thG8hDHxlY" role="3clFbG">
-                      <ref role="1Pybhc" to="tgi8:L0xQjiTXbn" resolve="TestsUtil" />
-                      <ref role="37wK5l" to="tgi8:L0xQjiTXbx" resolve="getProjectPath" />
-                      <node concept="2OqwBi" id="1thG8hDHxlZ" role="37wK5m">
-                        <node concept="30H73N" id="1thG8hDHxm0" role="2Oq$k0" />
-                        <node concept="I4A8Y" id="1thG8hDHxm1" role="2OqNvi" />
+      <node concept="2ShNRf" id="4dqLDEZ0gCn" role="33vP2m">
+        <node concept="1pGfFk" id="4dqLDEZ0gzP" role="2ShVmc">
+          <ref role="37wK5l" to="tp6m:4dqLDEYYHvm" resolve="TestParametersCacheExtension" />
+          <node concept="2ShNRf" id="5iphLhCeqoV" role="37wK5m">
+            <node concept="1pGfFk" id="5iphLhCeqoW" role="2ShVmc">
+              <ref role="37wK5l" to="tp6m:5LbRjS1nRFZ" resolve="TestParametersCache" />
+              <node concept="3VsKOn" id="5iphLhCeqoX" role="37wK5m">
+                <ref role="3VsUkX" node="21ieoTcCJQ7" resolve="MPSTestCase" />
+              </node>
+              <node concept="Xl_RD" id="1thG8hDHxlT" role="37wK5m">
+                <property role="Xl_RC" value="project path" />
+                <node concept="17Uvod" id="1thG8hDHxlU" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <node concept="3zFVjK" id="1thG8hDHxlV" role="3zH0cK">
+                    <node concept="3clFbS" id="1thG8hDHxlW" role="2VODD2">
+                      <node concept="3clFbF" id="1thG8hDHxlX" role="3cqZAp">
+                        <node concept="2YIFZM" id="1thG8hDHxlY" role="3clFbG">
+                          <ref role="1Pybhc" to="tgi8:L0xQjiTXbn" resolve="TestsUtil" />
+                          <ref role="37wK5l" to="tgi8:L0xQjiTXbx" resolve="getProjectPath" />
+                          <node concept="2OqwBi" id="1thG8hDHxlZ" role="37wK5m">
+                            <node concept="30H73N" id="1thG8hDHxm0" role="2Oq$k0" />
+                            <node concept="I4A8Y" id="1thG8hDHxm1" role="2OqNvi" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="Xl_RD" id="1thG8hDHxm2" role="37wK5m">
-            <property role="Xl_RC" value="model.fq.name" />
-            <node concept="17Uvod" id="1thG8hDHxm3" role="lGtFl">
-              <property role="2qtEX9" value="value" />
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <node concept="3zFVjK" id="1thG8hDHxm4" role="3zH0cK">
-                <node concept="3clFbS" id="1thG8hDHxm5" role="2VODD2">
-                  <node concept="3clFbF" id="1thG8hDHxm6" role="3cqZAp">
-                    <node concept="2OqwBi" id="1thG8hDHxm7" role="3clFbG">
-                      <node concept="2OqwBi" id="1thG8hDHxm8" role="2Oq$k0">
-                        <node concept="liA8E" id="1thG8hDHxm9" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
-                        </node>
-                        <node concept="2JrnkZ" id="1thG8hDHxma" role="2Oq$k0">
-                          <node concept="2OqwBi" id="1thG8hDHxmb" role="2JrQYb">
-                            <node concept="1iwH7S" id="1thG8hDHxmc" role="2Oq$k0" />
-                            <node concept="1st3f0" id="1thG8hDHxmd" role="2OqNvi" />
+              <node concept="Xl_RD" id="1thG8hDHxm2" role="37wK5m">
+                <property role="Xl_RC" value="model.fq.name" />
+                <node concept="17Uvod" id="1thG8hDHxm3" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <node concept="3zFVjK" id="1thG8hDHxm4" role="3zH0cK">
+                    <node concept="3clFbS" id="1thG8hDHxm5" role="2VODD2">
+                      <node concept="3clFbF" id="1thG8hDHxm6" role="3cqZAp">
+                        <node concept="2OqwBi" id="1thG8hDHxm7" role="3clFbG">
+                          <node concept="2OqwBi" id="1thG8hDHxm8" role="2Oq$k0">
+                            <node concept="liA8E" id="1thG8hDHxm9" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
+                            </node>
+                            <node concept="2JrnkZ" id="1thG8hDHxma" role="2Oq$k0">
+                              <node concept="2OqwBi" id="1thG8hDHxmb" role="2JrQYb">
+                                <node concept="1iwH7S" id="1thG8hDHxmc" role="2Oq$k0" />
+                                <node concept="1st3f0" id="1thG8hDHxmd" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="1thG8hDHxme" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="1thG8hDHxme" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="3clFbT" id="1thG8hDHxmf" role="37wK5m">
-            <property role="3clFbU" value="false" />
-            <node concept="17Uvod" id="1thG8hDHxmg" role="lGtFl">
-              <property role="2qtEX9" value="value" />
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
-              <node concept="3zFVjK" id="1thG8hDHxmh" role="3zH0cK">
-                <node concept="3clFbS" id="1thG8hDHxmi" role="2VODD2">
-                  <node concept="3clFbF" id="1thG8hDHxmj" role="3cqZAp">
-                    <node concept="2OqwBi" id="1thG8hDHxmk" role="3clFbG">
-                      <node concept="35c_gC" id="1thG8hDHxml" role="2Oq$k0">
-                        <ref role="35c_gD" to="tp5g:4qWC2JVrBca" resolve="TestInfo" />
-                      </node>
-                      <node concept="2qgKlT" id="1thG8hDHxmm" role="2OqNvi">
-                        <ref role="37wK5l" to="tp5o:ThWTaQhG7P" resolve="reOpenProject" />
-                        <node concept="2OqwBi" id="1thG8hDHxmn" role="37wK5m">
-                          <node concept="30H73N" id="1thG8hDHxmo" role="2Oq$k0" />
-                          <node concept="I4A8Y" id="1thG8hDHxmp" role="2OqNvi" />
+              <node concept="3clFbT" id="1thG8hDHxmf" role="37wK5m">
+                <property role="3clFbU" value="false" />
+                <node concept="17Uvod" id="1thG8hDHxmg" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                  <node concept="3zFVjK" id="1thG8hDHxmh" role="3zH0cK">
+                    <node concept="3clFbS" id="1thG8hDHxmi" role="2VODD2">
+                      <node concept="3clFbF" id="1thG8hDHxmj" role="3cqZAp">
+                        <node concept="2OqwBi" id="1thG8hDHxmk" role="3clFbG">
+                          <node concept="35c_gC" id="1thG8hDHxml" role="2Oq$k0">
+                            <ref role="35c_gD" to="tp5g:4qWC2JVrBca" resolve="TestInfo" />
+                          </node>
+                          <node concept="2qgKlT" id="1thG8hDHxmm" role="2OqNvi">
+                            <ref role="37wK5l" to="tp5o:ThWTaQhG7P" resolve="reOpenProject" />
+                            <node concept="2OqwBi" id="1thG8hDHxmn" role="37wK5m">
+                              <node concept="30H73N" id="1thG8hDHxmo" role="2Oq$k0" />
+                              <node concept="I4A8Y" id="1thG8hDHxmp" role="2OqNvi" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -350,12 +356,11 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5iphLhCeqpv" role="2AJF6D">
-        <ref role="2AI5Lk" to="rjhg:~ClassRule" resolve="ClassRule" />
+      <node concept="2AHcQZ" id="4dqLDEZ0lE$" role="2AJF6D">
+        <ref role="2AI5Lk" to="rbkg:~RegisterExtension" resolve="RegisterExtension" />
       </node>
-      <node concept="3Tm1VV" id="5iphLhCeqpw" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="1thG8hDHvv6" role="jymVt" />
+    <node concept="2tJIrI" id="2o2_RLEwLYv" role="jymVt" />
     <node concept="312cEg" id="2o2_RLEwHPG" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -375,21 +380,26 @@
         <ref role="2AI5Lk" to="rjhg:~Rule" resolve="Rule" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2o2_RLEwLYv" role="jymVt" />
+    <node concept="2tJIrI" id="7MpFXKneA8_" role="jymVt" />
     <node concept="3clFbW" id="5iphLhCe51H" role="jymVt">
       <node concept="3cqZAl" id="5iphLhCe51J" role="3clF45" />
       <node concept="3Tm1VV" id="5iphLhCe51K" role="1B3o_S" />
       <node concept="3clFbS" id="5iphLhCe51L" role="3clF47">
         <node concept="XkiVB" id="5iphLhCfiRX" role="3cqZAp">
           <ref role="37wK5l" to="tp6m:5LbRjS1pM4D" resolve="BaseTransformationTest" />
-          <node concept="37vLTw" id="28iRK7sGFub" role="37wK5m">
-            <ref role="3cqZAo" node="5iphLhCeqoT" resolve="ourParamCache" />
+          <node concept="2OqwBi" id="4dqLDEZ0ng6" role="37wK5m">
+            <node concept="10M0yZ" id="7zD2yq84n12" role="2Oq$k0">
+              <ref role="3cqZAo" node="4dqLDEZ0eMU" resolve="ourParametersCacheExtension" />
+              <ref role="1PxDUh" node="21ieoTcCJQ7" resolve="MPSTestCase" />
+            </node>
+            <node concept="liA8E" id="4dqLDEZ0nBp" role="2OqNvi">
+              <ref role="37wK5l" to="tp6m:4dqLDEYZ0EK" resolve="getParametersCache" />
+            </node>
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1thG8hDHwqv" role="jymVt" />
-    <node concept="2tJIrI" id="28iRK7sGp1j" role="jymVt" />
     <node concept="3clFb_" id="hHqygjQ" role="jymVt">
       <property role="TrG5h" value="testMethod" />
       <node concept="3cqZAl" id="hHqygjR" role="3clF45" />
@@ -519,9 +529,6 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="6xD3woJoRYa" role="2AJF6D">
-        <ref role="2AI5Lk" to="fyhk:~MPSLaunch" resolve="MPSLaunch" />
-      </node>
       <node concept="2tJIrI" id="7Uk8E1kIle$" role="jymVt" />
       <node concept="3clFb_" id="hLF7ERe" role="jymVt">
         <property role="TrG5h" value="test_NodesTestMethod" />
@@ -600,6 +607,9 @@
     <node concept="3uibUv" id="36boutep3OR" role="1zkMxy">
       <ref role="3uigEE" to="tp6m:e$hNri8RAJ" resolve="BaseTransformationTest" />
     </node>
+    <node concept="2AHcQZ" id="7zD2yq841pU" role="2AJF6D">
+      <ref role="2AI5Lk" to="fyhk:~MPSLaunch" resolve="MPSLaunch" />
+    </node>
   </node>
   <node concept="jVnub" id="7wjZwvO2CqQ">
     <property role="TrG5h" value="switch_testItems" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
index e371d4bd4b..ea22136a9d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
@@ -33,6 +33,7 @@
         <dependency reexport="false">f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)</dependency>
         <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
         <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
+        <dependency reexport="false">63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -106,6 +107,7 @@
         <module reference="56959ea0-1a4c-409d-b923-9a5132cecf97(org.iets3.core.expr.tests#543569365052197681)" version="0" />
         <module reference="6effa8ea-ddf9-441a-a29e-80a73b7d0fc7(org.iets3.core.expr.tests.rt)" version="0" />
         <module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
+        <module reference="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index c8163eaea1..14d19459ef 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -4933,6 +4933,11 @@
               </node>
             </node>
           </node>
+          <node concept="1SiIV0" id="7zD2yq8eXBf" role="3bR37C">
+            <node concept="3bR9La" id="7zD2yq8eXBg" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1ULLXZL0gZG" resolve="org.junit.junit5" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="ub9nkyRnyt" role="3bR37C">
           <node concept="1Busua" id="ub9nkyRnyu" role="1SiIV1">

From 24c9656e5def616d65d7df473b3dab41f3d74139 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 30 Jan 2024 15:24:33 +0100
Subject: [PATCH 14/19] Add genjava.toplevel.rt to the genjava.toplevel
 language

---
 .../org.iets3.core.expr.genjava.toplevel.mpl                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
index f8bf8e9079..8e6e0181fc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="org.iets3.core.expr.genjava.toplevel" uuid="ddeeec5e-aa31-4c44-bc40-319cd452626e" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -190,6 +190,7 @@
   </dependencyVersions>
   <runtime>
     <dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
+    <dependency reexport="false">336cc7f4-18d3-473b-81a1-d8df1c0ad27a(org.iets3.core.expr.genjava.toplevel.rt)</dependency>
   </runtime>
   <extendedLanguages />
 </language>

From 8a80178aa8345ce64e7be5539835cd84d9730012 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 30 Jan 2024 15:26:04 +0100
Subject: [PATCH 15/19] Add genjava.tests.rt to the genjava.tests language

---
 .../org.iets3.core.expr.genjava.tests.mpl                   | 5 ++++-
 .../models/org/iets3/opensource/build/build.mps             | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
index a6ceba9ade..65dd4c32db 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="org.iets3.core.expr.genjava.tests" uuid="e75207bb-7b13-40bd-b80b-c8fe625c4ee2" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -175,6 +175,9 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="e75207bb-7b13-40bd-b80b-c8fe625c4ee2(org.iets3.core.expr.genjava.tests)" version="0" />
   </dependencyVersions>
+  <runtime>
+    <dependency reexport="false">68da6d9d-3ccf-4255-b4f7-37603cd89090(org.iets3.core.expr.genjava.tests.rt)</dependency>
+  </runtime>
   <extendedLanguages />
 </language>
 
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 14d19459ef..de988915fd 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -9679,6 +9679,9 @@
             <ref role="1E1Vl2" to="ffeo:ymnOULAU0j" resolve="jetbrains.mps.baseLanguage.unitTest" />
           </node>
         </node>
+        <node concept="1E0d5M" id="4tIsRgZDdpK" role="1E1XAP">
+          <ref role="1E0d5P" node="5v$Gz_MUO6K" resolve="org.iets3.core.expr.genjava.tests.rt" />
+        </node>
       </node>
       <node concept="1E1JtD" id="26tZ$Z4qWJe" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9851,6 +9854,9 @@
             <ref role="1E1Vl2" node="lH$Puj5DFq" resolve="org.iets3.core.expr.genjava.contracts" />
           </node>
         </node>
+        <node concept="1E0d5M" id="4tIsRgZDdq9" role="1E1XAP">
+          <ref role="1E0d5P" node="26tZ$Z4rreH" resolve="org.iets3.core.expr.genjava.toplevel.rt" />
+        </node>
       </node>
       <node concept="1E1JtD" id="5BQDrmkjrxX" role="2G$12L">
         <property role="TrG5h" value="org.iets3.core.expr.genjava.stringvalidation" />

From ce2255efcefb2f91ea7bf66c20d6f85884e27ea9 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 31 Jan 2024 11:36:37 +0100
Subject: [PATCH 16/19] Use the JUnit5 test annotations

---
 .../generator/template/main@generator.mps                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
index 80cef57452..e2a4470e70 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
@@ -17,6 +17,7 @@
     <import index="xk6s" ref="r:7961970e-5737-42e2-b144-9bef3ad8d077(org.iets3.core.expr.tests.behavior)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="rbkg" ref="63b449db-0918-4a4a-a891-2c430ab133e4/java:org.junit.jupiter.api.extension(org.junit.junit5/)" />
+    <import index="yqm7" ref="63b449db-0918-4a4a-a891-2c430ab133e4/java:org.junit.jupiter.api(org.junit.junit5/)" />
     <import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" implicit="true" />
@@ -442,7 +443,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="hHqB0C0" role="2AJF6D">
-        <ref role="2AI5Lk" to="rjhg:~Test" resolve="Test" />
+        <ref role="2AI5Lk" to="yqm7:~Test" resolve="Test" />
       </node>
       <node concept="17Uvod" id="hHqDnzU" role="lGtFl">
         <property role="2qtEX9" value="name" />

From 3ecbcf88d8519be700f98a66ddbaa33e8146e0dc Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 31 Jan 2024 12:06:35 +0100
Subject: [PATCH 17/19] Move command access to test items since it is not
 supported with the rule annotation anymore

---
 .../generator/template/main@generator.mps     | 322 ++++++++++--------
 1 file changed, 183 insertions(+), 139 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
index e2a4470e70..fe9b357e4e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
@@ -50,6 +50,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -57,10 +60,6 @@
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
-        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -68,6 +67,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -107,6 +109,7 @@
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
@@ -126,6 +129,9 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1219952072943" name="jetbrains.mps.lang.generator.structure.DropRootRule" flags="lg" index="aNPBN">
@@ -361,26 +367,6 @@
         <ref role="2AI5Lk" to="rbkg:~RegisterExtension" resolve="RegisterExtension" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2o2_RLEwLYv" role="jymVt" />
-    <node concept="312cEg" id="2o2_RLEwHPG" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="myWithCommandRule" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="2o2_RLEwHPH" role="1B3o_S" />
-      <node concept="3uibUv" id="2o2_RLEwHPI" role="1tU5fm">
-        <ref role="3uigEE" to="tp6m:BYb1OGotvJ" resolve="RunWithCommand" />
-      </node>
-      <node concept="2ShNRf" id="2o2_RLEwHPJ" role="33vP2m">
-        <node concept="1pGfFk" id="2o2_RLEwHPK" role="2ShVmc">
-          <ref role="37wK5l" to="tp6m:BYb1OGotCN" resolve="RunWithCommand" />
-          <node concept="Xjq3P" id="2o2_RLEwHPL" role="37wK5m" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2o2_RLEwHPM" role="2AJF6D">
-        <ref role="2AI5Lk" to="rjhg:~Rule" resolve="Rule" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="7MpFXKneA8_" role="jymVt" />
     <node concept="3clFbW" id="5iphLhCe51H" role="jymVt">
       <node concept="3cqZAl" id="5iphLhCe51J" role="3clF45" />
@@ -468,12 +454,6 @@
       <node concept="3clFbS" id="hHDKHLk" role="3clF47">
         <node concept="3clFbF" id="7GPsQwM7lAo" role="3cqZAp">
           <node concept="2OqwBi" id="7GPsQwM7mxW" role="3clFbG">
-            <node concept="2ShNRf" id="7GPsQwM7lAk" role="2Oq$k0">
-              <node concept="1pGfFk" id="7GPsQwM7m2L" role="2ShVmc">
-                <ref role="37wK5l" node="7GPsQwM7bjr" resolve="MPSTestCase.TestBody" />
-                <node concept="Xjq3P" id="7GPsQwM7mos" role="37wK5m" />
-              </node>
-            </node>
             <node concept="liA8E" id="7GPsQwM7mGE" role="2OqNvi">
               <ref role="37wK5l" node="hLF7ERe" resolve="test_NodesTestMethod" />
               <node concept="1ZhdrF" id="7GPsQwM7no7" role="lGtFl">
@@ -497,6 +477,12 @@
                 </node>
               </node>
             </node>
+            <node concept="2ShNRf" id="7GPsQwM7lAk" role="2Oq$k0">
+              <node concept="1pGfFk" id="7GPsQwM7m2L" role="2ShVmc">
+                <ref role="37wK5l" node="7GPsQwM7bjr" resolve="MPSTestCase.TestBody" />
+                <node concept="Xjq3P" id="7GPsQwM7mos" role="37wK5m" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -643,54 +629,83 @@
             <node concept="3cqZAl" id="7wjZwvO2LhE" role="3clF45" />
             <node concept="3Tm1VV" id="7wjZwvO2LhF" role="1B3o_S" />
             <node concept="3clFbS" id="7wjZwvO2LhG" role="3clF47">
-              <node concept="3cpWs8" id="7wjZwvO2LhH" role="3cqZAp">
-                <node concept="3cpWsn" id="7wjZwvO2LhI" role="3cpWs9">
-                  <property role="TrG5h" value="ti" />
-                  <node concept="3Tqbb2" id="7wjZwvO2LhJ" role="1tU5fm">
-                    <ref role="ehGHo" to="av4b:78hTg1$THIw" resolve="AbstractTestItem" />
-                  </node>
-                  <node concept="1PxgMI" id="7wjZwvO2LhK" role="33vP2m">
-                    <node concept="1rXfSq" id="7wjZwvO2LhL" role="1m5AlR">
-                      <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
-                      <node concept="Xl_RD" id="7wjZwvO2LhM" role="37wK5m">
-                        <property role="Xl_RC" value="nodeId" />
-                        <node concept="17Uvod" id="7wjZwvO2LhN" role="lGtFl">
-                          <property role="2qtEX9" value="value" />
-                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                          <node concept="3zFVjK" id="7wjZwvO2LhO" role="3zH0cK">
-                            <node concept="3clFbS" id="7wjZwvO2LhP" role="2VODD2">
-                              <node concept="3clFbF" id="7wjZwvO2LhQ" role="3cqZAp">
-                                <node concept="2OqwBi" id="7wjZwvO2LhR" role="3clFbG">
-                                  <node concept="2OqwBi" id="7wjZwvO2LhS" role="2Oq$k0">
-                                    <node concept="liA8E" id="7wjZwvO2LhT" role="2OqNvi">
-                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                                    </node>
-                                    <node concept="2JrnkZ" id="7wjZwvO2LhU" role="2Oq$k0">
-                                      <node concept="30H73N" id="7wjZwvO2LhV" role="2JrQYb" />
+              <node concept="3clFbF" id="7MpFXKnj0WA" role="3cqZAp">
+                <node concept="1rXfSq" id="7MpFXKnj0W$" role="3clFbG">
+                  <ref role="37wK5l" to="tp6m:ZcWKOigGgW" resolve="runWithinCommand" />
+                  <node concept="2ShNRf" id="7MpFXKnGvjc" role="37wK5m">
+                    <node concept="YeOm9" id="7MpFXKnGw3l" role="2ShVmc">
+                      <node concept="1Y3b0j" id="7MpFXKnGw3o" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <property role="373rjd" value="true" />
+                        <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="ExceptionRunnable" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                        <node concept="3Tm1VV" id="7MpFXKnGw3p" role="1B3o_S" />
+                        <node concept="3clFb_" id="7MpFXKnGw3C" role="jymVt">
+                          <property role="TrG5h" value="run" />
+                          <node concept="3Tm1VV" id="7MpFXKnGw3E" role="1B3o_S" />
+                          <node concept="3cqZAl" id="7MpFXKnGw3F" role="3clF45" />
+                          <node concept="3uibUv" id="7MpFXKnGw3G" role="Sfmx6">
+                            <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                          </node>
+                          <node concept="3clFbS" id="7MpFXKnGw3H" role="3clF47">
+                            <node concept="3cpWs8" id="7wjZwvO2LhH" role="3cqZAp">
+                              <node concept="3cpWsn" id="7wjZwvO2LhI" role="3cpWs9">
+                                <property role="TrG5h" value="ti" />
+                                <node concept="3Tqbb2" id="7wjZwvO2LhJ" role="1tU5fm">
+                                  <ref role="ehGHo" to="av4b:78hTg1$THIw" resolve="AbstractTestItem" />
+                                </node>
+                                <node concept="1PxgMI" id="7wjZwvO2LhK" role="33vP2m">
+                                  <node concept="1rXfSq" id="7wjZwvO2LhL" role="1m5AlR">
+                                    <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
+                                    <node concept="Xl_RD" id="7wjZwvO2LhM" role="37wK5m">
+                                      <property role="Xl_RC" value="nodeId" />
+                                      <node concept="17Uvod" id="7wjZwvO2LhN" role="lGtFl">
+                                        <property role="2qtEX9" value="value" />
+                                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                        <node concept="3zFVjK" id="7wjZwvO2LhO" role="3zH0cK">
+                                          <node concept="3clFbS" id="7wjZwvO2LhP" role="2VODD2">
+                                            <node concept="3clFbF" id="7wjZwvO2LhQ" role="3cqZAp">
+                                              <node concept="2OqwBi" id="7wjZwvO2LhR" role="3clFbG">
+                                                <node concept="2OqwBi" id="7wjZwvO2LhS" role="2Oq$k0">
+                                                  <node concept="liA8E" id="7wjZwvO2LhT" role="2OqNvi">
+                                                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                                                  </node>
+                                                  <node concept="2JrnkZ" id="7wjZwvO2LhU" role="2Oq$k0">
+                                                    <node concept="30H73N" id="7wjZwvO2LhV" role="2JrQYb" />
+                                                  </node>
+                                                </node>
+                                                <node concept="liA8E" id="7wjZwvO2LhW" role="2OqNvi">
+                                                  <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="7wjZwvO2LhW" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                  <node concept="chp4Y" id="7wjZwvO2Mbn" role="3oSUPX">
+                                    <ref role="cht4Q" to="av4b:78hTg1$THIw" resolve="AbstractTestItem" />
                                   </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="3clFbF" id="7wjZwvOaV2a" role="3cqZAp">
+                              <node concept="2YIFZM" id="7wjZwvOaVAJ" role="3clFbG">
+                                <ref role="37wK5l" to="y9hc:7wjZwvOaQXf" resolve="doExecuteTest" />
+                                <ref role="1Pybhc" to="y9hc:7wjZwvOaQW4" resolve="TestRunner" />
+                                <node concept="37vLTw" id="7wjZwvOaVMA" role="37wK5m">
+                                  <ref role="3cqZAo" node="7wjZwvO2LhI" resolve="ti" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="7MpFXKnGw3J" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="chp4Y" id="7wjZwvO2Mbn" role="3oSUPX">
-                      <ref role="cht4Q" to="av4b:78hTg1$THIw" resolve="AbstractTestItem" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="7wjZwvOaV2a" role="3cqZAp">
-                <node concept="2YIFZM" id="7wjZwvOaVAJ" role="3clFbG">
-                  <ref role="37wK5l" to="y9hc:7wjZwvOaQXf" resolve="doExecuteTest" />
-                  <ref role="1Pybhc" to="y9hc:7wjZwvOaQW4" resolve="TestRunner" />
-                  <node concept="37vLTw" id="7wjZwvOaVMA" role="37wK5m">
-                    <ref role="3cqZAo" node="7wjZwvO2LhI" resolve="ti" />
                   </node>
                 </node>
               </node>
@@ -754,95 +769,124 @@
           <node concept="3cqZAl" id="7wjZwvO2Hpp" role="3clF45" />
           <node concept="3Tm1VV" id="7wjZwvO2Hpq" role="1B3o_S" />
           <node concept="3clFbS" id="7wjZwvO2Hpr" role="3clF47">
-            <node concept="3cpWs8" id="7wjZwvO2Hps" role="3cqZAp">
-              <node concept="3cpWsn" id="7wjZwvO2Hpt" role="3cpWs9">
-                <property role="TrG5h" value="operation" />
-                <node concept="3Tqbb2" id="7wjZwvO2Hpu" role="1tU5fm">
-                  <ref role="ehGHo" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
-                </node>
-                <node concept="1PxgMI" id="7wjZwvO2Hpv" role="33vP2m">
-                  <node concept="1rXfSq" id="7wjZwvO2Hpw" role="1m5AlR">
-                    <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
-                    <node concept="Xl_RD" id="7wjZwvO2Hpx" role="37wK5m">
-                      <property role="Xl_RC" value="nodeId" />
-                      <node concept="17Uvod" id="7wjZwvO2Hpy" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                        <node concept="3zFVjK" id="7wjZwvO2Hpz" role="3zH0cK">
-                          <node concept="3clFbS" id="7wjZwvO2Hp$" role="2VODD2">
-                            <node concept="3clFbF" id="7wjZwvO2Hp_" role="3cqZAp">
-                              <node concept="2OqwBi" id="7wjZwvO2HpA" role="3clFbG">
-                                <node concept="2OqwBi" id="7wjZwvO2HpB" role="2Oq$k0">
-                                  <node concept="liA8E" id="7wjZwvO2HpC" role="2OqNvi">
-                                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                                  </node>
-                                  <node concept="2JrnkZ" id="7wjZwvO2HpD" role="2Oq$k0">
-                                    <node concept="30H73N" id="7wjZwvO2HpE" role="2JrQYb" />
+            <node concept="3clFbF" id="7MpFXKniYsz" role="3cqZAp">
+              <node concept="1rXfSq" id="7MpFXKniYsx" role="3clFbG">
+                <ref role="37wK5l" to="tp6m:ZcWKOigGgW" resolve="runWithinCommand" />
+                <node concept="2ShNRf" id="7MpFXKnGx$$" role="37wK5m">
+                  <node concept="YeOm9" id="7MpFXKnGxNg" role="2ShVmc">
+                    <node concept="1Y3b0j" id="7MpFXKnGxNj" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <property role="373rjd" value="true" />
+                      <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="ExceptionRunnable" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                      <node concept="3Tm1VV" id="7MpFXKnGxNk" role="1B3o_S" />
+                      <node concept="3clFb_" id="7MpFXKnGxNz" role="jymVt">
+                        <property role="TrG5h" value="run" />
+                        <node concept="3Tm1VV" id="7MpFXKnGxN_" role="1B3o_S" />
+                        <node concept="3cqZAl" id="7MpFXKnGxNA" role="3clF45" />
+                        <node concept="3uibUv" id="7MpFXKnGxNB" role="Sfmx6">
+                          <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                        </node>
+                        <node concept="3clFbS" id="7MpFXKnGxNC" role="3clF47">
+                          <node concept="3cpWs8" id="7wjZwvO2Hps" role="3cqZAp">
+                            <node concept="3cpWsn" id="7wjZwvO2Hpt" role="3cpWs9">
+                              <property role="TrG5h" value="operation" />
+                              <node concept="3Tqbb2" id="7wjZwvO2Hpu" role="1tU5fm">
+                                <ref role="ehGHo" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
+                              </node>
+                              <node concept="1PxgMI" id="7wjZwvO2Hpv" role="33vP2m">
+                                <node concept="1rXfSq" id="7wjZwvO2Hpw" role="1m5AlR">
+                                  <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
+                                  <node concept="Xl_RD" id="7wjZwvO2Hpx" role="37wK5m">
+                                    <property role="Xl_RC" value="nodeId" />
+                                    <node concept="17Uvod" id="7wjZwvO2Hpy" role="lGtFl">
+                                      <property role="2qtEX9" value="value" />
+                                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                      <node concept="3zFVjK" id="7wjZwvO2Hpz" role="3zH0cK">
+                                        <node concept="3clFbS" id="7wjZwvO2Hp$" role="2VODD2">
+                                          <node concept="3clFbF" id="7wjZwvO2Hp_" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7wjZwvO2HpA" role="3clFbG">
+                                              <node concept="2OqwBi" id="7wjZwvO2HpB" role="2Oq$k0">
+                                                <node concept="liA8E" id="7wjZwvO2HpC" role="2OqNvi">
+                                                  <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                                                </node>
+                                                <node concept="2JrnkZ" id="7wjZwvO2HpD" role="2Oq$k0">
+                                                  <node concept="30H73N" id="7wjZwvO2HpE" role="2JrQYb" />
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="7wjZwvO2HpF" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="7wjZwvO2HpF" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                <node concept="chp4Y" id="7wjZwvO2HpG" role="3oSUPX">
+                                  <ref role="cht4Q" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="chp4Y" id="7wjZwvO2HpG" role="3oSUPX">
-                    <ref role="cht4Q" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7wjZwvO2HpH" role="3cqZAp">
-              <node concept="2OqwBi" id="7wjZwvO2HpI" role="3clFbG">
-                <node concept="37vLTw" id="7wjZwvO2HpJ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7wjZwvO2Hpt" resolve="operation" />
-                </node>
-                <node concept="2qgKlT" id="7wjZwvO2HpK" role="2OqNvi">
-                  <ref role="37wK5l" to="tp5o:1kgh5YabdhC" resolve="perform" />
-                  <node concept="1rXfSq" id="7wjZwvO2HpL" role="37wK5m">
-                    <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
-                    <node concept="Xl_RD" id="7wjZwvO2HpM" role="37wK5m">
-                      <property role="Xl_RC" value="nodeId" />
-                      <node concept="17Uvod" id="7wjZwvO2HpN" role="lGtFl">
-                        <property role="2qtEX9" value="value" />
-                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                        <node concept="3zFVjK" id="7wjZwvO2HpO" role="3zH0cK">
-                          <node concept="3clFbS" id="7wjZwvO2HpP" role="2VODD2">
-                            <node concept="3clFbF" id="7wjZwvO2HpQ" role="3cqZAp">
-                              <node concept="2OqwBi" id="7wjZwvO2HpR" role="3clFbG">
-                                <node concept="2OqwBi" id="7wjZwvO2HpS" role="2Oq$k0">
-                                  <node concept="liA8E" id="7wjZwvO2HpT" role="2OqNvi">
-                                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                                  </node>
-                                  <node concept="2JrnkZ" id="7wjZwvO2HpU" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="7wjZwvO2HpV" role="2JrQYb">
-                                      <node concept="1PxgMI" id="7wjZwvO31G3" role="2Oq$k0">
-                                        <node concept="chp4Y" id="7wjZwvO31R1" role="3oSUPX">
-                                          <ref role="cht4Q" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
+                          <node concept="3clFbF" id="7wjZwvO2HpH" role="3cqZAp">
+                            <node concept="2OqwBi" id="7wjZwvO2HpI" role="3clFbG">
+                              <node concept="37vLTw" id="7wjZwvO2HpJ" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7wjZwvO2Hpt" resolve="operation" />
+                              </node>
+                              <node concept="2qgKlT" id="7wjZwvO2HpK" role="2OqNvi">
+                                <ref role="37wK5l" to="tp5o:1kgh5YabdhC" resolve="perform" />
+                                <node concept="1rXfSq" id="7wjZwvO2HpL" role="37wK5m">
+                                  <ref role="37wK5l" to="tp6m:hLFg$wA" resolve="getRealNodeById" />
+                                  <node concept="Xl_RD" id="7wjZwvO2HpM" role="37wK5m">
+                                    <property role="Xl_RC" value="nodeId" />
+                                    <node concept="17Uvod" id="7wjZwvO2HpN" role="lGtFl">
+                                      <property role="2qtEX9" value="value" />
+                                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                      <node concept="3zFVjK" id="7wjZwvO2HpO" role="3zH0cK">
+                                        <node concept="3clFbS" id="7wjZwvO2HpP" role="2VODD2">
+                                          <node concept="3clFbF" id="7wjZwvO2HpQ" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7wjZwvO2HpR" role="3clFbG">
+                                              <node concept="2OqwBi" id="7wjZwvO2HpS" role="2Oq$k0">
+                                                <node concept="liA8E" id="7wjZwvO2HpT" role="2OqNvi">
+                                                  <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                                                </node>
+                                                <node concept="2JrnkZ" id="7wjZwvO2HpU" role="2Oq$k0">
+                                                  <node concept="2OqwBi" id="7wjZwvO2HpV" role="2JrQYb">
+                                                    <node concept="1PxgMI" id="7wjZwvO31G3" role="2Oq$k0">
+                                                      <node concept="chp4Y" id="7wjZwvO31R1" role="3oSUPX">
+                                                        <ref role="cht4Q" to="tp5g:1kgh5Yab2sH" resolve="INodesTestMethod" />
+                                                      </node>
+                                                      <node concept="30H73N" id="7wjZwvO2HpW" role="1m5AlR" />
+                                                    </node>
+                                                    <node concept="2qgKlT" id="7wjZwvO2HpX" role="2OqNvi">
+                                                      <ref role="37wK5l" to="tp5o:38gbJV0XvZR" resolve="getAnnotatedNode" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="7wjZwvO2HpY" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                              </node>
+                                            </node>
+                                          </node>
                                         </node>
-                                        <node concept="30H73N" id="7wjZwvO2HpW" role="1m5AlR" />
-                                      </node>
-                                      <node concept="2qgKlT" id="7wjZwvO2HpX" role="2OqNvi">
-                                        <ref role="37wK5l" to="tp5o:38gbJV0XvZR" resolve="getAnnotatedNode" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="7wjZwvO2HpY" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                </node>
+                                <node concept="10Nm6u" id="7fT4hG54Ez7" role="37wK5m" />
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="2AHcQZ" id="7MpFXKnGxNE" role="2AJF6D">
+                          <ref role="2AI5Lk" to="wyt6:~Override" />
+                        </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="10Nm6u" id="7fT4hG54Ez7" role="37wK5m" />
                 </node>
               </node>
             </node>

From 017a53aeaf698c702131c7c61b8f28cbff0fdb1b Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 31 Jan 2024 20:41:49 +0100
Subject: [PATCH 18/19] Force save all

---
 .../models/behavior.mps                       |  12 +-
 .../org.iets3.analysis.base/models/plugin.mps |  16 +-
 .../models/behavior.mps                       |  50 ++---
 .../models/constraints.mps                    |  16 +-
 .../models/editor.mps                         |  52 +++---
 .../models/intentions.mps                     |   2 +-
 .../models/migration.mps                      |  24 +--
 .../models/typesystem.mps                     |  40 ++--
 .../org/iets3/components/plugin/plugin.mps    |   4 +-
 .../models/behavior.mps                       |  10 +-
 .../models/behavior.mps                       |  18 +-
 .../models/editor.mps                         |   6 +-
 .../models/plugin.mps                         |  12 +-
 .../org.iets3.core.base/models/behavior.mps   |   8 +-
 .../org.iets3.core.base/models/editor.mps     |   6 +-
 .../org.iets3.core.base/models/intentions.mps |   6 +-
 .../org.iets3.core.base/models/typesystem.mps |   6 +-
 .../models/behavior.mps                       |  24 +--
 .../models/constraints.mps                    |   4 +-
 .../org.iets3.core.expr.adt/models/editor.mps |   6 +-
 .../org.iets3.core.expr.adt/models/plugin.mps |   2 +-
 .../models/typesystem.mps                     |   4 +-
 .../models/behavior.mps                       | 176 +++++++++---------
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  18 +-
 .../models/intentions.mps                     |   4 +-
 .../models/migration.mps                      |   8 +-
 .../models/plugin.mps                         |  34 ++--
 .../models/typesystem.mps                     |  42 ++---
 .../models/behavior.mps                       |   4 +-
 .../org.iets3.core.expr.data.editor.mps       |  10 +-
 .../org.iets3.core.expr.data.migration.mps    |   8 +-
 .../org.iets3.core.expr.data.typesystem.mps   |  16 +-
 .../models/behavior.mps                       |  36 ++--
 .../models/editor.mps                         |  16 +-
 .../models/typesystem.mps                     |   4 +-
 .../models/intentions.mps                     |  10 +-
 ...iets3.core.expr.genjava.base@generator.mps |  18 +-
 ....core.expr.genjava.contracts@generator.mps |   4 +-
 ...ava.data.generator.templates@generator.mps |   2 +-
 ...3.core.expr.genjava.messages@generator.mps |   2 +-
 ...ore.expr.genjava.simpleTypes@generator.mps |   4 +-
 ...ets3.core.expr.genjava.tests@generator.mps |   6 +-
 ...3.core.expr.genjava.toplevel@generator.mps |  24 +--
 ...iets3.core.expr.genjava.util@generator.mps |  10 +-
 .../models/behavior.mps                       |  44 ++---
 .../models/constraints.mps                    |   6 +-
 .../models/intentions.mps                     |   8 +-
 .../models/plugin.mps                         |  18 +-
 .../models/typesystem.mps                     |  16 +-
 .../models/editor.mps                         |  16 +-
 .../models/behavior.mps                       |   2 +-
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |   6 +-
 .../models/plugin.mps                         |   8 +-
 .../models/typesystem.mps                     |  18 +-
 .../models/behavior.mps                       |   4 +-
 .../models/behavior.mps                       |   6 +-
 .../models/plugin.mps                         |   4 +-
 .../models/behavior.mps                       |   2 +-
 .../models/editor.mps                         |  12 +-
 .../models/plugin.mps                         |  10 +-
 .../models/behavior.mps                       |   2 +-
 .../models/constraints.mps                    |   6 +-
 .../models/editor.mps                         |   2 +-
 .../org.iets3.core.expr.process.behavior.mps  |   6 +-
 .../models/plugin.mps                         |   6 +-
 .../models/intentions.mps                     |  14 +-
 .../org/iets3/core/expr/repl/behavior.mps     |  30 +--
 .../org/iets3/core/expr/repl/constraints.mps  |  18 +-
 .../org/iets3/core/expr/repl/editor.mps       |   2 +-
 .../org/iets3/core/expr/repl/typesystem.mps   |   2 +-
 .../models/behavior.mps                       |   2 +-
 .../models/intentions.mps                     |   6 +-
 .../models/plugin.mps                         |  12 +-
 .../models/typesystem.mps                     |   4 +-
 .../models/behavior.mps                       |  14 +-
 .../models/editor.mps                         |   4 +-
 .../models/intentions.mps                     |  20 +-
 .../models/plugin.mps                         |  28 +--
 ...s3.core.expr.stringvalidation.behavior.mps |   6 +-
 .../models/plugin.mps                         |   4 +-
 .../models/typesystem.mps                     |   8 +-
 .../generator/template/main@generator.mps     |  12 +-
 .../models/behavior.mps                       |  86 ++++-----
 .../models/constraints.mps                    |   4 +-
 .../models/editor.mps                         |  20 +-
 .../models/findUsages.mps                     |   2 +-
 .../models/intentions.mps                     |  16 +-
 .../models/migration.mps                      |   4 +-
 .../models/listeners.mps                      |   2 +-
 .../org/iets3/core/expr/toplevel/behavior.mps | 114 ++++++------
 .../iets3/core/expr/toplevel/constraints.mps  |  16 +-
 .../org/iets3/core/expr/toplevel/editor.mps   |   4 +-
 .../org/iets3/core/expr/toplevel/plugin.mps   |   4 +-
 .../iets3/core/expr/toplevel/typesystem.mps   |  18 +-
 .../models/editor.mps                         |   2 +-
 .../core/expr/typetags/lib/typesystem.mps     |   2 +-
 ....expr.typetags.units.quantity.behavior.mps |   2 +-
 .../models/behavior.mps                       |  28 +--
 ...ts3.core.expr.typetags.units.migration.mps |  36 ++--
 ....iets3.core.expr.typetags.units.plugin.mps |  16 +-
 .../models/typesystem.mps                     |  20 +-
 .../org/iets3/core/expr/typetags/behavior.mps |   4 +-
 .../org/iets3/core/expr/typetags/editor.mps   |   2 +-
 .../models/behavior.mps                       |  38 ++--
 .../models/editor.mps                         |  30 +--
 .../models/intentions.mps                     |  34 ++--
 .../models/typesystem.mps                     |  14 +-
 .../models/org/iets3/core/plugin/plugin.mps   |  16 +-
 .../models/findUsages.mps                     |   2 +-
 .../org.iets3.core.trace/models/plugin.mps    |  16 +-
 .../models/typesystem.mps                     |   6 +-
 .../org.iets3.glossary/models/typesystem.mps  |   4 +-
 .../generator/template/main@generator.mps     |  12 +-
 .../org.iets3.req.core/models/editor.mps      |  14 +-
 .../models/org/iets3/req/plugin/plugin.mps    |  20 +-
 .../models/editor.mps                         |   2 +-
 .../models/plugin.mps                         |   6 +-
 .../models/runtime.mps                        |  14 +-
 .../models/plugin.mps                         |   8 +-
 ...ets3.core.expr.data.interpreter.plugin.mps |  10 +-
 .../models/plugin.mps                         |   8 +-
 .../models/plugin.mps                         |   4 +-
 .../models/plugin.mps                         |   6 +-
 .../models/runtime.mps                        |   4 +-
 .../models/plugin.mps                         |   2 +-
 .../models/plugin.mps                         |   6 +-
 .../models/plugin.mps                         |   4 +-
 .../models/plugin.mps                         |  24 +--
 .../models/plugin.mps                         |   2 +-
 .../iets3/core/expr/repl/plugin/plugin.mps    |   4 +-
 ...pr.stringvalidation.interpreter.plugin.mps |   2 +-
 ....expr.stringvalidation.runtime.runtime.mps |   8 +-
 .../models/plugin.mps                         |   2 +-
 .../models/plugin.mps                         |  32 ++--
 .../models/org.iets3.opensource.linters.mps   |  14 +-
 .../org.iets3.opensource.linters.msd          |   1 +
 .../core/tracequery/tracequery@tests.mps      |   2 +-
 .../models/unitsonly@tests.mps                |   4 +-
 140 files changed, 979 insertions(+), 978 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
index d7f14e170d..058a2a24a9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps
@@ -887,7 +887,7 @@
                                 <node concept="10Nm6u" id="4bUWUHuPNK" role="3uHU7w" />
                                 <node concept="2OqwBi" id="4bUWUHuPNL" role="3uHU7B">
                                   <node concept="37vLTw" id="4bUWUHuPNM" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8170u" />
+                                    <ref role="3cqZAo" node="4z0AnX8170u" resolve="it" />
                                   </node>
                                   <node concept="3CFZ6_" id="4bUWUHuPNN" role="2OqNvi">
                                     <node concept="3CFYIy" id="4bUWUHuPNO" role="3CFYIz">
@@ -911,7 +911,7 @@
                           <node concept="3clFbF" id="4bUWUHuPNU" role="3cqZAp">
                             <node concept="2OqwBi" id="4bUWUHuPNV" role="3clFbG">
                               <node concept="37vLTw" id="4bUWUHuPNW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8170w" />
+                                <ref role="3cqZAo" node="4z0AnX8170w" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="4bUWUHuPNX" role="2OqNvi">
                                 <node concept="3CFYIy" id="4bUWUHuPNY" role="3CFYIz">
@@ -1079,7 +1079,7 @@
                                   <node concept="2OqwBi" id="2ZalWa8J0A9" role="3uHU7B">
                                     <node concept="2OqwBi" id="2ZalWa8IZPh" role="2Oq$k0">
                                       <node concept="37vLTw" id="2ZalWa8IZ$Y" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8170y" />
+                                        <ref role="3cqZAo" node="4z0AnX8170y" resolve="it" />
                                       </node>
                                       <node concept="3CFZ6_" id="2ZalWa8J05z" role="2OqNvi">
                                         <node concept="3CFYIy" id="2ZalWa8J0fY" role="3CFYIz">
@@ -1095,7 +1095,7 @@
                                 <node concept="3y3z36" id="2ZalWa8IVcD" role="3uHU7B">
                                   <node concept="2OqwBi" id="2ZalWa8IUg3" role="3uHU7B">
                                     <node concept="37vLTw" id="2ZalWa8IU0l" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8170y" />
+                                      <ref role="3cqZAo" node="4z0AnX8170y" resolve="it" />
                                     </node>
                                     <node concept="3CFZ6_" id="2ZalWa8IUtL" role="2OqNvi">
                                       <node concept="3CFYIy" id="2ZalWa8IUEI" role="3CFYIz">
@@ -1121,7 +1121,7 @@
                           <node concept="3clFbF" id="2ZalWa8IWsH" role="3cqZAp">
                             <node concept="2OqwBi" id="2ZalWa8IWHg" role="3clFbG">
                               <node concept="37vLTw" id="2ZalWa8IWsG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8170$" />
+                                <ref role="3cqZAo" node="4z0AnX8170$" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="2ZalWa8IWWN" role="2OqNvi">
                                 <node concept="3CFYIy" id="2ZalWa8IX7j" role="3CFYIz">
@@ -1591,7 +1591,7 @@
                     <node concept="3clFbF" id="XhdFKw2TSS" role="3cqZAp">
                       <node concept="2OqwBi" id="XhdFKw2U3M" role="3clFbG">
                         <node concept="37vLTw" id="XhdFKw2TSR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8170A" />
+                          <ref role="3cqZAo" node="4z0AnX8170A" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="XhdFKw2Uhn" role="2OqNvi">
                           <ref role="3TsBF5" to="l80j:XhdFKvXSNs" resolve="msg" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
index 8c70c26a9b..c066a4009b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
@@ -1024,7 +1024,7 @@
                               <ref role="2pJxcJ" to="l80j:XhdFKvXSNs" resolve="msg" />
                               <node concept="WxPPo" id="uuJ7IpZtu8" role="28ntcv">
                                 <node concept="37vLTw" id="rj7uJEnjLr" role="WxPPp">
-                                  <ref role="3cqZAo" node="4z0AnX8170C" />
+                                  <ref role="3cqZAo" node="4z0AnX8170C" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1359,7 +1359,7 @@
                             <node concept="3cpWs3" id="1kfQzZFABkd" role="37wK5m">
                               <node concept="2OqwBi" id="1kfQzZFABnW" role="3uHU7w">
                                 <node concept="37vLTw" id="1kfQzZFABkr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8170E" />
+                                  <ref role="3cqZAo" node="4z0AnX8170E" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1kfQzZFABt0" role="2OqNvi">
                                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -3068,7 +3068,7 @@
                                     <node concept="3fqX7Q" id="5BRQP3Ri6nE" role="3clFbG">
                                       <node concept="2OqwBi" id="5BRQP3Ri6nF" role="3fr31v">
                                         <node concept="37vLTw" id="5BRQP3Ri6nG" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8170G" />
+                                          <ref role="3cqZAo" node="4z0AnX8170G" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="5BRQP3Ri6nH" role="2OqNvi">
                                           <ref role="37wK5l" to="gdgh:5zG5$Lyex2e" resolve="isOk" />
@@ -3091,7 +3091,7 @@
                                   <node concept="1rXfSq" id="5BRQP3Ri6nO" role="3clFbG">
                                     <ref role="37wK5l" node="6QuUnma$l2x" resolve="messageOf" />
                                     <node concept="37vLTw" id="5BRQP3Ri6nP" role="37wK5m">
-                                      <ref role="3cqZAo" node="4z0AnX8170I" />
+                                      <ref role="3cqZAo" node="4z0AnX8170I" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -4819,7 +4819,7 @@
                               </node>
                             </node>
                             <node concept="37vLTw" id="3NwcubmjYQE" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX8170K" />
+                              <ref role="3cqZAo" node="4z0AnX8170K" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="3NwcubmjYQF" role="37wK5m">
                               <ref role="3cqZAo" node="3NwcubmjYQs" resolve="errorMessage" />
@@ -5238,7 +5238,7 @@
                             <node concept="3y3z36" id="4fQRPNhf0YQ" role="3uHU7B">
                               <node concept="2OqwBi" id="4fQRPNheYI1" role="3uHU7B">
                                 <node concept="37vLTw" id="4fQRPNheYjW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8170M" />
+                                  <ref role="3cqZAo" node="4z0AnX8170M" resolve="it" />
                                 </node>
                                 <node concept="2OwXpG" id="4fQRPNhf0wm" role="2OqNvi">
                                   <ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
@@ -5250,7 +5250,7 @@
                               <node concept="10Nm6u" id="2SyD3e2oUXX" role="3uHU7w" />
                               <node concept="2OqwBi" id="2SyD3e2oROp" role="3uHU7B">
                                 <node concept="37vLTw" id="2SyD3e2oRly" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8170M" />
+                                  <ref role="3cqZAo" node="4z0AnX8170M" resolve="it" />
                                 </node>
                                 <node concept="2OwXpG" id="2SyD3e2oTkN" role="2OqNvi">
                                   <ref role="2Oxat5" node="2f_Mi5n99G5" resolve="type" />
@@ -5274,7 +5274,7 @@
                         <node concept="1rXfSq" id="1ukHH8$vbXu" role="3clFbG">
                           <ref role="37wK5l" node="2f_Mi5ndzsh" resolve="toHighlighterMessage" />
                           <node concept="37vLTw" id="1ukHH8$vcFP" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8170O" />
+                            <ref role="3cqZAo" node="4z0AnX8170O" resolve="it" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
index 6852a8243a..03b5a0e607 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
@@ -559,7 +559,7 @@
                           <ref role="cht4Q" to="w9y2:6LfBX8Yivpj" resolve="IComponentsChunkContent" />
                         </node>
                         <node concept="37vLTw" id="5kXA14n1pUv" role="1m5AlR">
-                          <ref role="3cqZAo" node="4z0AnX8170Q" />
+                          <ref role="3cqZAo" node="4z0AnX8170Q" resolve="it" />
                         </node>
                       </node>
                       <node concept="3TrcHB" id="5kXA14n1qjG" role="2OqNvi">
@@ -756,7 +756,7 @@
                           <node concept="3clFbF" id="7Zvsa54vqrg" role="3cqZAp">
                             <node concept="2OqwBi" id="7Zvsa54vqwK" role="3clFbG">
                               <node concept="37vLTw" id="7Zvsa54vqrf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8170S" />
+                                <ref role="3cqZAo" node="4z0AnX8170S" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="7Zvsa54vqDQ" role="2OqNvi">
                                 <ref role="37wK5l" node="7Zvsa54vnYI" resolve="allContents" />
@@ -1403,7 +1403,7 @@
                           <node concept="3clFbF" id="siw10FnrMW" role="3cqZAp">
                             <node concept="2OqwBi" id="siw10FnrMX" role="3clFbG">
                               <node concept="37vLTw" id="siw10FnrMY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8170U" />
+                                <ref role="3cqZAo" node="4z0AnX8170U" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="siw10FnrMZ" role="2OqNvi">
                                 <ref role="37wK5l" node="siw10FnrMt" resolve="allSubstructure" />
@@ -1517,7 +1517,7 @@
                           <node concept="2OqwBi" id="JbnHRlSPoy" role="3clFbG">
                             <node concept="2OqwBi" id="JbnHRlSPo$" role="2Oq$k0">
                               <node concept="37vLTw" id="JbnHRlSPo_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8170W" />
+                                <ref role="3cqZAo" node="4z0AnX8170W" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="3PhTX5bGUk6" role="2OqNvi">
                                 <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -1629,7 +1629,7 @@
                       <node concept="3clFbF" id="3PhTX5bHqSr" role="3cqZAp">
                         <node concept="2OqwBi" id="3PhTX5bHtf8" role="3clFbG">
                           <node concept="37vLTw" id="3PhTX5bHqSq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8170Y" />
+                            <ref role="3cqZAo" node="4z0AnX8170Y" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3PhTX5bHxGb" role="2OqNvi">
                             <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -1743,7 +1743,7 @@
                     <node concept="2OqwBi" id="mIQkxfv1W9" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfv1Wa" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfv1Wb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81710" />
+                          <ref role="3cqZAo" node="4z0AnX81710" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfv1Wc" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1783,7 +1783,7 @@
                     <node concept="2OqwBi" id="mIQkxfv1WA" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfv1WB" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfv1WC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81712" />
+                          <ref role="3cqZAo" node="4z0AnX81712" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfv1WD" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1834,7 +1834,7 @@
                     <node concept="2OqwBi" id="mIQkxfCIxg" role="3clFbG">
                       <node concept="2OqwBi" id="mIQkxfCIxh" role="2Oq$k0">
                         <node concept="37vLTw" id="mIQkxfCIxi" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81714" />
+                          <ref role="3cqZAo" node="4z0AnX81714" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="mIQkxfCIxj" role="2OqNvi">
                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1896,7 +1896,7 @@
                       <node concept="2OqwBi" id="mIQkxf$FQp" role="3uHU7B">
                         <node concept="2OqwBi" id="mIQkxf$F2i" role="2Oq$k0">
                           <node concept="37vLTw" id="mIQkxf$EUh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81716" />
+                            <ref role="3cqZAo" node="4z0AnX81716" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="mIQkxf$FgW" role="2OqNvi">
                             <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -2511,7 +2511,7 @@
                     <node concept="3clFbF" id="3PhTX5bHIb_" role="3cqZAp">
                       <node concept="2OqwBi" id="3PhTX5bHIpq" role="3clFbG">
                         <node concept="37vLTw" id="3PhTX5bHIb$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81718" />
+                          <ref role="3cqZAo" node="4z0AnX81718" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3PhTX5bHIUd" role="2OqNvi">
                           <ref role="37wK5l" node="77HYM7H$sfU" resolve="component" />
@@ -3486,7 +3486,7 @@
                           <node concept="2OqwBi" id="76PiIP0J6Ak" role="33vP2m">
                             <node concept="2OqwBi" id="76PiIP0J6Al" role="2Oq$k0">
                               <node concept="37vLTw" id="76PiIP0J6Am" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8171a" />
+                                <ref role="3cqZAo" node="4z0AnX8171a" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="76PiIP0J6An" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
@@ -3504,7 +3504,7 @@
                             <node concept="2OqwBi" id="3sKE3ts8K7i" role="3uHU7B">
                               <node concept="2OqwBi" id="3sKE3ts8K7j" role="2Oq$k0">
                                 <node concept="37vLTw" id="3sKE3ts8K7k" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171a" />
+                                  <ref role="3cqZAo" node="4z0AnX8171a" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="3sKE3ts8K7l" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -3946,7 +3946,7 @@
                       </node>
                       <node concept="2OqwBi" id="7Atos1y666E" role="33vP2m">
                         <node concept="37vLTw" id="7Atos1y666F" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8171c" />
+                          <ref role="3cqZAo" node="4z0AnX8171c" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7Atos1y666G" role="2OqNvi">
                           <ref role="37wK5l" node="mIQkxg5ZT6" resolve="getPorts" />
@@ -3975,7 +3975,7 @@
                             <node concept="3clFbC" id="4VHfdEqkKQi" role="1eOMHV">
                               <node concept="2OqwBi" id="4VHfdEqkKQj" role="3uHU7B">
                                 <node concept="37vLTw" id="4VHfdEqkKQk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171c" />
+                                  <ref role="3cqZAo" node="4z0AnX8171c" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4VHfdEqkKQl" role="2OqNvi">
                                   <ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
@@ -4002,7 +4002,7 @@
                             <node concept="3clFbC" id="4VHfdEqkBOj" role="1eOMHV">
                               <node concept="2OqwBi" id="4VHfdEqk$mS" role="3uHU7B">
                                 <node concept="37vLTw" id="4VHfdEqkzO7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171c" />
+                                  <ref role="3cqZAo" node="4z0AnX8171c" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4VHfdEqk$Ya" role="2OqNvi">
                                   <ref role="37wK5l" node="4VHfdEqkeO4" resolve="getInstanceForPort" />
@@ -7399,7 +7399,7 @@
                     <node concept="2OqwBi" id="siw10GLzjO" role="3clFbG">
                       <node concept="2OqwBi" id="siw10GLzjP" role="2Oq$k0">
                         <node concept="37vLTw" id="siw10GLzjQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8171e" />
+                          <ref role="3cqZAo" node="4z0AnX8171e" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="siw10GLzjR" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7600,7 +7600,7 @@
                       <node concept="3y3z36" id="1WCh2thaTlJ" role="3clFbG">
                         <node concept="13iPFW" id="1WCh2thaTlK" role="3uHU7w" />
                         <node concept="37vLTw" id="1WCh2thaTlL" role="3uHU7B">
-                          <ref role="3cqZAo" node="4z0AnX8171g" />
+                          <ref role="3cqZAo" node="4z0AnX8171g" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -7637,7 +7637,7 @@
                     <node concept="3clFbF" id="1WCh2thclCA" role="3cqZAp">
                       <node concept="2OqwBi" id="1WCh2thclCB" role="3clFbG">
                         <node concept="37vLTw" id="1WCh2thclCC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8171i" />
+                          <ref role="3cqZAo" node="4z0AnX8171i" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="1WCh2thclCD" role="2OqNvi">
                           <ref role="37wK5l" node="1WCh2thchui" resolve="sourcePortsAndInstance" />
@@ -7695,7 +7695,7 @@
                         <node concept="3fqX7Q" id="7Nni8xTZFXQ" role="3uHU7w">
                           <node concept="2OqwBi" id="7Nni8xTZFXS" role="3fr31v">
                             <node concept="37vLTw" id="7Nni8xTZFXT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171k" />
+                              <ref role="3cqZAo" node="4z0AnX8171k" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="7Nni8xTZFXU" role="2OqNvi">
                               <ref role="37wK5l" node="mIQkxf$r$2" resolve="isOptional" />
@@ -7705,7 +7705,7 @@
                         <node concept="2OqwBi" id="7Nni8xTZ$vh" role="3uHU7B">
                           <node concept="2OqwBi" id="7Nni8xTZuZR" role="2Oq$k0">
                             <node concept="37vLTw" id="7Nni8xTZtHX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171k" />
+                              <ref role="3cqZAo" node="4z0AnX8171k" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7Nni8xTZz4d" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -7779,7 +7779,7 @@
                                         <property role="3cmrfH" value="0" />
                                       </node>
                                       <node concept="37vLTw" id="7Nni8xU4IGX" role="1LFl5Q">
-                                        <ref role="3cqZAo" node="4z0AnX8171m" />
+                                        <ref role="3cqZAo" node="4z0AnX8171m" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="7Nni8xU4OoL" role="2OqNvi">
@@ -7797,7 +7797,7 @@
                                         <property role="3cmrfH" value="0" />
                                       </node>
                                       <node concept="37vLTw" id="7Nni8xU4XM6" role="1LFl5Q">
-                                        <ref role="3cqZAo" node="4z0AnX8171m" />
+                                        <ref role="3cqZAo" node="4z0AnX8171m" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="7Nni8xU4XM7" role="2OqNvi">
@@ -7814,7 +7814,7 @@
                                     <property role="3cmrfH" value="0" />
                                   </node>
                                   <node concept="37vLTw" id="1WCh2thcbsU" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="4z0AnX8171m" />
+                                    <ref role="3cqZAo" node="4z0AnX8171m" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="1WCh2thcJ7d" role="2OqNvi">
@@ -7859,7 +7859,7 @@
                           <node concept="2OqwBi" id="1WCh2thdoAO" role="3clFbG">
                             <node concept="2OqwBi" id="1WCh2thdoAP" role="2Oq$k0">
                               <node concept="37vLTw" id="1WCh2thdoAQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8171o" />
+                                <ref role="3cqZAo" node="4z0AnX8171o" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1WCh2thdoAR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
@@ -8188,7 +8188,7 @@
                   <node concept="3clFbF" id="1WCh2thcj7N" role="3cqZAp">
                     <node concept="1Ls8ON" id="1WCh2thcj7M" role="3clFbG">
                       <node concept="37vLTw" id="1WCh2thcjmy" role="1Lso8e">
-                        <ref role="3cqZAo" node="4z0AnX8171q" />
+                        <ref role="3cqZAo" node="4z0AnX8171q" resolve="it" />
                       </node>
                       <node concept="13iPFW" id="1WCh2thcjv1" role="1Lso8e" />
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
index 72ddc99204..0d5b700582 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/constraints.mps
@@ -332,7 +332,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="1F1F0IUZ_dk" role="3uHU7B">
-                            <ref role="3cqZAo" node="4z0AnX8171s" />
+                            <ref role="3cqZAo" node="4z0AnX8171s" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -749,7 +749,7 @@
                         <node concept="2OqwBi" id="1F1F0IUZ$YZ" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ$Z0" role="2Oq$k0">
                             <node concept="37vLTw" id="1F1F0IUZ$Z1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171u" />
+                              <ref role="3cqZAo" node="4z0AnX8171u" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZ$Z2" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -984,7 +984,7 @@
                         <node concept="2OqwBi" id="1F1F0IUZ$S7" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ$S8" role="2Oq$k0">
                             <node concept="37vLTw" id="1F1F0IUZ$S9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171w" />
+                              <ref role="3cqZAo" node="4z0AnX8171w" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZ$Sa" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1493,7 +1493,7 @@
                                 <node concept="3O6GUB" id="6ETHnAJXoFc" role="2OqNvi">
                                   <node concept="25Kdxt" id="6ETHnAJXp75" role="3QVz_e">
                                     <node concept="37vLTw" id="6ETHnAJXpz1" role="25KhWn">
-                                      <ref role="3cqZAo" node="4z0AnX8171y" />
+                                      <ref role="3cqZAo" node="4z0AnX8171y" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1505,7 +1505,7 @@
                                 <node concept="2Zo12i" id="6ETHnAJXj69" role="2OqNvi">
                                   <node concept="25Kdxt" id="6ETHnAJXllx" role="2Zo12j">
                                     <node concept="37vLTw" id="6ETHnAJXlL3" role="25KhWn">
-                                      <ref role="3cqZAo" node="4z0AnX8171y" />
+                                      <ref role="3cqZAo" node="4z0AnX8171y" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -2592,7 +2592,7 @@
                                 <node concept="3clFbF" id="68KkV784WuT" role="3cqZAp">
                                   <node concept="2OqwBi" id="68KkV784WuU" role="3clFbG">
                                     <node concept="37vLTw" id="68KkV784WuV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8171$" />
+                                      <ref role="3cqZAo" node="4z0AnX8171$" resolve="it" />
                                     </node>
                                     <node concept="2yIwOk" id="68KkV784WuW" role="2OqNvi" />
                                   </node>
@@ -2639,7 +2639,7 @@
                                     <node concept="3O6GUB" id="6ETHnAJXONh" role="2OqNvi">
                                       <node concept="25Kdxt" id="6ETHnAJXPky" role="3QVz_e">
                                         <node concept="37vLTw" id="6ETHnAJXPPQ" role="25KhWn">
-                                          <ref role="3cqZAo" node="4z0AnX8171A" />
+                                          <ref role="3cqZAo" node="4z0AnX8171A" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -2651,7 +2651,7 @@
                                     <node concept="2Zo12i" id="6ETHnAJXKYh" role="2OqNvi">
                                       <node concept="25Kdxt" id="6ETHnAJXLv3" role="2Zo12j">
                                         <node concept="37vLTw" id="6ETHnAJXLZS" role="25KhWn">
-                                          <ref role="3cqZAo" node="4z0AnX8171A" />
+                                          <ref role="3cqZAo" node="4z0AnX8171A" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
index a58f0cfee6..c40c727750 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
@@ -3689,7 +3689,7 @@
                         <node concept="3fqX7Q" id="siw10FErbQ" role="3clFbG">
                           <node concept="2OqwBi" id="siw10FErjc" role="3fr31v">
                             <node concept="37vLTw" id="siw10FEreR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171C" />
+                              <ref role="3cqZAo" node="4z0AnX8171C" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="siw10FErsu" role="2OqNvi">
                               <node concept="chp4Y" id="siw10FErxF" role="cj9EA">
@@ -4242,7 +4242,7 @@
                               <node concept="37u81S" id="v8xu81RjRP" role="3uHU7w" />
                               <node concept="2OqwBi" id="v8xu81RjRQ" role="3uHU7B">
                                 <node concept="37vLTw" id="v8xu81RjRR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171E" />
+                                  <ref role="3cqZAo" node="4z0AnX8171E" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="v8xu81RjRS" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:cJpacq2_ov" resolve="outerPort" />
@@ -4264,7 +4264,7 @@
                         <node concept="3clFbF" id="v8xu81RjRY" role="3cqZAp">
                           <node concept="2OqwBi" id="v8xu81RjRZ" role="3clFbG">
                             <node concept="37vLTw" id="v8xu81RjS0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171G" />
+                              <ref role="3cqZAo" node="4z0AnX8171G" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="v8xu81RjS1" role="2OqNvi" />
                           </node>
@@ -4302,7 +4302,7 @@
                               <node concept="37u81S" id="v8xu81RjSi" role="3uHU7w" />
                               <node concept="2OqwBi" id="v8xu81RjSj" role="3uHU7B">
                                 <node concept="37vLTw" id="v8xu81RjSk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171I" />
+                                  <ref role="3cqZAo" node="4z0AnX8171I" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="v8xu81RjSl" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:cJpacq1tbb" resolve="outerPort" />
@@ -4324,7 +4324,7 @@
                         <node concept="3clFbF" id="v8xu81RjSr" role="3cqZAp">
                           <node concept="2OqwBi" id="v8xu81RjSs" role="3clFbG">
                             <node concept="37vLTw" id="v8xu81RjSt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8171K" />
+                              <ref role="3cqZAo" node="4z0AnX8171K" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="v8xu81RjSu" role="2OqNvi" />
                           </node>
@@ -4411,7 +4411,7 @@
                                   <node concept="3clFbF" id="7jwD7MQjiAB" role="3cqZAp">
                                     <node concept="2OqwBi" id="7jwD7MQjiQ_" role="3clFbG">
                                       <node concept="37vLTw" id="7jwD7MQjiA_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                        <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="7jwD7MQjjq0" role="2OqNvi">
                                         <ref role="37wK5l" to="3eba:7jwD7MQjeSk" resolve="getComponentIconSmall" />
@@ -4429,7 +4429,7 @@
                                   <node concept="3clFbF" id="siw10GXGyh" role="3cqZAp">
                                     <node concept="2OqwBi" id="siw10GXGB6" role="3clFbG">
                                       <node concept="37vLTw" id="mIQkxfYbBN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                        <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="siw10GXGMR" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4489,7 +4489,7 @@
                                                             <ref role="cht4Q" to="w9y2:6LfBX8YlosD" resolve="ComponentInstance" />
                                                           </node>
                                                           <node concept="37vLTw" id="41i_FWyXP0P" role="1m5AlR">
-                                                            <ref role="3cqZAo" node="4z0AnX8171M" />
+                                                            <ref role="3cqZAo" node="4z0AnX8171M" resolve="it" />
                                                           </node>
                                                         </node>
                                                         <node concept="3TrEf2" id="41i_FWyXP0Q" role="2OqNvi">
@@ -4504,7 +4504,7 @@
                                                 </node>
                                                 <node concept="2OqwBi" id="41i_FWyXP0S" role="3clFbw">
                                                   <node concept="37vLTw" id="41i_FWyXP0T" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="4z0AnX8171M" />
+                                                    <ref role="3cqZAo" node="4z0AnX8171M" resolve="it" />
                                                   </node>
                                                   <node concept="1mIQ4w" id="41i_FWyXP0U" role="2OqNvi">
                                                     <node concept="chp4Y" id="41i_FWyXP0V" role="cj9EA">
@@ -4517,7 +4517,7 @@
                                                     <node concept="3cpWs6" id="41i_FWyXP0Y" role="3cqZAp">
                                                       <node concept="2OqwBi" id="41i_FWyXP0Z" role="3cqZAk">
                                                         <node concept="37vLTw" id="41i_FWyXP10" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="4z0AnX8171M" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171M" resolve="it" />
                                                         </node>
                                                         <node concept="2Xjw5R" id="41i_FWyXP11" role="2OqNvi">
                                                           <node concept="1xMEDy" id="41i_FWyXP12" role="1xVPHs">
@@ -4561,7 +4561,7 @@
                                                           <ref role="ehGHo" to="w9y2:6LfBX8Yi4o1" resolve="Component" />
                                                         </node>
                                                         <node concept="37vLTw" id="41i_FWyXP1k" role="2HTEbv">
-                                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                                         </node>
                                                       </node>
                                                     </node>
@@ -4574,7 +4574,7 @@
                                                     </node>
                                                     <node concept="2WmjW8" id="41i_FWyXP1o" role="2OqNvi">
                                                       <node concept="37vLTw" id="41i_FWyXP1p" role="25WWJ7">
-                                                        <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                                        <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -4586,7 +4586,7 @@
                                                     <node concept="3clFbF" id="41i_FWyXP1t" role="3cqZAp">
                                                       <node concept="2OqwBi" id="41i_FWyXP1u" role="3clFbG">
                                                         <node concept="37vLTw" id="41i_FWyXP1v" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="4z0AnX8171O" />
+                                                          <ref role="3cqZAo" node="4z0AnX8171O" resolve="it" />
                                                         </node>
                                                         <node concept="3TrcHB" id="41i_FWyXP1w" role="2OqNvi">
                                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4656,7 +4656,7 @@
                                       </node>
                                       <node concept="3JPx81" id="41i_FWyXP1L" role="2OqNvi">
                                         <node concept="37vLTw" id="41i_FWyXP1M" role="25WWJ7">
-                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                          <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -4678,7 +4678,7 @@
                                                 <ref role="2pIpSl" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
                                                 <node concept="36biLy" id="mIQkxfT2kr" role="28nt2d">
                                                   <node concept="37vLTw" id="mIQkxfYbOH" role="36biLW">
-                                                    <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                                    <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -4741,7 +4741,7 @@
                                     <node concept="2OqwBi" id="siw10GXMy1" role="3clFbG">
                                       <node concept="2OqwBi" id="siw10GXMbi" role="2Oq$k0">
                                         <node concept="37vLTw" id="mIQkxfYbTh" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8171Q" />
+                                          <ref role="3cqZAo" node="4z0AnX8171Q" resolve="it" />
                                         </node>
                                         <node concept="2Xjw5R" id="siw10GXMn3" role="2OqNvi">
                                           <node concept="1xMEDy" id="siw10GXMn5" role="1xVPHs">
@@ -6766,7 +6766,7 @@
                                     <node concept="3clFbF" id="3VQCwTIkuho" role="3cqZAp">
                                       <node concept="2OqwBi" id="3VQCwTIkuhp" role="3clFbG">
                                         <node concept="37vLTw" id="3VQCwTIkuhq" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8171S" />
+                                          <ref role="3cqZAo" node="4z0AnX8171S" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="3VQCwTIkuhr" role="2OqNvi">
                                           <ref role="37wK5l" to="3eba:7jwD7MQjeSk" resolve="getComponentIconSmall" />
@@ -6784,7 +6784,7 @@
                                     <node concept="3clFbF" id="3VQCwTIkuhw" role="3cqZAp">
                                       <node concept="2OqwBi" id="3VQCwTIkuhx" role="3clFbG">
                                         <node concept="37vLTw" id="3VQCwTIkuhy" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8171S" />
+                                          <ref role="3cqZAo" node="4z0AnX8171S" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="3VQCwTIkuhz" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6835,7 +6835,7 @@
                                                   <ref role="2pIpSl" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
                                                   <node concept="36biLy" id="3VQCwTIkuhS" role="28nt2d">
                                                     <node concept="37vLTw" id="3VQCwTIkuhT" role="36biLW">
-                                                      <ref role="3cqZAo" node="4z0AnX8171S" />
+                                                      <ref role="3cqZAo" node="4z0AnX8171S" resolve="it" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -6918,7 +6918,7 @@
                                       <node concept="2OqwBi" id="3VQCwTIkui9" role="3clFbG">
                                         <node concept="2OqwBi" id="3VQCwTIkuia" role="2Oq$k0">
                                           <node concept="37vLTw" id="3VQCwTIkuib" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8171S" />
+                                            <ref role="3cqZAo" node="4z0AnX8171S" resolve="it" />
                                           </node>
                                           <node concept="2Xjw5R" id="3VQCwTIkuic" role="2OqNvi">
                                             <node concept="1xMEDy" id="3VQCwTIkuid" role="1xVPHs">
@@ -7430,7 +7430,7 @@
                           <node concept="3fqX7Q" id="3VQCwTImx8f" role="3clFbG">
                             <node concept="2OqwBi" id="3VQCwTImx8g" role="3fr31v">
                               <node concept="37vLTw" id="3VQCwTImx8h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8171U" />
+                                <ref role="3cqZAo" node="4z0AnX8171U" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3VQCwTImx8i" role="2OqNvi">
                                 <node concept="chp4Y" id="3VQCwTImx8j" role="cj9EA">
@@ -8085,7 +8085,7 @@
                             <node concept="2OqwBi" id="siw10GZ8cC" role="3uHU7B">
                               <node concept="2OqwBi" id="siw10GZ7Yv" role="2Oq$k0">
                                 <node concept="37vLTw" id="siw10GZ7Ur" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171W" />
+                                  <ref role="3cqZAo" node="4z0AnX8171W" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="siw10GZ84B" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:7Zvsa54vwqx" resolve="sourceInstance" />
@@ -8101,7 +8101,7 @@
                             <node concept="2OqwBi" id="siw10GZ8E7" role="3uHU7B">
                               <node concept="2OqwBi" id="siw10GZ8E8" role="2Oq$k0">
                                 <node concept="37vLTw" id="siw10GZ8E9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8171W" />
+                                  <ref role="3cqZAo" node="4z0AnX8171W" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="siw10GZ8MX" role="2OqNvi">
                                   <ref role="3Tt5mk" to="w9y2:7Zvsa54vLP_" resolve="targetInstance" />
@@ -8129,7 +8129,7 @@
                     <node concept="3clFbF" id="siw10GZ98t" role="3cqZAp">
                       <node concept="2OqwBi" id="siw10GZ9dY" role="3clFbG">
                         <node concept="37vLTw" id="siw10GZ98s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8171Y" />
+                          <ref role="3cqZAo" node="4z0AnX8171Y" resolve="it" />
                         </node>
                         <node concept="3YRAZt" id="siw10GZ9ni" role="2OqNvi" />
                       </node>
@@ -11666,7 +11666,7 @@
                           </node>
                           <node concept="2OqwBi" id="4dpHp7PqDR5" role="1m5AlR">
                             <node concept="37vLTw" id="4dpHp7PqDR6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81720" />
+                              <ref role="3cqZAo" node="4z0AnX81720" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4dpHp7PqDR7" role="2OqNvi">
                               <ref role="37wK5l" to="f4zo:~SubstituteAction.getOutputConcept()" resolve="getOutputConcept" />
@@ -11690,7 +11690,7 @@
                   <node concept="3clFbF" id="4dpHp7PqDRe" role="3cqZAp">
                     <node concept="2OqwBi" id="4dpHp7PqDRf" role="3clFbG">
                       <node concept="37vLTw" id="4dpHp7PqDRg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX81722" />
+                        <ref role="3cqZAo" node="4z0AnX81722" resolve="it" />
                       </node>
                       <node concept="2Zo12i" id="4dpHp7PqDRh" role="2OqNvi">
                         <node concept="25Kdxt" id="4dpHp7PqDRi" role="2Zo12j">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
index fb747f8474..8c88bc25c8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps
@@ -523,7 +523,7 @@
                   <node concept="3clFbF" id="1WCh2thdbSL" role="3cqZAp">
                     <node concept="2OqwBi" id="1WCh2thdbZl" role="3clFbG">
                       <node concept="37vLTw" id="1WCh2thdbSK" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX81724" />
+                        <ref role="3cqZAo" node="4z0AnX81724" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="1WCh2thdceu" role="2OqNvi">
                         <ref role="37wK5l" to="3eba:1WCh2thaL0Y" resolve="autowire" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
index d14699cbf0..cc21b0145f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/migration.mps
@@ -671,7 +671,7 @@
                           <node concept="2OqwBi" id="x8tpSA7Sjf" role="3clFbG">
                             <node concept="2OqwBi" id="x8tpSA7QIt" role="2Oq$k0">
                               <node concept="37vLTw" id="x8tpSA7Qqi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX81726" />
+                                <ref role="3cqZAo" node="4z0AnX81726" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="x8tpSA7R_2" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:siw10Fjg04" resolve="substructure" />
@@ -695,7 +695,7 @@
                         <node concept="2OqwBi" id="x8tpSA7WYM" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSA7Ubi" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSA7TTS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81728" />
+                              <ref role="3cqZAo" node="4z0AnX81728" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSA7V8H" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -707,7 +707,7 @@
                             </node>
                             <node concept="2OqwBi" id="x8tpSA81fC" role="1sKFgg">
                               <node concept="37vLTw" id="x8tpSA80Nr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX81728" />
+                                <ref role="3cqZAo" node="4z0AnX81728" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="x8tpSA82g3" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:siw10Fjg04" resolve="substructure" />
@@ -747,7 +747,7 @@
                             <node concept="2OqwBi" id="x8tpSADkg1" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSADkg2" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSADQf5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8172a" />
+                                  <ref role="3cqZAo" node="4z0AnX8172a" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAF92p" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -763,7 +763,7 @@
                               <node concept="2OqwBi" id="x8tpSADkg8" role="576Qk">
                                 <node concept="2OqwBi" id="x8tpSADkg9" role="2Oq$k0">
                                   <node concept="37vLTw" id="x8tpSAIwIU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8172a" />
+                                    <ref role="3cqZAo" node="4z0AnX8172a" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="x8tpSALFUY" role="2OqNvi">
                                     <ref role="3TtcxE" to="w9y2:6LfBX8Yi4ps" resolve="contents" />
@@ -784,7 +784,7 @@
                         <node concept="2OqwBi" id="x8tpSAFdwr" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAFaUg" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAFaeT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172a" />
+                              <ref role="3cqZAo" node="4z0AnX8172a" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="x8tpSAFbR3" role="2OqNvi">
                               <ref role="37wK5l" to="3eba:x8tpSAdLM$" resolve="interfaceContent" />
@@ -919,7 +919,7 @@
                             <node concept="2OqwBi" id="x8tpSAXCLi" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSAXCLj" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSAXCLk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8172g" />
+                                  <ref role="3cqZAo" node="4z0AnX8172g" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAY5DW" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:x8tpS_RkBA" resolve="content" />
@@ -938,7 +938,7 @@
                                     <node concept="2OqwBi" id="x8tpSAYe5Z" role="3clFbG">
                                       <node concept="2OqwBi" id="x8tpSAYaBF" role="2Oq$k0">
                                         <node concept="37vLTw" id="x8tpSAY8UF" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8172c" />
+                                          <ref role="3cqZAo" node="4z0AnX8172c" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="x8tpSAYby5" role="2OqNvi">
                                           <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -963,7 +963,7 @@
                         <node concept="2OqwBi" id="x8tpSAYkj4" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAYhHh" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAYgVI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172g" />
+                              <ref role="3cqZAo" node="4z0AnX8172g" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSAYiNg" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:x8tpSAXuOU" resolve="governingPorts" />
@@ -988,7 +988,7 @@
                             <node concept="2OqwBi" id="x8tpSAY$Il" role="2Oq$k0">
                               <node concept="2OqwBi" id="x8tpSAY$Im" role="2Oq$k0">
                                 <node concept="37vLTw" id="x8tpSAY$In" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8172g" />
+                                  <ref role="3cqZAo" node="4z0AnX8172g" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="x8tpSAY$Io" role="2OqNvi">
                                   <ref role="3TtcxE" to="w9y2:x8tpS_RkBA" resolve="content" />
@@ -1008,7 +1008,7 @@
                                       <node concept="2OqwBi" id="x8tpSAYPr6" role="3fr31v">
                                         <node concept="2OqwBi" id="x8tpSAYPr7" role="2Oq$k0">
                                           <node concept="37vLTw" id="x8tpSAYPr8" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8172e" />
+                                            <ref role="3cqZAo" node="4z0AnX8172e" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="x8tpSAYPr9" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1034,7 +1034,7 @@
                         <node concept="2OqwBi" id="x8tpSAY$Ia" role="3clFbG">
                           <node concept="2OqwBi" id="x8tpSAY$Ib" role="2Oq$k0">
                             <node concept="37vLTw" id="x8tpSAY$Ic" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172g" />
+                              <ref role="3cqZAo" node="4z0AnX8172g" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="x8tpSAYUgh" role="2OqNvi">
                               <ref role="3TtcxE" to="w9y2:x8tpSAXvhR" resolve="subordinatePorts" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
index 541da8d7be..45030b3ac2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
@@ -725,7 +725,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="cJpacq2x6m" role="3uHU7B">
                                           <node concept="37vLTw" id="cJpacq2x6n" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8172i" />
+                                            <ref role="3cqZAo" node="4z0AnX8172i" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3NBP8_OfLCu" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:cJpacq1tk2" resolve="sourcePort" />
@@ -736,7 +736,7 @@
                                         <node concept="2OqwBi" id="cJpacq2x6q" role="3uHU7B">
                                           <node concept="2OqwBi" id="cJpacq2x6r" role="2Oq$k0">
                                             <node concept="37vLTw" id="cJpacq2x6s" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8172i" />
+                                              <ref role="3cqZAo" node="4z0AnX8172i" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="3NBP8_OfRKX" role="2OqNvi">
                                               <ref role="3Tt5mk" to="w9y2:7Zvsa54vwqx" resolve="sourceInstance" />
@@ -779,7 +779,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="cJpacq2xz_" role="3uHU7B">
                                           <node concept="37vLTw" id="cJpacq2xzA" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8172k" />
+                                            <ref role="3cqZAo" node="4z0AnX8172k" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="3NBP8_OfUsv" role="2OqNvi">
                                             <ref role="3Tt5mk" to="w9y2:cJpacq1V$o" resolve="targetPort" />
@@ -790,7 +790,7 @@
                                         <node concept="2OqwBi" id="cJpacq2xzD" role="3uHU7B">
                                           <node concept="2OqwBi" id="cJpacq2xzE" role="2Oq$k0">
                                             <node concept="37vLTw" id="cJpacq2xzF" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8172k" />
+                                              <ref role="3cqZAo" node="4z0AnX8172k" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="3NBP8_OfP0v" role="2OqNvi">
                                               <ref role="3Tt5mk" to="w9y2:cJpacq1V$l" resolve="targetInstance" />
@@ -830,7 +830,7 @@
                           <node concept="3fqX7Q" id="cJpacq0XpF" role="3clFbG">
                             <node concept="2OqwBi" id="cJpacq0XE5" role="3fr31v">
                               <node concept="37vLTw" id="cJpacq0XpG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8172m" />
+                                <ref role="3cqZAo" node="4z0AnX8172m" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="mIQkxf$u7r" role="2OqNvi">
                                 <ref role="37wK5l" to="3eba:mIQkxf$r$2" resolve="isOptional" />
@@ -1714,7 +1714,7 @@
                           </node>
                           <node concept="2OqwBi" id="3NBP8_O40HZ" role="3uHU7B">
                             <node concept="37vLTw" id="3NBP8_O40I0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172o" />
+                              <ref role="3cqZAo" node="4z0AnX8172o" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3NBP8_O40I1" role="2OqNvi">
                               <ref role="3Tt5mk" to="w9y2:4UgzZxsF_xI" resolve="param" />
@@ -1777,7 +1777,7 @@
                             </node>
                             <node concept="2OqwBi" id="3NBP8_O42_I" role="3uHU7B">
                               <node concept="37vLTw" id="3NBP8_O42_J" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8172q" />
+                                <ref role="3cqZAo" node="4z0AnX8172q" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3NBP8_O42_K" role="2OqNvi">
                                 <ref role="3Tt5mk" to="w9y2:4UgzZxsF_xI" resolve="param" />
@@ -1830,7 +1830,7 @@
                   <node concept="3fqX7Q" id="3NBP8_O3PpG" role="3clFbG">
                     <node concept="2OqwBi" id="3NBP8_O3PpI" role="3fr31v">
                       <node concept="37vLTw" id="3NBP8_O3PpJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8172s" />
+                        <ref role="3cqZAo" node="4z0AnX8172s" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3NBP8_O3PpK" role="2OqNvi">
                         <ref role="37wK5l" to="3eba:3NBP8_O3NQF" resolve="isOptional" />
@@ -1977,7 +1977,7 @@
                   <node concept="2OqwBi" id="x8tpSAZ4qk" role="3clFbw">
                     <node concept="2OqwBi" id="x8tpSAZ3yU" role="2Oq$k0">
                       <node concept="37vLTw" id="_igokwK7M4" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8172u" />
+                        <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                       </node>
                       <node concept="3TrEf2" id="x8tpSAZ40x" role="2OqNvi">
                         <ref role="3Tt5mk" to="w9y2:mIQkxfpv7_" resolve="category" />
@@ -1992,7 +1992,7 @@
                       <node concept="3clFbC" id="_igokwKkNE" role="2MkoU_">
                         <node concept="2OqwBi" id="_igokwKjZd" role="3uHU7B">
                           <node concept="37vLTw" id="_igokwKj_P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8172u" />
+                            <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                           </node>
                           <node concept="2NL2c5" id="4llm6dFyM69" role="2OqNvi" />
                         </node>
@@ -2005,7 +2005,7 @@
                         <property role="Xl_RC" value="Port Category is 'governing'" />
                       </node>
                       <node concept="37vLTw" id="_igokwKlmV" role="1urrMF">
-                        <ref role="3cqZAo" node="4z0AnX8172u" />
+                        <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                       </node>
                       <node concept="3Cnw8n" id="3km$jnhdo8n" role="1urrFz">
                         <property role="ARO6o" value="true" />
@@ -2013,7 +2013,7 @@
                         <node concept="3CnSsL" id="3km$jnhdUj$" role="3Coj4f">
                           <ref role="QkamJ" node="6dLmQVBsrXD" resolve="p" />
                           <node concept="37vLTw" id="3km$jnhdUuB" role="3CoRuB">
-                            <ref role="3cqZAo" node="4z0AnX8172u" />
+                            <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                           </node>
                         </node>
                       </node>
@@ -2025,7 +2025,7 @@
                         <node concept="3clFbC" id="_igokwKvp$" role="2MkoU_">
                           <node concept="2OqwBi" id="_igokwKsKJ" role="3uHU7B">
                             <node concept="37vLTw" id="_igokwKsvG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172u" />
+                              <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                             </node>
                             <node concept="2NL2c5" id="4llm6dFyMgv" role="2OqNvi" />
                           </node>
@@ -2038,7 +2038,7 @@
                           <property role="Xl_RC" value="Port Category is 'subordinate'" />
                         </node>
                         <node concept="37vLTw" id="_igokwKtLF" role="1urrMF">
-                          <ref role="3cqZAo" node="4z0AnX8172u" />
+                          <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                         </node>
                         <node concept="3Cnw8n" id="3km$jnhdojg" role="1urrFz">
                           <property role="ARO6o" value="true" />
@@ -2046,7 +2046,7 @@
                           <node concept="3CnSsL" id="3km$jnhdUDA" role="3Coj4f">
                             <ref role="QkamJ" node="6dLmQVBsrXD" resolve="p" />
                             <node concept="37vLTw" id="3km$jnhdUOJ" role="3CoRuB">
-                              <ref role="3cqZAo" node="4z0AnX8172u" />
+                              <ref role="3cqZAo" node="4z0AnX8172u" resolve="port" />
                             </node>
                           </node>
                         </node>
@@ -2112,7 +2112,7 @@
                         </node>
                         <node concept="2OqwBi" id="6$fTUGAIu$3" role="33vP2m">
                           <node concept="37vLTw" id="6$fTUGAIu$4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8172w" />
+                            <ref role="3cqZAo" node="4z0AnX8172w" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6$fTUGAIu$5" role="2OqNvi">
                             <ref role="3Tt5mk" to="w9y2:6LfBX8YiQvJ" resolve="ref" />
@@ -2193,7 +2193,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="6$fTUGAIOCh" role="1urrMF">
-                            <ref role="3cqZAo" node="4z0AnX8172w" />
+                            <ref role="3cqZAo" node="4z0AnX8172w" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -2313,7 +2313,7 @@
                           <node concept="2qgKlT" id="PFqDnRTYtI" role="2OqNvi">
                             <ref role="37wK5l" to="3eba:7Atos1y63VI" resolve="getConnectionMulitplicityError" />
                             <node concept="37vLTw" id="4VHfdEqk8tI" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX8172y" />
+                              <ref role="3cqZAo" node="4z0AnX8172y" resolve="ci" />
                             </node>
                             <node concept="37vLTw" id="PFqDnRUaXo" role="37wK5m">
                               <ref role="3cqZAo" node="PFqDnRU9qz" resolve="allConnectors" />
@@ -2349,7 +2349,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="PFqDnRUkwg" role="1urrMF">
-                            <ref role="3cqZAo" node="4z0AnX8172y" />
+                            <ref role="3cqZAo" node="4z0AnX8172y" resolve="ci" />
                           </node>
                         </node>
                       </node>
@@ -2365,7 +2365,7 @@
                     <node concept="2OqwBi" id="PFqDnRTYu1" role="2Oq$k0">
                       <node concept="2OqwBi" id="PFqDnRTYu3" role="2Oq$k0">
                         <node concept="37vLTw" id="PFqDnRUkwe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8172y" />
+                          <ref role="3cqZAo" node="4z0AnX8172y" resolve="ci" />
                         </node>
                         <node concept="2qgKlT" id="3PhTX5bIm8i" role="2OqNvi">
                           <ref role="37wK5l" to="3eba:77HYM7H$sfU" resolve="component" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
index 86a14c72c8..487f12a971 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.plugin/models/org/iets3/components/plugin/plugin.mps
@@ -193,7 +193,7 @@
                   <node concept="3clFbF" id="5Jew25TJ3VJ" role="3cqZAp">
                     <node concept="2OqwBi" id="5Jew25TJ42F" role="3clFbG">
                       <node concept="37vLTw" id="5Jew25TJ3VI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817mc" />
+                        <ref role="3cqZAo" node="4z0AnX817mc" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5Jew25TJ4ho" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -260,7 +260,7 @@
                   <node concept="3fqX7Q" id="1MpR5BkUpof" role="3clFbG">
                     <node concept="2OqwBi" id="1MpR5BkUpsg" role="3fr31v">
                       <node concept="37vLTw" id="1MpR5BkUpom" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817me" />
+                        <ref role="3cqZAo" node="4z0AnX817me" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="1MpR5BkUpC3" role="2OqNvi">
                         <node concept="chp4Y" id="1MpR5BkUpGA" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
index 485a9adb14..08309fbf4b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/behavior.mps
@@ -210,7 +210,7 @@
                           <node concept="2OqwBi" id="1HLccB8EnHF" role="2Oq$k0">
                             <node concept="2JrnkZ" id="1HLccB8Ent9" role="2Oq$k0">
                               <node concept="37vLTw" id="1HLccB8EmE8" role="2JrQYb">
-                                <ref role="3cqZAo" node="4z0AnX8172_" />
+                                <ref role="3cqZAo" node="4z0AnX8172_" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="1HLccB8EnZd" role="2OqNvi">
@@ -430,7 +430,7 @@
                             <node concept="36biLy" id="1HLccB8vwoI" role="28nt2d">
                               <node concept="2OqwBi" id="1HLccB8vwoJ" role="36biLW">
                                 <node concept="37vLTw" id="1HLccB8vwoK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8172D" />
+                                  <ref role="3cqZAo" node="4z0AnX8172D" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1HLccB8vwoL" role="2OqNvi">
                                   <ref role="37wK5l" to="fp62:7qN5a9Pfhlm" resolve="getTraceSource" />
@@ -452,7 +452,7 @@
                     <node concept="2OqwBi" id="1HLccB8vwoP" role="3clFbG">
                       <node concept="2OqwBi" id="1HLccB8vwoQ" role="2Oq$k0">
                         <node concept="37vLTw" id="1HLccB8vwoR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8172D" />
+                          <ref role="3cqZAo" node="4z0AnX8172D" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="1HLccB8vwoS" role="2OqNvi">
                           <ref role="3TtcxE" to="ci3w:1PzuxQOT_1a" resolve="traceTarget" />
@@ -480,7 +480,7 @@
                                         <node concept="36biLy" id="1HLccB8vwp5" role="28nt2d">
                                           <node concept="2OqwBi" id="1HLccB8vwp6" role="36biLW">
                                             <node concept="37vLTw" id="1HLccB8vwp7" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8172B" />
+                                              <ref role="3cqZAo" node="4z0AnX8172B" resolve="target" />
                                             </node>
                                             <node concept="3TrEf2" id="1HLccB8vwp8" role="2OqNvi">
                                               <ref role="3Tt5mk" to="ci3w:1PzuxQOTLHd" resolve="traceTarget" />
@@ -636,7 +636,7 @@
                               <ref role="2pIpSl" to="330h:378sigX3YpV" resolve="element" />
                               <node concept="36biLy" id="6_Ift$_DuFb" role="28nt2d">
                                 <node concept="37vLTw" id="6_Ift$_DuQl" role="36biLW">
-                                  <ref role="3cqZAo" node="4z0AnX8172F" />
+                                  <ref role="3cqZAo" node="4z0AnX8172F" resolve="it" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
index 9628cb6e16..99dc64d0ce 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/behavior.mps
@@ -460,7 +460,7 @@
                   <node concept="3clFbF" id="1HqphBIBEzC" role="3cqZAp">
                     <node concept="2OqwBi" id="1HqphBIBEB_" role="3clFbG">
                       <node concept="37vLTw" id="1HqphBIBEzB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8172H" />
+                        <ref role="3cqZAo" node="4z0AnX8172H" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="1HqphBIQF4H" role="2OqNvi">
                         <ref role="37wK5l" node="1HqphBICm56" resolve="getEffectiveValue" />
@@ -518,12 +518,12 @@
                     <node concept="3clFbF" id="1HqphBIBG8q" role="3cqZAp">
                       <node concept="2OqwBi" id="1HqphBIBGcM" role="3clFbG">
                         <node concept="37vLTw" id="1HqphBIBG8p" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8172J" />
+                          <ref role="3cqZAo" node="4z0AnX8172J" resolve="a" />
                         </node>
                         <node concept="2qgKlT" id="1HqphBIBGhC" role="2OqNvi">
                           <ref role="37wK5l" node="1HqphBI_m8C" resolve="compareTo" />
                           <node concept="37vLTw" id="1HqphBIBGll" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8172L" />
+                            <ref role="3cqZAo" node="4z0AnX8172L" resolve="b" />
                           </node>
                         </node>
                       </node>
@@ -569,12 +569,12 @@
                     <node concept="3clFbF" id="1HqphBIBGM3" role="3cqZAp">
                       <node concept="2OqwBi" id="1HqphBIBGM4" role="3clFbG">
                         <node concept="37vLTw" id="1HqphBIBGM5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8172N" />
+                          <ref role="3cqZAo" node="4z0AnX8172N" resolve="a" />
                         </node>
                         <node concept="2qgKlT" id="1HqphBIBGM6" role="2OqNvi">
                           <ref role="37wK5l" node="1HqphBI_m8C" resolve="compareTo" />
                           <node concept="37vLTw" id="1HqphBIBGM7" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8172P" />
+                            <ref role="3cqZAo" node="4z0AnX8172P" resolve="b" />
                           </node>
                         </node>
                       </node>
@@ -800,7 +800,7 @@
                         <node concept="3fqX7Q" id="5ZBgTg_IznW" role="3uHU7B">
                           <node concept="2OqwBi" id="5ZBgTg_IznY" role="3fr31v">
                             <node concept="37vLTw" id="5ZBgTg_IznZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172R" />
+                              <ref role="3cqZAo" node="4z0AnX8172R" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5ZBgTg_Izo0" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -809,7 +809,7 @@
                         </node>
                         <node concept="2OqwBi" id="5ZBgTg_I_T4" role="3uHU7w">
                           <node concept="37vLTw" id="5ZBgTg_I_FS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8172R" />
+                            <ref role="3cqZAo" node="4z0AnX8172R" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4um6WxnZVtc" role="2OqNvi">
                             <ref role="37wK5l" node="5ZBgTg_IANQ" resolve="isMainAttribute" />
@@ -837,7 +837,7 @@
                               <node concept="liA8E" id="4z0AnX6tQVS" role="2OqNvi">
                                 <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
                                 <node concept="37vLTw" id="4z0AnX6tRKW" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX8172R" />
+                                  <ref role="3cqZAo" node="4z0AnX8172R" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -885,7 +885,7 @@
                     <node concept="2OqwBi" id="3fP_noAMNYc" role="3clFbG">
                       <node concept="2OqwBi" id="3fP_noAMRbE" role="2Oq$k0">
                         <node concept="37vLTw" id="3fP_noAMNYd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8172T" />
+                          <ref role="3cqZAo" node="4z0AnX8172T" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="3fP_noAMR__" role="2OqNvi" />
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
index 7d55f8fd0a..3812514da5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
@@ -380,7 +380,7 @@
                           <node concept="10Nm6u" id="4A8SzOVb0KZ" role="3uHU7w" />
                           <node concept="2OqwBi" id="4A8SzOVb0we" role="3uHU7B">
                             <node concept="37vLTw" id="4A8SzOVb0rx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8172V" />
+                              <ref role="3cqZAo" node="4z0AnX8172V" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4A8SzOVb0BJ" role="2OqNvi">
                               <ref role="37wK5l" to="soq7:4A8SzOVam5y" resolve="summaryString" />
@@ -483,7 +483,7 @@
                         <node concept="10Nm6u" id="4A8SzOVb2oc" role="3uHU7w" />
                         <node concept="2OqwBi" id="4A8SzOVb2ds" role="3uHU7B">
                           <node concept="37vLTw" id="4A8SzOVb29O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8172X" />
+                            <ref role="3cqZAo" node="4z0AnX8172X" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4A8SzOVb2je" role="2OqNvi">
                             <ref role="37wK5l" to="soq7:4A8SzOVam5y" resolve="summaryString" />
@@ -868,7 +868,7 @@
                                 <node concept="2OqwBi" id="4p5cXWqPMNc" role="3clFbG">
                                   <node concept="2OqwBi" id="4p5cXWqPLw5" role="2Oq$k0">
                                     <node concept="37vLTw" id="4p5cXWqPLcd" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8172Z" />
+                                      <ref role="3cqZAo" node="4z0AnX8172Z" resolve="it" />
                                     </node>
                                     <node concept="2yIwOk" id="4p5cXWqPMdd" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
index b93028e31a..705fada751 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/plugin.mps
@@ -321,7 +321,7 @@
                       <node concept="2OqwBi" id="6TDynbfeEVw" role="3clFbG">
                         <node concept="2OqwBi" id="6TDynbfeEVx" role="2Oq$k0">
                           <node concept="37vLTw" id="6TDynbfeEVy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81733" />
+                            <ref role="3cqZAo" node="4z0AnX81733" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6TDynbfeEVz" role="2OqNvi">
                             <ref role="37wK5l" node="5aWcZMN3ifR" resolve="getSupportedAttributedTypes" />
@@ -338,7 +338,7 @@
                                   <node concept="1mIQ4w" id="6TDynbfeEVE" role="2OqNvi">
                                     <node concept="25Kdxt" id="6TDynbfeEVF" role="cj9EA">
                                       <node concept="37vLTw" id="6TDynbfeEVG" role="25KhWn">
-                                        <ref role="3cqZAo" node="4z0AnX81731" />
+                                        <ref role="3cqZAo" node="4z0AnX81731" resolve="attributedConcept" />
                                       </node>
                                     </node>
                                   </node>
@@ -368,7 +368,7 @@
                   <node concept="3clFbF" id="6TDynbfeHvn" role="3cqZAp">
                     <node concept="2OqwBi" id="6TDynbfeHSh" role="3clFbG">
                       <node concept="37vLTw" id="6TDynbfeHCS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX81735" />
+                        <ref role="3cqZAo" node="4z0AnX81735" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6TDynbfeIRd" role="2OqNvi">
                         <ref role="37wK5l" node="6TDynbfe$rC" resolve="requiresMandatoryAttributes" />
@@ -452,7 +452,7 @@
                       <node concept="2OqwBi" id="5IqIsYeDEjY" role="3clFbG">
                         <node concept="2OqwBi" id="5aWcZMN4aqH" role="2Oq$k0">
                           <node concept="37vLTw" id="5aWcZMN4ah9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81739" />
+                            <ref role="3cqZAo" node="4z0AnX81739" resolve="it" />
                           </node>
                           <node concept="liA8E" id="5aWcZMN4aKQ" role="2OqNvi">
                             <ref role="37wK5l" node="5aWcZMN3ifR" resolve="getSupportedAttributedTypes" />
@@ -469,7 +469,7 @@
                                   <node concept="1mIQ4w" id="5IqIsYeDIWU" role="2OqNvi">
                                     <node concept="25Kdxt" id="5IqIsYeDJqN" role="cj9EA">
                                       <node concept="37vLTw" id="5IqIsYeDKcP" role="25KhWn">
-                                        <ref role="3cqZAo" node="4z0AnX81737" />
+                                        <ref role="3cqZAo" node="4z0AnX81737" resolve="attributedConcept" />
                                       </node>
                                     </node>
                                   </node>
@@ -503,7 +503,7 @@
                       </node>
                       <node concept="2OqwBi" id="5aWcZMN4_mt" role="33vP2m">
                         <node concept="37vLTw" id="5aWcZMN4_mu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8173b" />
+                          <ref role="3cqZAo" node="4z0AnX8173b" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5aWcZMN4_mv" role="2OqNvi">
                           <ref role="37wK5l" node="5aWcZMN3iQj" resolve="createMandatoryAttributesFor" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
index 34dd0249bc..b8ed5e8a1a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/behavior.mps
@@ -2684,7 +2684,7 @@
                   <node concept="3clFbF" id="3JvidvJxehH" role="3cqZAp">
                     <node concept="2OqwBi" id="3JvidvJxemu" role="3clFbG">
                       <node concept="37vLTw" id="3JvidvJxehG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173d" />
+                        <ref role="3cqZAo" node="4z0AnX8173d" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3JvidvJxew9" role="2OqNvi">
                         <ref role="37wK5l" node="3JvidvJx7iM" resolve="performAdditionalEditorUpdate" />
@@ -2745,7 +2745,7 @@
                         <node concept="3clFbF" id="3JvidvJwMGj" role="3cqZAp">
                           <node concept="2OqwBi" id="3JvidvJwN1D" role="3clFbG">
                             <node concept="37vLTw" id="3JvidvJwMGi" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8173f" />
+                              <ref role="3cqZAo" node="4z0AnX8173f" resolve="it" />
                             </node>
                             <node concept="2Rxl7S" id="3JvidvJwNwU" role="2OqNvi" />
                           </node>
@@ -2783,7 +2783,7 @@
                           <node concept="2OqwBi" id="4bmM0avMFeJ" role="25WWJ7">
                             <node concept="2OqwBi" id="4bmM0avMFeK" role="2Oq$k0">
                               <node concept="37vLTw" id="4bmM0avMFeL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8173h" />
+                                <ref role="3cqZAo" node="4z0AnX8173h" resolve="it" />
                               </node>
                               <node concept="liA8E" id="4bmM0avMFeM" role="2OqNvi">
                                 <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -2810,7 +2810,7 @@
                   <node concept="3clFbF" id="4bmM0avMFeT" role="3cqZAp">
                     <node concept="2OqwBi" id="4bmM0avMFeU" role="3clFbG">
                       <node concept="37vLTw" id="4bmM0avMFeV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173j" />
+                        <ref role="3cqZAo" node="4z0AnX8173j" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4bmM0avMFeW" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
index 49289995d9..0179ebfd9e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps
@@ -775,7 +775,7 @@
                           <node concept="3fqX7Q" id="7MFzeeGr9NL" role="3clFbG">
                             <node concept="2OqwBi" id="7MFzeeGr9NM" role="3fr31v">
                               <node concept="37vLTw" id="7MFzeeGr9NN" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8173l" />
+                                <ref role="3cqZAo" node="4z0AnX8173l" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7MFzeeGr9NO" role="2OqNvi">
                                 <node concept="chp4Y" id="7MFzeeGr9NP" role="cj9EA">
@@ -1016,7 +1016,7 @@
                           <node concept="3fqX7Q" id="7MFzeeGrfQ_" role="3clFbG">
                             <node concept="2OqwBi" id="7MFzeeGrfQA" role="3fr31v">
                               <node concept="37vLTw" id="7MFzeeGrfQB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8173n" />
+                                <ref role="3cqZAo" node="4z0AnX8173n" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7MFzeeGrfQC" role="2OqNvi">
                                 <node concept="chp4Y" id="7MFzeeGrfQD" role="cj9EA">
@@ -1294,7 +1294,7 @@
                       <node concept="3fqX7Q" id="1RXwPEXP854" role="3clFbG">
                         <node concept="2OqwBi" id="1RXwPEXP855" role="3fr31v">
                           <node concept="37vLTw" id="1RXwPEXP856" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8173p" />
+                            <ref role="3cqZAo" node="4z0AnX8173p" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="1RXwPEXP857" role="2OqNvi">
                             <node concept="chp4Y" id="1RXwPEXP858" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
index 7387a867b3..4f8bac84af 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/intentions.mps
@@ -268,7 +268,7 @@
                         <node concept="2OqwBi" id="6js_s$imKOJ" role="3uHU7B">
                           <node concept="2OqwBi" id="6js_s$imKOK" role="2Oq$k0">
                             <node concept="37vLTw" id="6js_s$imKOL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8173r" />
+                              <ref role="3cqZAo" node="4z0AnX8173r" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6js_s$imKOM" role="2OqNvi">
                               <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -294,7 +294,7 @@
                   <node concept="3clFbF" id="6js_s$imKOT" role="3cqZAp">
                     <node concept="2OqwBi" id="6js_s$imKOU" role="3clFbG">
                       <node concept="37vLTw" id="6js_s$imKOV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173t" />
+                        <ref role="3cqZAo" node="4z0AnX8173t" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6js_s$imKOW" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -333,7 +333,7 @@
                   <node concept="3clFbF" id="6js_s$imTAS" role="3cqZAp">
                     <node concept="2OqwBi" id="6js_s$imTR0" role="3clFbG">
                       <node concept="37vLTw" id="6js_s$imTAR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173v" />
+                        <ref role="3cqZAo" node="4z0AnX8173v" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="1Kc3mnJ0OvJ" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumwpO" resolve="hasExistingResult" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
index 1c164f6d36..678c44cead 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps
@@ -365,7 +365,7 @@
                                             <node concept="3clFbF" id="3SU4Z7Bfw3c" role="3cqZAp">
                                               <node concept="2OqwBi" id="3SU4Z7Bfw3d" role="3clFbG">
                                                 <node concept="37vLTw" id="3SU4Z7Bfw3e" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8173x" />
+                                                  <ref role="3cqZAo" node="4z0AnX8173x" resolve="targetNode" />
                                                 </node>
                                                 <node concept="3x8VRR" id="3SU4Z7Bfw3f" role="2OqNvi" />
                                               </node>
@@ -581,7 +581,7 @@
                                         <node concept="3fqX7Q" id="4MH81Y0Un4X" role="3clFbG">
                                           <node concept="2OqwBi" id="4MH81Y0Un4Z" role="3fr31v">
                                             <node concept="37vLTw" id="4MH81Y0Un50" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8173z" />
+                                              <ref role="3cqZAo" node="4z0AnX8173z" resolve="it" />
                                             </node>
                                             <node concept="liA8E" id="4MH81Y0Un51" role="2OqNvi">
                                               <ref role="37wK5l" to="gdgh:5zG5$Lyex2e" resolve="isOk" />
@@ -607,7 +607,7 @@
                                         </node>
                                         <node concept="1Bd96e" id="4MH81Y0UnYr" role="2OqNvi">
                                           <node concept="37vLTw" id="4MH81Y0Uo2K" role="1BdPVh">
-                                            <ref role="3cqZAo" node="4z0AnX8173_" />
+                                            <ref role="3cqZAo" node="4z0AnX8173_" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
index 6bbe26919b..ac76acdb3b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/behavior.mps
@@ -340,7 +340,7 @@
                     <node concept="3fqX7Q" id="5a_u3OzPrMZ" role="3clFbG">
                       <node concept="2OqwBi" id="5a_u3OzPrN1" role="3fr31v">
                         <node concept="37vLTw" id="5a_u3OzPrN2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8173B" />
+                          <ref role="3cqZAo" node="4z0AnX8173B" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="5a_u3OzPrN3" role="2OqNvi">
                           <ref role="3TsBF5" to="v0r8:5a_u3OzNkkU" resolve="abstract" />
@@ -386,7 +386,7 @@
                   <node concept="3clFbF" id="5a_u3OzPrSU" role="3cqZAp">
                     <node concept="2OqwBi" id="5a_u3OzPrSW" role="3clFbG">
                       <node concept="37vLTw" id="5a_u3OzPrSX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173D" />
+                        <ref role="3cqZAo" node="4z0AnX8173D" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="5a_u3OzPrSY" role="2OqNvi">
                         <ref role="3TsBF5" to="v0r8:5a_u3OzNkkU" resolve="abstract" />
@@ -504,7 +504,7 @@
                         <node concept="3clFbF" id="28$LOSBEeOo" role="3cqZAp">
                           <node concept="2OqwBi" id="28$LOSBEeZN" role="3clFbG">
                             <node concept="37vLTw" id="28$LOSBEeOn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8173F" />
+                              <ref role="3cqZAo" node="4z0AnX8173F" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="28$LOSBEfgZ" role="2OqNvi">
                               <ref role="3Tt5mk" to="v0r8:28$LOSBCugO" resolve="type" />
@@ -540,7 +540,7 @@
                           <node concept="3clFbF" id="28$LOSBEn6h" role="3cqZAp">
                             <node concept="2OqwBi" id="28$LOSBEnll" role="3clFbG">
                               <node concept="37vLTw" id="28$LOSBEn6g" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8173H" />
+                                <ref role="3cqZAo" node="4z0AnX8173H" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="28$LOSBEoA$" role="2OqNvi">
                                 <ref role="3Tt5mk" to="v0r8:28$LOSBCugO" resolve="type" />
@@ -1132,7 +1132,7 @@
                           </node>
                           <node concept="2OqwBi" id="7aipPVpERzR" role="3uHU7B">
                             <node concept="37vLTw" id="7aipPVpERzS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8173J" />
+                              <ref role="3cqZAo" node="4z0AnX8173J" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="7aipPVpERzT" role="2OqNvi" />
                           </node>
@@ -1152,7 +1152,7 @@
                     <node concept="3clFbF" id="7aipPVpERzZ" role="3cqZAp">
                       <node concept="3cpWs3" id="7aipPVpER$0" role="3clFbG">
                         <node concept="37vLTw" id="7aipPVpER$1" role="3uHU7w">
-                          <ref role="3cqZAo" node="4z0AnX8173L" />
+                          <ref role="3cqZAo" node="4z0AnX8173L" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="7aipPVpER$2" role="3uHU7B">
                           <ref role="3cqZAo" node="7aipPVpER$3" resolve="s" />
@@ -1250,7 +1250,7 @@
                     <node concept="3clFbF" id="28$LOSAhdin" role="3cqZAp">
                       <node concept="2OqwBi" id="28$LOSAhdwP" role="3clFbG">
                         <node concept="37vLTw" id="28$LOSAhdim" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8173N" />
+                          <ref role="3cqZAo" node="4z0AnX8173N" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="28$LOSAhdRi" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -1312,7 +1312,7 @@
                             <ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
                           </node>
                           <node concept="37vLTw" id="28$LOSBsyFL" role="1m5AlR">
-                            <ref role="3cqZAo" node="4z0AnX8173P" />
+                            <ref role="3cqZAo" node="4z0AnX8173P" resolve="it" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="28$LOSBs$5T" role="2OqNvi">
@@ -1321,7 +1321,7 @@
                       </node>
                       <node concept="2OqwBi" id="28$LOSBsxoX" role="3uHU7B">
                         <node concept="37vLTw" id="28$LOSBsxbX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8173P" />
+                          <ref role="3cqZAo" node="4z0AnX8173P" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="28$LOSBsxRo" role="2OqNvi">
                           <node concept="chp4Y" id="28$LOSBsy1N" role="cj9EA">
@@ -1366,7 +1366,7 @@
                   <node concept="3clFbF" id="28$LOSBsp6v" role="3cqZAp">
                     <node concept="2OqwBi" id="28$LOSBsp6w" role="3clFbG">
                       <node concept="37vLTw" id="28$LOSBsp6x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8173R" />
+                        <ref role="3cqZAo" node="4z0AnX8173R" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="28$LOSBsp6y" role="2OqNvi">
                         <node concept="chp4Y" id="28$LOSBsp6z" role="cj9EA">
@@ -2123,7 +2123,7 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="5a_u3OzQHs2" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX8173T" />
+                        <ref role="3cqZAo" node="4z0AnX8173T" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -2389,7 +2389,7 @@
                         <ref role="3cqZAo" node="28$LOSBr$l_" resolve="constructor" />
                       </node>
                       <node concept="37vLTw" id="28$LOSBrFWj" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX8173V" />
+                        <ref role="3cqZAo" node="4z0AnX8173V" resolve="it" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
index 9f89b7927f..0ebed92619 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/constraints.mps
@@ -285,7 +285,7 @@
                             <node concept="3clFbF" id="5a_u3OzPYSX" role="3cqZAp">
                               <node concept="2OqwBi" id="5a_u3OzPYSY" role="3clFbG">
                                 <node concept="37vLTw" id="5a_u3OzPYSZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8173X" />
+                                  <ref role="3cqZAo" node="4z0AnX8173X" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="5a_u3OzQ0wf" role="2OqNvi">
                                   <ref role="37wK5l" to="dnkk:5a_u3OzPizZ" resolve="allConstructors" />
@@ -350,7 +350,7 @@
                               <node concept="3clFbF" id="5a_u3OzPVja" role="3cqZAp">
                                 <node concept="2OqwBi" id="5a_u3OzPVjb" role="3clFbG">
                                   <node concept="37vLTw" id="5a_u3OzPVjc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8173Z" />
+                                    <ref role="3cqZAo" node="4z0AnX8173Z" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="5a_u3OzPVjd" role="2OqNvi">
                                     <ref role="37wK5l" to="dnkk:5a_u3OzPjJn" resolve="concreteConstructors" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
index a9f1a0d121..0bf0a6a68d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/editor.mps
@@ -708,7 +708,7 @@
                           <node concept="3clFbF" id="7aipPVpTAJy" role="3cqZAp">
                             <node concept="2OqwBi" id="7aipPVpTAJz" role="3clFbG">
                               <node concept="37vLTw" id="7aipPVpTAJ$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX81741" />
+                                <ref role="3cqZAo" node="4z0AnX81741" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7aipPVpTAJ_" role="2OqNvi">
                                 <node concept="chp4Y" id="7aipPVpTAJA" role="cj9EA">
@@ -842,7 +842,7 @@
                         <node concept="3clFbF" id="7aipPVpTAKp" role="3cqZAp">
                           <node concept="2OqwBi" id="7aipPVpTAKq" role="3clFbG">
                             <node concept="37vLTw" id="7aipPVpTAKr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81743" />
+                              <ref role="3cqZAo" node="4z0AnX81743" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="7aipPVpTAKs" role="2OqNvi">
                               <node concept="chp4Y" id="7aipPVpTAKt" role="cj9EA">
@@ -1292,7 +1292,7 @@
                       <node concept="2OqwBi" id="7aipPVpTT$2" role="3uHU7B">
                         <node concept="2JrnkZ" id="7aipPVpTT$3" role="2Oq$k0">
                           <node concept="37vLTw" id="7aipPVpTT$4" role="2JrQYb">
-                            <ref role="3cqZAo" node="4z0AnX81745" />
+                            <ref role="3cqZAo" node="4z0AnX81745" resolve="it" />
                           </node>
                         </node>
                         <node concept="liA8E" id="7aipPVpTT$5" role="2OqNvi">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
index 5e385e643c..267a15c5a0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/plugin.mps
@@ -521,7 +521,7 @@
                     <node concept="3clFbF" id="7aipPVpQnAf" role="3cqZAp">
                       <node concept="2OqwBi" id="7aipPVpQnSY" role="3clFbG">
                         <node concept="37vLTw" id="7aipPVpQnAe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81749" />
+                          <ref role="3cqZAo" node="4z0AnX81749" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7aipPVpQodb" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
index b0790282b9..2a7cc83f04 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
@@ -1523,7 +1523,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="5a_u3O$05dR" role="1m5AlR">
                                               <node concept="37vLTw" id="5a_u3O$05dS" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX81747" />
+                                                <ref role="3cqZAo" node="4z0AnX81747" resolve="it" />
                                               </node>
                                               <node concept="1mfA1w" id="5a_u3O$05dT" role="2OqNvi" />
                                             </node>
@@ -1543,7 +1543,7 @@
                                     <node concept="34jXtK" id="5a_u3O$05dX" role="2OqNvi">
                                       <node concept="2OqwBi" id="5a_u3O$05dY" role="25WWJ7">
                                         <node concept="37vLTw" id="5a_u3O$05dZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX81747" />
+                                          <ref role="3cqZAo" node="4z0AnX81747" resolve="it" />
                                         </node>
                                         <node concept="2bSWHS" id="5a_u3O$05e0" role="2OqNvi" />
                                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index 7c43fa0a29..a2ba0e5718 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -914,7 +914,7 @@
                         <node concept="2OqwBi" id="62HIBxktG4O" role="3uHU7B">
                           <node concept="2OqwBi" id="15gN1OJYwA5" role="2Oq$k0">
                             <node concept="37vLTw" id="15gN1OJYwA6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174b" />
+                              <ref role="3cqZAo" node="4z0AnX8174b" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="62HIBxktDw3" role="2OqNvi" />
                           </node>
@@ -963,7 +963,7 @@
                         <node concept="2OqwBi" id="62HIBxktV07" role="3uHU7B">
                           <node concept="2OqwBi" id="62HIBxktV08" role="2Oq$k0">
                             <node concept="37vLTw" id="62HIBxktV09" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174d" />
+                              <ref role="3cqZAo" node="4z0AnX8174d" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="62HIBxktV0a" role="2OqNvi" />
                           </node>
@@ -1033,7 +1033,7 @@
                             <node concept="2OqwBi" id="4Rn$FX8dv4u" role="3uHU7B">
                               <node concept="2OqwBi" id="4Rn$FX8d9p0" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Rn$FX8d912" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8174f" />
+                                  <ref role="3cqZAo" node="4z0AnX8174f" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="4Rn$FX8dkxh" role="2OqNvi" />
                               </node>
@@ -1083,7 +1083,7 @@
                         <node concept="2OqwBi" id="2qNvObDoIq$" role="3fr31v">
                           <node concept="2OqwBi" id="2qNvObDoIq_" role="2Oq$k0">
                             <node concept="37vLTw" id="2qNvObDoIqA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174h" />
+                              <ref role="3cqZAo" node="4z0AnX8174h" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="2qNvObDoIqB" role="2OqNvi" />
                           </node>
@@ -1127,7 +1127,7 @@
                               <ref role="cht4Q" to="hm2y:6sdnDbSla17" resolve="Expression" />
                             </node>
                             <node concept="37vLTw" id="2qNvObDoD_y" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX8174j" />
+                              <ref role="3cqZAo" node="4z0AnX8174j" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="2qNvObDoD_z" role="2OqNvi">
@@ -1838,7 +1838,7 @@
                         <node concept="3fqX7Q" id="6iqfHNBQFE5" role="3clFbG">
                           <node concept="2OqwBi" id="6iqfHNBQFON" role="3fr31v">
                             <node concept="37vLTw" id="6iqfHNBQFIP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174l" />
+                              <ref role="3cqZAo" node="4z0AnX8174l" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="6iqfHNBQFXt" role="2OqNvi">
                               <ref role="37wK5l" node="6iqfHNBQFh1" resolve="hideInStack" />
@@ -1860,7 +1860,7 @@
                     <node concept="3clFbF" id="6iqfHNBPq32" role="3cqZAp">
                       <node concept="2OqwBi" id="6iqfHNBPq6l" role="3clFbG">
                         <node concept="37vLTw" id="6iqfHNBPq31" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174n" />
+                          <ref role="3cqZAo" node="4z0AnX8174n" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6iqfHNBPqaW" role="2OqNvi">
                           <ref role="37wK5l" node="6iqfHNBPkjP" resolve="asString" />
@@ -1899,7 +1899,7 @@
                   <node concept="3clFbF" id="6iqfHNBPrqt" role="3cqZAp">
                     <node concept="3cpWs3" id="6iqfHNBPrMM" role="3clFbG">
                       <node concept="37vLTw" id="6iqfHNBPrMT" role="3uHU7w">
-                        <ref role="3cqZAo" node="4z0AnX8174p" />
+                        <ref role="3cqZAo" node="4z0AnX8174p" resolve="it" />
                       </node>
                       <node concept="3cpWs3" id="6iqfHNBPstl" role="3uHU7B">
                         <node concept="37vLTw" id="6iqfHNBPswV" role="3uHU7w">
@@ -3445,7 +3445,7 @@
                         <node concept="10Nm6u" id="3kzwyUOCajC" role="3uHU7w" />
                         <node concept="2OqwBi" id="3kzwyUOCajD" role="3uHU7B">
                           <node concept="37vLTw" id="3kzwyUOCajE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8174r" />
+                            <ref role="3cqZAo" node="4z0AnX8174r" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="3kzwyUOCajF" role="2OqNvi">
                             <node concept="1xMEDy" id="3kzwyUOCajG" role="1xVPHs">
@@ -3485,7 +3485,7 @@
                       <node concept="22lmx$" id="3kzwyUOBp53" role="3clFbG">
                         <node concept="2OqwBi" id="3kzwyUOBpdW" role="3uHU7w">
                           <node concept="37vLTw" id="3kzwyUOBp9B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8174t" />
+                            <ref role="3cqZAo" node="4z0AnX8174t" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3kzwyUOBplp" role="2OqNvi">
                             <node concept="chp4Y" id="3kzwyUOBppp" role="cj9EA">
@@ -3495,7 +3495,7 @@
                         </node>
                         <node concept="2OqwBi" id="3kzwyUOBoOx" role="3uHU7B">
                           <node concept="37vLTw" id="3kzwyUOBoL0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8174t" />
+                            <ref role="3cqZAo" node="4z0AnX8174t" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3kzwyUOBoUd" role="2OqNvi">
                             <node concept="chp4Y" id="3kzwyUOBoYi" role="cj9EA">
@@ -5922,13 +5922,13 @@
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
                           <ref role="37wK5l" to="wyt6:~Character.isAlphabetic(int)" resolve="isAlphabetic" />
                           <node concept="37vLTw" id="4iVHBBBBfJn" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8174v" />
+                            <ref role="3cqZAo" node="4z0AnX8174v" resolve="it" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="4iVHBBBBfby" role="3clFbx">
                           <node concept="3cpWs6" id="4iVHBBBBfN7" role="3cqZAp">
                             <node concept="37vLTw" id="4iVHBBBBfQ4" role="3cqZAk">
-                              <ref role="3cqZAo" node="4z0AnX8174v" />
+                              <ref role="3cqZAo" node="4z0AnX8174v" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5938,13 +5938,13 @@
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
                           <ref role="37wK5l" to="wyt6:~Character.isDigit(char)" resolve="isDigit" />
                           <node concept="37vLTw" id="4iVHBBBBfYI" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8174v" />
+                            <ref role="3cqZAo" node="4z0AnX8174v" resolve="it" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="4iVHBBBBfTX" role="3clFbx">
                           <node concept="3cpWs6" id="4iVHBBBBfTY" role="3cqZAp">
                             <node concept="37vLTw" id="4iVHBBBBfTZ" role="3cqZAk">
-                              <ref role="3cqZAo" node="4z0AnX8174v" />
+                              <ref role="3cqZAo" node="4z0AnX8174v" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5992,7 +5992,7 @@
                   <node concept="3clFbF" id="46cplYwxyje" role="3cqZAp">
                     <node concept="2OqwBi" id="46cplYwxytG" role="3clFbG">
                       <node concept="37vLTw" id="46cplYwxyjd" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8174x" />
+                        <ref role="3cqZAo" node="4z0AnX8174x" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="46cplYwxyHO" role="2OqNvi">
                         <ref role="37wK5l" node="46cplYwxrWE" resolve="canBeSimplified" />
@@ -6035,7 +6035,7 @@
                     <node concept="3clFbF" id="46cplYwxFDl" role="3cqZAp">
                       <node concept="2OqwBi" id="46cplYwxFOG" role="3clFbG">
                         <node concept="37vLTw" id="46cplYwxFDk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174z" />
+                          <ref role="3cqZAo" node="4z0AnX8174z" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="46cplYwxFZ6" role="2OqNvi">
                           <ref role="37wK5l" node="46cplYwxrWE" resolve="canBeSimplified" />
@@ -6056,7 +6056,7 @@
                   <node concept="3clFbF" id="46cplYwxBqb" role="3cqZAp">
                     <node concept="2OqwBi" id="46cplYwxBxy" role="3clFbG">
                       <node concept="37vLTw" id="46cplYwxBqa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8174_" />
+                        <ref role="3cqZAo" node="4z0AnX8174_" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="46cplYwxGdC" role="2OqNvi">
                         <ref role="37wK5l" node="46cplYwxszL" resolve="simplify" />
@@ -6491,12 +6491,12 @@
                             <node concept="3clFbF" id="46cplYwP99x" role="3cqZAp">
                               <node concept="2OqwBi" id="46cplYwP9nQ" role="3clFbG">
                                 <node concept="37vLTw" id="46cplYwP99w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8174D" />
+                                  <ref role="3cqZAo" node="4z0AnX8174D" resolve="mine" />
                                 </node>
                                 <node concept="2qgKlT" id="46cplYwP9NE" role="2OqNvi">
                                   <ref role="37wK5l" node="69zaTr1Z8aS" resolve="isSameAs" />
                                   <node concept="37vLTw" id="46cplYwPa11" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX8174B" />
+                                    <ref role="3cqZAo" node="4z0AnX8174B" resolve="theirs" />
                                   </node>
                                 </node>
                               </node>
@@ -7287,7 +7287,7 @@
                   <node concept="3clFbF" id="12WRc298INQ" role="3cqZAp">
                     <node concept="2OqwBi" id="12WRc298INR" role="3clFbG">
                       <node concept="37vLTw" id="12WRc298INS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8174F" />
+                        <ref role="3cqZAo" node="4z0AnX8174F" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="12WRc298INT" role="2OqNvi">
                         <ref role="37wK5l" node="69zaTr1W0u$" resolve="isGeneric" />
@@ -7329,7 +7329,7 @@
                         <node concept="10Nm6u" id="18$bUx5HNxa" role="3uHU7w" />
                         <node concept="2OqwBi" id="18$bUx5HMCz" role="3uHU7B">
                           <node concept="37vLTw" id="18$bUx5HMuJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8174H" />
+                            <ref role="3cqZAo" node="4z0AnX8174H" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="18$bUx5HMWE" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7340,7 +7340,7 @@
                         <node concept="2OqwBi" id="12WRc298Ktn" role="2Oq$k0">
                           <node concept="2OqwBi" id="12WRc298KhF" role="2Oq$k0">
                             <node concept="37vLTw" id="12WRc298KeD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174H" />
+                              <ref role="3cqZAo" node="4z0AnX8174H" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="12WRc298Kmz" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7444,13 +7444,13 @@
                                   <node concept="3clFbF" id="6SpoPQgScYL" role="3cqZAp">
                                     <node concept="2OqwBi" id="6SpoPQgScYM" role="3clFbG">
                                       <node concept="37vLTw" id="6SpoPQgScYN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8174L" />
+                                        <ref role="3cqZAo" node="4z0AnX8174L" resolve="el" />
                                       </node>
                                       <node concept="2qgKlT" id="6SpoPQgScYO" role="2OqNvi">
                                         <ref role="37wK5l" node="69zaTr1Z8aS" resolve="isSameAs" />
                                         <node concept="2OqwBi" id="6SpoPQgScYP" role="37wK5m">
                                           <node concept="37vLTw" id="6SpoPQgScYQ" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8174J" />
+                                            <ref role="3cqZAo" node="4z0AnX8174J" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="6SpoPQgScYR" role="2OqNvi">
                                             <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -7993,7 +7993,7 @@
                         <node concept="3cpWs3" id="6iqfHNCeTjJ" role="3uHU7B">
                           <node concept="2OqwBi" id="6iqfHNCeT7p" role="3uHU7B">
                             <node concept="37vLTw" id="6iqfHNCeT3V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174N" />
+                              <ref role="3cqZAo" node="4z0AnX8174N" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6iqfHNCeTcV" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9858,7 +9858,7 @@
                     <node concept="3clFbF" id="7S4tmubFocB" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubFoqU" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubFocA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174P" />
+                          <ref role="3cqZAo" node="4z0AnX8174P" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubFoD9" role="2OqNvi">
                           <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -10066,7 +10066,7 @@
                     <node concept="3clFbF" id="6ovbtsiVf4Z" role="3cqZAp">
                       <node concept="2OqwBi" id="6ovbtsiVf8F" role="3clFbG">
                         <node concept="37vLTw" id="6ovbtsiVf4Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174R" />
+                          <ref role="3cqZAo" node="4z0AnX8174R" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6ovbtsiVfhh" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -10162,7 +10162,7 @@
                     <node concept="3clFbF" id="5L2mTKmBl3J" role="3cqZAp">
                       <node concept="2OqwBi" id="5L2mTKmBlgS" role="3clFbG">
                         <node concept="37vLTw" id="5L2mTKmBl3I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174T" />
+                          <ref role="3cqZAo" node="4z0AnX8174T" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5L2mTKmBlCy" role="2OqNvi">
                           <ref role="37wK5l" node="fIXgjlt4VE" resolve="isSameAs" />
@@ -10178,7 +10178,7 @@
                             <node concept="34jXtK" id="5L2mTKmBrKD" role="2OqNvi">
                               <node concept="2OqwBi" id="5L2mTKmBsce" role="25WWJ7">
                                 <node concept="37vLTw" id="5L2mTKmBrZs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8174T" />
+                                  <ref role="3cqZAo" node="4z0AnX8174T" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="5L2mTKmBsGv" role="2OqNvi" />
                               </node>
@@ -10316,7 +10316,7 @@
                             <ref role="cht4Q" to="hm2y:aPhVmWYjmk" resolve="ICanBeLValue" />
                           </node>
                           <node concept="37vLTw" id="7b6J31DlyQw" role="1m5AlR">
-                            <ref role="3cqZAo" node="4z0AnX8174V" />
+                            <ref role="3cqZAo" node="4z0AnX8174V" resolve="it" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="7b6J31Dl_1D" role="2OqNvi">
@@ -10325,7 +10325,7 @@
                       </node>
                       <node concept="2OqwBi" id="7b6J31DlxxD" role="3uHU7B">
                         <node concept="37vLTw" id="7b6J31Dlxkw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174V" />
+                          <ref role="3cqZAo" node="4z0AnX8174V" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="7b6J31Dlyaj" role="2OqNvi">
                           <node concept="chp4Y" id="7b6J31DlykY" role="cj9EA">
@@ -10516,7 +10516,7 @@
                       <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                       <node concept="2OqwBi" id="3kzwyUOCVGN" role="37wK5m">
                         <node concept="37vLTw" id="3kzwyUOCVBC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8174X" />
+                          <ref role="3cqZAo" node="4z0AnX8174X" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3kzwyUOCVVb" role="2OqNvi">
                           <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -10593,7 +10593,7 @@
                           <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                           <node concept="2OqwBi" id="3kzwyUOCY1U" role="37wK5m">
                             <node concept="37vLTw" id="3kzwyUOCY1V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8174Z" />
+                              <ref role="3cqZAo" node="4z0AnX8174Z" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3kzwyUOCY1W" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -10759,7 +10759,7 @@
                         <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                         <node concept="2OqwBi" id="3kzwyUOCWya" role="37wK5m">
                           <node concept="37vLTw" id="3kzwyUOCWrY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81751" />
+                            <ref role="3cqZAo" node="4z0AnX81751" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3kzwyUOCWIf" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -11129,7 +11129,7 @@
                       <node concept="TSZUe" id="21vB0Vz3U6a" role="2OqNvi">
                         <node concept="2OqwBi" id="21vB0Vz3UCx" role="25WWJ7">
                           <node concept="37vLTw" id="21vB0Vz3Ujv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81753" />
+                            <ref role="3cqZAo" node="4z0AnX81753" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="21vB0Vz3Vjf" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -11146,7 +11146,7 @@
                       <node concept="TSZUe" id="21vB0Vz3V$E" role="2OqNvi">
                         <node concept="2OqwBi" id="21vB0Vz3V$F" role="25WWJ7">
                           <node concept="37vLTw" id="21vB0Vz3V$G" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81753" />
+                            <ref role="3cqZAo" node="4z0AnX81753" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="21vB0Vz3WpS" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpK" resolve="then" />
@@ -11568,7 +11568,7 @@
                             <node concept="2OqwBi" id="5fy$GmV7qoH" role="25WWJ7">
                               <node concept="2OqwBi" id="5fy$GmV7qoI" role="2Oq$k0">
                                 <node concept="37vLTw" id="5fy$GmV7DAE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX81755" />
+                                  <ref role="3cqZAo" node="4z0AnX81755" resolve="alternative" />
                                 </node>
                                 <node concept="3TrEf2" id="5fy$GmV7Efv" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -11582,7 +11582,7 @@
                     </node>
                     <node concept="17R0WA" id="5fy$GmV7qoM" role="3clFbw">
                       <node concept="37vLTw" id="5fy$GmV7Dez" role="3uHU7w">
-                        <ref role="3cqZAo" node="4z0AnX81755" />
+                        <ref role="3cqZAo" node="4z0AnX81755" resolve="alternative" />
                       </node>
                       <node concept="1y4W85" id="5fy$GmV7qoQ" role="3uHU7B">
                         <node concept="3cpWsd" id="5fy$GmV7qoR" role="1y58nS">
@@ -11738,7 +11738,7 @@
                         <node concept="10Nm6u" id="4j3DGEk4mLG" role="3uHU7w" />
                         <node concept="2OqwBi" id="4j3DGEk4mLH" role="3uHU7B">
                           <node concept="37vLTw" id="4j3DGEk4mLI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81757" />
+                            <ref role="3cqZAo" node="4z0AnX81757" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="4j3DGEk4mLJ" role="2OqNvi">
                             <node concept="1xMEDy" id="4j3DGEk4mLK" role="1xVPHs">
@@ -11778,7 +11778,7 @@
                       <node concept="22lmx$" id="4j3DGEk4mLZ" role="3clFbG">
                         <node concept="2OqwBi" id="4j3DGEk4mM0" role="3uHU7w">
                           <node concept="37vLTw" id="4j3DGEk4mM1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81759" />
+                            <ref role="3cqZAo" node="4z0AnX81759" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4j3DGEk4mM2" role="2OqNvi">
                             <node concept="chp4Y" id="4j3DGEk4mM3" role="cj9EA">
@@ -11788,7 +11788,7 @@
                         </node>
                         <node concept="2OqwBi" id="4j3DGEk4mM4" role="3uHU7B">
                           <node concept="37vLTw" id="4j3DGEk4mM5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX81759" />
+                            <ref role="3cqZAo" node="4z0AnX81759" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4j3DGEk4mM6" role="2OqNvi">
                             <node concept="chp4Y" id="4j3DGEk4mM7" role="cj9EA">
@@ -13507,7 +13507,7 @@
                         <node concept="3clFbF" id="ucawTYeNHQ" role="3cqZAp">
                           <node concept="2OqwBi" id="ucawTYeNHR" role="3clFbG">
                             <node concept="37vLTw" id="ucawTYeNHS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175b" />
+                              <ref role="3cqZAo" node="4z0AnX8175b" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="ucawTYeNHT" role="2OqNvi" />
                           </node>
@@ -15290,7 +15290,7 @@
                         </node>
                         <node concept="3JPx81" id="6SpoPQg9MV5" role="2OqNvi">
                           <node concept="37vLTw" id="6SpoPQg9NjU" role="25WWJ7">
-                            <ref role="3cqZAo" node="4z0AnX8175d" />
+                            <ref role="3cqZAo" node="4z0AnX8175d" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -15459,7 +15459,7 @@
                           </node>
                           <node concept="3JPx81" id="6SpoPQgaRwH" role="2OqNvi">
                             <node concept="37vLTw" id="6SpoPQgaRwI" role="25WWJ7">
-                              <ref role="3cqZAo" node="4z0AnX8175f" />
+                              <ref role="3cqZAo" node="4z0AnX8175f" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -16279,7 +16279,7 @@
                             <ref role="37wK5l" node="5DizcGOb6ar" resolve="getNodeCoverage" />
                             <ref role="1Pybhc" node="4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                             <node concept="37vLTw" id="3$EgSSy1dHF" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX8175h" />
+                              <ref role="3cqZAo" node="4z0AnX8175h" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -16313,7 +16313,7 @@
                     <node concept="3clFbF" id="3$EgSSy1fK$" role="3cqZAp">
                       <node concept="3cpWs3" id="3$EgSSy1gAS" role="3clFbG">
                         <node concept="37vLTw" id="3$EgSSy1gGd" role="3uHU7w">
-                          <ref role="3cqZAo" node="4z0AnX8175j" />
+                          <ref role="3cqZAo" node="4z0AnX8175j" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="3$EgSSy1fKz" role="3uHU7B">
                           <ref role="3cqZAo" node="3$EgSSy1fkz" resolve="total" />
@@ -16435,13 +16435,13 @@
                                   <node concept="1rXfSq" id="3tZgM5CPUfZ" role="3uHU7w">
                                     <ref role="37wK5l" node="1WlYLwX3UOV" resolve="isNodePartiallyCovered" />
                                     <node concept="37vLTw" id="3tZgM5CPVp$" role="37wK5m">
-                                      <ref role="3cqZAo" node="4z0AnX8175l" />
+                                      <ref role="3cqZAo" node="4z0AnX8175l" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="1rXfSq" id="3$EgSSy0Ecd" role="3uHU7B">
                                     <ref role="37wK5l" node="1WlYLwX3McV" resolve="isNodeCovered" />
                                     <node concept="37vLTw" id="3$EgSSy0Ece" role="37wK5m">
-                                      <ref role="3cqZAo" node="4z0AnX8175l" />
+                                      <ref role="3cqZAo" node="4z0AnX8175l" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -16570,7 +16570,7 @@
                         <node concept="3fqX7Q" id="3xi1F8S2Yi6" role="3uHU7w">
                           <node concept="2OqwBi" id="3xi1F8S2Yi8" role="3fr31v">
                             <node concept="37vLTw" id="3xi1F8S2Yi9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175n" />
+                              <ref role="3cqZAo" node="4z0AnX8175n" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="3xi1F8S2Yia" role="2OqNvi">
                               <node concept="chp4Y" id="3xi1F8S2Yib" role="cj9EA">
@@ -16583,7 +16583,7 @@
                           <node concept="3fqX7Q" id="3$EgSSy1cEv" role="3uHU7B">
                             <node concept="2OqwBi" id="3$EgSSy1cEw" role="3fr31v">
                               <node concept="37vLTw" id="3$EgSSy1cEx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175n" />
+                                <ref role="3cqZAo" node="4z0AnX8175n" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3$EgSSy1cEy" role="2OqNvi">
                                 <node concept="chp4Y" id="3$EgSSy1cEz" role="cj9EA">
@@ -16595,7 +16595,7 @@
                           <node concept="3fqX7Q" id="3$EgSSy1cEq" role="3uHU7w">
                             <node concept="2OqwBi" id="3$EgSSy1cEr" role="3fr31v">
                               <node concept="37vLTw" id="3$EgSSy1cEs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175n" />
+                                <ref role="3cqZAo" node="4z0AnX8175n" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="3$EgSSy1cEt" role="2OqNvi">
                                 <node concept="chp4Y" id="3$EgSSy1cEu" role="cj9EA">
@@ -16660,7 +16660,7 @@
                           <ref role="37wK5l" node="5DizcGOb6ar" resolve="getNodeCoverage" />
                           <ref role="1Pybhc" node="4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="1ly2$GYp0Q0" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8175p" />
+                            <ref role="3cqZAo" node="4z0AnX8175p" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -18068,7 +18068,7 @@
                               <node concept="liA8E" id="7ezRWquoMTm" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                 <node concept="37vLTw" id="7ezRWquoMTn" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX8175r" />
+                                  <ref role="3cqZAo" node="4z0AnX8175r" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -18138,7 +18138,7 @@
                     <node concept="3fqX7Q" id="6SpoPQgxnfd" role="3clFbG">
                       <node concept="2OqwBi" id="6SpoPQgxnPN" role="3fr31v">
                         <node concept="37vLTw" id="6SpoPQgxn_O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8175t" />
+                          <ref role="3cqZAo" node="4z0AnX8175t" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6SpoPQgxoiK" role="2OqNvi">
                           <ref role="37wK5l" node="6SpoPQg9EIA" resolve="isComplete" />
@@ -18173,7 +18173,7 @@
                     <node concept="3fqX7Q" id="7ezRWqupsBW" role="3clFbG">
                       <node concept="2OqwBi" id="7ezRWqupsBX" role="3fr31v">
                         <node concept="37vLTw" id="7ezRWqupsBY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8175v" />
+                          <ref role="3cqZAo" node="4z0AnX8175v" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7ezRWqupsBZ" role="2OqNvi">
                           <ref role="37wK5l" node="6SpoPQg9EIA" resolve="isComplete" />
@@ -18245,7 +18245,7 @@
                       </node>
                       <node concept="3EllGN" id="7ezRWqupT1t" role="33vP2m">
                         <node concept="37vLTw" id="7ezRWqupT1u" role="3ElVtu">
-                          <ref role="3cqZAo" node="4z0AnX8175x" />
+                          <ref role="3cqZAo" node="4z0AnX8175x" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="7ezRWqupT1v" role="3ElQJh">
                           <ref role="3cqZAo" node="7ezRWqukLIn" resolve="visitedConcepts" />
@@ -18266,7 +18266,7 @@
                           <node concept="1pGfFk" id="7ezRWqupT1B" role="2ShVmc">
                             <ref role="37wK5l" node="6SpoPQgawRU" resolve="DefaultCoverageAnalyzer.ConceptData" />
                             <node concept="37vLTw" id="7ezRWqupT1C" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX8175x" />
+                              <ref role="3cqZAo" node="4z0AnX8175x" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -18521,7 +18521,7 @@
                         <node concept="1rXfSq" id="7ezRWqus_xN" role="3clFbG">
                           <ref role="37wK5l" node="1WlYLwX1YJg" resolve="hasNodeCoverage" />
                           <node concept="37vLTw" id="7ezRWqus_xO" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8175z" />
+                            <ref role="3cqZAo" node="4z0AnX8175z" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -19255,7 +19255,7 @@
                       <node concept="2Zo12i" id="7ezRWqux78k" role="2OqNvi">
                         <node concept="25Kdxt" id="7ezRWqux78l" role="2Zo12j">
                           <node concept="37vLTw" id="7ezRWqux78m" role="25KhWn">
-                            <ref role="3cqZAo" node="4z0AnX8175B" />
+                            <ref role="3cqZAo" node="4z0AnX8175B" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -19378,7 +19378,7 @@
                         <node concept="2Zo12i" id="7ezRWquzgxC" role="2OqNvi">
                           <node concept="25Kdxt" id="7ezRWquzgxD" role="2Zo12j">
                             <node concept="37vLTw" id="7ezRWquzgxE" role="25KhWn">
-                              <ref role="3cqZAo" node="4z0AnX8175D" />
+                              <ref role="3cqZAo" node="4z0AnX8175D" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -20177,7 +20177,7 @@
                         <node concept="3clFbF" id="7zqxZ9Kkkuq" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9KkkBg" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9Kkkup" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175F" />
+                              <ref role="3cqZAo" node="4z0AnX8175F" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="7zqxZ9KkkIM" role="2OqNvi" />
                           </node>
@@ -20429,7 +20429,7 @@
                           <node concept="2OqwBi" id="CrzyxmAR11" role="25WWJ7">
                             <node concept="2OqwBi" id="CrzyxmwJL8" role="2Oq$k0">
                               <node concept="37vLTw" id="CrzyxmwJvV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175H" />
+                                <ref role="3cqZAo" node="4z0AnX8175H" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="CrzyxmwK2L" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
@@ -20493,7 +20493,7 @@
                           <node concept="2OqwBi" id="5s_Nuat8VKA" role="25WWJ7">
                             <node concept="2OqwBi" id="5s_Nuat8VKB" role="2Oq$k0">
                               <node concept="37vLTw" id="5s_Nuat8VKC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175J" />
+                                <ref role="3cqZAo" node="4z0AnX8175J" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="5s_Nuat8VKD" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
@@ -20723,7 +20723,7 @@
                         <node concept="3clFbF" id="58jTitRqpwC" role="3cqZAp">
                           <node concept="2OqwBi" id="58jTitRqwh3" role="3clFbG">
                             <node concept="37vLTw" id="58jTitRqpwB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175L" />
+                              <ref role="3cqZAo" node="4z0AnX8175L" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="58jTitRqAVm" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -20749,7 +20749,7 @@
                           <node concept="3clFbF" id="58jTitRq3dM" role="3cqZAp">
                             <node concept="2OqwBi" id="58jTitRq7m0" role="3clFbG">
                               <node concept="37vLTw" id="58jTitRq3dL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175N" />
+                                <ref role="3cqZAo" node="4z0AnX8175N" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="58jTitRqc6B" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -20955,7 +20955,7 @@
                           </node>
                           <node concept="3JPx81" id="4XlPKepad0j" role="2OqNvi">
                             <node concept="37vLTw" id="4XlPKepad0k" role="25WWJ7">
-                              <ref role="3cqZAo" node="4z0AnX8175P" />
+                              <ref role="3cqZAo" node="4z0AnX8175P" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -21019,7 +21019,7 @@
                           </node>
                           <node concept="3JPx81" id="5s_NuasTldb" role="2OqNvi">
                             <node concept="37vLTw" id="5s_NuasTldc" role="25WWJ7">
-                              <ref role="3cqZAo" node="4z0AnX8175R" />
+                              <ref role="3cqZAo" node="4z0AnX8175R" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -21081,7 +21081,7 @@
                         <node concept="3clFbF" id="7zqxZ9KlmN0" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9Kln31" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9KlmMZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175T" />
+                              <ref role="3cqZAo" node="4z0AnX8175T" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7zqxZ9Klnh_" role="2OqNvi">
                               <ref role="37wK5l" node="7zqxZ9KkaYF" resolve="heterogeneity" />
@@ -21148,7 +21148,7 @@
                         <node concept="3clFbF" id="7zqxZ9Klupb" role="3cqZAp">
                           <node concept="2OqwBi" id="7zqxZ9Klupc" role="3clFbG">
                             <node concept="37vLTw" id="7zqxZ9Klupd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8175V" />
+                              <ref role="3cqZAo" node="4z0AnX8175V" resolve="it" />
                             </node>
                             <node concept="liA8E" id="7zqxZ9Klupe" role="2OqNvi">
                               <ref role="37wK5l" node="7zqxZ9KkaYF" resolve="heterogeneity" />
@@ -21699,7 +21699,7 @@
                     <node concept="22lmx$" id="Crzyxmxyy1" role="3clFbG">
                       <node concept="2OqwBi" id="Crzyxmxs6l" role="3uHU7B">
                         <node concept="37vLTw" id="Crzyxmxs6m" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8175X" />
+                          <ref role="3cqZAo" node="4z0AnX8175X" resolve="it" />
                         </node>
                         <node concept="liA8E" id="Crzyxmxs6n" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -21710,7 +21710,7 @@
                           <ref role="3uigEE" to="c17a:~SInterfaceConcept" resolve="SInterfaceConcept" />
                         </node>
                         <node concept="37vLTw" id="CrzyxmxsXV" role="2ZW6bz">
-                          <ref role="3cqZAo" node="4z0AnX8175X" />
+                          <ref role="3cqZAo" node="4z0AnX8175X" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -21756,7 +21756,7 @@
                             </node>
                             <node concept="2OqwBi" id="Crzyxm_MT0" role="10QFUP">
                               <node concept="37vLTw" id="Crzyxm_MT1" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8175Z" />
+                                <ref role="3cqZAo" node="4z0AnX8175Z" resolve="it" />
                               </node>
                               <node concept="liA8E" id="Crzyxm_MT2" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SLanguage.getConcepts()" resolve="getConcepts" />
@@ -21788,12 +21788,12 @@
                                 <node concept="3fqX7Q" id="Crzyxmx9dr" role="3clFbG">
                                   <node concept="2OqwBi" id="Crzyxmx9dt" role="3fr31v">
                                     <node concept="37vLTw" id="Crzyxmx9du" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX81763" />
+                                      <ref role="3cqZAo" node="4z0AnX81763" resolve="c" />
                                     </node>
                                     <node concept="liA8E" id="Crzyxmx9dv" role="2OqNvi">
                                       <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                       <node concept="37vLTw" id="Crzyxmx9dw" role="37wK5m">
-                                        <ref role="3cqZAo" node="4z0AnX81761" />
+                                        <ref role="3cqZAo" node="4z0AnX81761" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -21844,7 +21844,7 @@
                     <node concept="3fqX7Q" id="5s_NuasVGlX" role="3clFbG">
                       <node concept="2OqwBi" id="5s_NuasVLdi" role="3fr31v">
                         <node concept="37vLTw" id="5s_NuasVGoa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81765" />
+                          <ref role="3cqZAo" node="4z0AnX81765" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5s_NuasVRAG" role="2OqNvi">
                           <ref role="37wK5l" node="4XlPKepacYB" resolve="isComplete" />
@@ -21903,7 +21903,7 @@
                       </node>
                       <node concept="3EllGN" id="4XlPKepbC7I" role="33vP2m">
                         <node concept="37vLTw" id="4XlPKepbC7J" role="3ElVtu">
-                          <ref role="3cqZAo" node="4z0AnX81767" />
+                          <ref role="3cqZAo" node="4z0AnX81767" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="4XlPKepbC7K" role="3ElQJh">
                           <ref role="3cqZAo" node="4XlPKepbqg6" resolve="visitedConcepts" />
@@ -21929,7 +21929,7 @@
                               <node concept="1pGfFk" id="4XlPKepbC7S" role="2ShVmc">
                                 <ref role="37wK5l" node="4XlPKepacXn" resolve="StructuralCoverageAnalyzer.StructureData" />
                                 <node concept="37vLTw" id="4XlPKepbC7T" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX81767" />
+                                  <ref role="3cqZAo" node="4z0AnX81767" resolve="it" />
                                 </node>
                                 <node concept="37vLTw" id="CrzyxmA_za" role="37wK5m">
                                   <ref role="3cqZAo" node="CrzyxmA_6y" resolve="allRelevantConcepts" />
@@ -21942,7 +21942,7 @@
                           </node>
                           <node concept="3EllGN" id="5s_NuasWruK" role="37vLTJ">
                             <node concept="37vLTw" id="5s_NuasWrHC" role="3ElVtu">
-                              <ref role="3cqZAo" node="4z0AnX81767" />
+                              <ref role="3cqZAo" node="4z0AnX81767" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="5s_NuasWr38" role="3ElQJh">
                               <ref role="3cqZAo" node="4XlPKepbqg6" resolve="visitedConcepts" />
@@ -22269,7 +22269,7 @@
                         <node concept="3clFbF" id="74u6qanTl5$" role="3cqZAp">
                           <node concept="2OqwBi" id="74u6qanTlsg" role="3clFbG">
                             <node concept="37vLTw" id="74u6qanTl5z" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81769" />
+                              <ref role="3cqZAo" node="4z0AnX81769" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="74u6qanTlS0" role="2OqNvi">
                               <ref role="37wK5l" node="14gxgpJfXC0" resolve="shouldBeSubstituted" />
@@ -22290,7 +22290,7 @@
                       <node concept="3clFbF" id="1xFBUnx0cEC" role="3cqZAp">
                         <node concept="2OqwBi" id="1xFBUnx0cED" role="3clFbG">
                           <node concept="37vLTw" id="1xFBUnx0cEE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8176b" />
+                            <ref role="3cqZAo" node="4z0AnX8176b" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="1xFBUnx0cEF" role="2OqNvi">
                             <ref role="37wK5l" node="5GL30CqMVFo" resolve="getISSVariable" />
@@ -22725,7 +22725,7 @@
                       <node concept="3clFbF" id="7VuYlCR4CbW" role="3cqZAp">
                         <node concept="2OqwBi" id="7VuYlCR4Cp_" role="3clFbG">
                           <node concept="37vLTw" id="7VuYlCR4CbV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8176d" />
+                            <ref role="3cqZAo" node="4z0AnX8176d" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7VuYlCR4C_C" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -23135,7 +23135,7 @@
                             <ref role="cht4Q" to="hm2y:6JZACDWQJu4" resolve="ILiteral" />
                           </node>
                           <node concept="37vLTw" id="YcTL0uDGT" role="1m5AlR">
-                            <ref role="3cqZAo" node="4z0AnX8176f" />
+                            <ref role="3cqZAo" node="4z0AnX8176f" resolve="it" />
                           </node>
                         </node>
                         <node concept="2qgKlT" id="3T40JVg5CS$" role="2OqNvi">
@@ -23144,7 +23144,7 @@
                       </node>
                       <node concept="2OqwBi" id="YcTL0uCOb" role="3uHU7B">
                         <node concept="37vLTw" id="YcTL0uCDA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176f" />
+                          <ref role="3cqZAo" node="4z0AnX8176f" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="YcTL0uCUD" role="2OqNvi">
                           <node concept="chp4Y" id="YcTL0uD2c" role="cj9EA">
@@ -25631,7 +25631,7 @@
                     <node concept="3clFbF" id="6WstIz8HR3Z" role="3cqZAp">
                       <node concept="2OqwBi" id="6WstIz8HRje" role="3clFbG">
                         <node concept="37vLTw" id="6WstIz8HR3Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176h" />
+                          <ref role="3cqZAo" node="4z0AnX8176h" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6WstIz8HRDr" role="2OqNvi">
                           <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -26332,7 +26332,7 @@
                       <node concept="3clFbF" id="6SrPpX93C9I" role="3cqZAp">
                         <node concept="2OqwBi" id="6SrPpX93C9J" role="3clFbG">
                           <node concept="37vLTw" id="6SrPpX93C9K" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8176j" />
+                            <ref role="3cqZAo" node="4z0AnX8176j" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6SrPpX93C9L" role="2OqNvi">
                             <ref role="37wK5l" node="4Y0vh0cfqjE" resolve="renderReadable" />
@@ -26458,7 +26458,7 @@
                             <node concept="3clFbC" id="jqB9UbF3rk" role="3clFbG">
                               <node concept="2OqwBi" id="jqB9UbF3rl" role="3uHU7B">
                                 <node concept="37vLTw" id="jqB9UbF3rm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8176l" />
+                                  <ref role="3cqZAo" node="4z0AnX8176l" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="jqB9UbF3rn" role="2OqNvi" />
                               </node>
@@ -26614,7 +26614,7 @@
                             <node concept="3clFbC" id="jqB9UdsEf6" role="3clFbG">
                               <node concept="2OqwBi" id="jqB9UdsEf7" role="3uHU7B">
                                 <node concept="37vLTw" id="jqB9UdsEf8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8176n" />
+                                  <ref role="3cqZAo" node="4z0AnX8176n" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="jqB9UdsEf9" role="2OqNvi" />
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
index 3856bd61c6..83dc84bdf2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
@@ -242,7 +242,7 @@
                       <node concept="3clFbF" id="1F1F0IUZ_Y4" role="3cqZAp">
                         <node concept="2OqwBi" id="1F1F0IUZ_Y5" role="3clFbG">
                           <node concept="37vLTw" id="1F1F0IUZ_Y6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8176p" />
+                            <ref role="3cqZAo" node="4z0AnX8176p" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="1F1F0IUZ_Y7" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:5ye9uPrkFwU" resolve="findTheSomeQueries" />
@@ -741,7 +741,7 @@
                         <node concept="3fqX7Q" id="1F1F0IUZ_Tq" role="3clFbG">
                           <node concept="2OqwBi" id="1F1F0IUZ_Tr" role="3fr31v">
                             <node concept="37vLTw" id="1F1F0IUZ_Ts" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8176r" />
+                              <ref role="3cqZAo" node="4z0AnX8176r" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="1F1F0IUZ_Tt" role="2OqNvi">
                               <node concept="chp4Y" id="1F1F0IUZ_Tu" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index 56840269c0..86394d1a44 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -2135,7 +2135,7 @@
                                   <node concept="3clFbF" id="12WRc294xzS" role="3cqZAp">
                                     <node concept="2OqwBi" id="12WRc294xzT" role="3clFbG">
                                       <node concept="37vLTw" id="12WRc294xzU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8176t" />
+                                        <ref role="3cqZAo" node="4z0AnX8176t" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="12WRc294xzV" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2181,7 +2181,7 @@
                                       <node concept="3clFbF" id="3kdFyLXe9Y9" role="3cqZAp">
                                         <node concept="2OqwBi" id="3kdFyLXeaqL" role="3clFbG">
                                           <node concept="37vLTw" id="3kdFyLXe9Y8" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8176v" />
+                                            <ref role="3cqZAo" node="4z0AnX8176v" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="3kdFyLXecOp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3671,7 +3671,7 @@
                           <ref role="37wK5l" to="pbu6:1WlYLwX1YJg" resolve="hasNodeCoverage" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="3$EgSSxSMI1" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8176x" />
+                            <ref role="3cqZAo" node="4z0AnX8176x" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3708,7 +3708,7 @@
                         <node concept="3clFbF" id="3$EgSSxSzG9" role="3cqZAp">
                           <node concept="2OqwBi" id="3$EgSSxS$2U" role="3clFbG">
                             <node concept="37vLTw" id="3$EgSSxSzG8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8176z" />
+                              <ref role="3cqZAo" node="4z0AnX8176z" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="3$EgSSxS$ER" role="2OqNvi">
                               <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -3801,7 +3801,7 @@
                     <node concept="3clFbF" id="Om1N8U02gD" role="3cqZAp">
                       <node concept="2OqwBi" id="Om1N8U02gE" role="3clFbG">
                         <node concept="37vLTw" id="Om1N8U02gF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176_" />
+                          <ref role="3cqZAo" node="4z0AnX8176_" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="Om1N8U02gG" role="2OqNvi">
                           <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -3879,7 +3879,7 @@
                           <ref role="37wK5l" to="pbu6:1WlYLwX3YKL" resolve="isNodeNotCovered" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="Om1N8UbkHU" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX8176B" />
+                            <ref role="3cqZAo" node="4z0AnX8176B" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="Om1N8UboFd" role="3uHU7B">
@@ -3889,7 +3889,7 @@
                               <ref role="cht4Q" to="3673:5IKJrJHNBNb" resolve="ICanHaveTestCoverage" />
                             </node>
                             <node concept="37vLTw" id="Om1N8Ubm$F" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX8176B" />
+                              <ref role="3cqZAo" node="4z0AnX8176B" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="Om1N8UbpCr" role="2OqNvi">
@@ -6382,7 +6382,7 @@
                                   </node>
                                   <node concept="3JPx81" id="43wAXFpM0aE" role="2OqNvi">
                                     <node concept="37vLTw" id="43wAXFpM0aF" role="25WWJ7">
-                                      <ref role="3cqZAo" node="4z0AnX8176D" />
+                                      <ref role="3cqZAo" node="4z0AnX8176D" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -6457,7 +6457,7 @@
                         <ref role="37wK5l" to="pbu6:1WlYLwX3YKL" resolve="isNodeNotCovered" />
                         <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                         <node concept="37vLTw" id="2B_XTD72PHq" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX8176F" />
+                          <ref role="3cqZAo" node="4z0AnX8176F" resolve="it" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
index c40ab334ff..aed74d79bb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
@@ -588,7 +588,7 @@
                     <node concept="3clFbF" id="7_$HJtBtOwl" role="3cqZAp">
                       <node concept="2OqwBi" id="7_$HJtBtOwm" role="3clFbG">
                         <node concept="37vLTw" id="7_$HJtBtOwn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176H" />
+                          <ref role="3cqZAo" node="4z0AnX8176H" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7_$HJtBtOwo" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:7_$HJtBs0P$" resolve="isSynthesized" />
@@ -657,7 +657,7 @@
                     <node concept="3clFbF" id="69zaTr1W0aA" role="3cqZAp">
                       <node concept="2OqwBi" id="69zaTr1W0zH" role="3clFbG">
                         <node concept="37vLTw" id="69zaTr1W0a_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176J" />
+                          <ref role="3cqZAo" node="4z0AnX8176J" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="69zaTr1W0Ed" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:69zaTr1W0u$" resolve="isGeneric" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
index b5eb5c38e0..f3befd323f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps
@@ -13063,7 +13063,7 @@
                             <node concept="37vLTI" id="5Iz9nTHJecv" role="3clFbG">
                               <node concept="2OqwBi" id="5Iz9nTHJtDh" role="37vLTx">
                                 <node concept="37vLTw" id="5Iz9nTHJlNT" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8177f" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJAs3" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:24Fec4173Ut" resolve="optionValue" />
@@ -13071,7 +13071,7 @@
                               </node>
                               <node concept="2OqwBi" id="5Iz9nTHIVJ3" role="37vLTJ">
                                 <node concept="37vLTw" id="5Iz9nTHIOnm" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8177f" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJ2M4" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
@@ -13084,7 +13084,7 @@
                               <node concept="10Nm6u" id="5Iz9nTHJMge" role="37vLTx" />
                               <node concept="2OqwBi" id="5Iz9nTHJIsV" role="37vLTJ">
                                 <node concept="37vLTw" id="5Iz9nTHJIsW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8177f" />
+                                  <ref role="3cqZAo" node="4z0AnX8177f" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5Iz9nTHJM3e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:24Fec4173Ut" resolve="optionValue" />
@@ -13097,7 +13097,7 @@
                           <node concept="10Nm6u" id="7759dY8XFmS" role="3uHU7w" />
                           <node concept="2OqwBi" id="7759dY8XE$o" role="3uHU7B">
                             <node concept="37vLTw" id="7759dY8XEj1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8177f" />
+                              <ref role="3cqZAo" node="4z0AnX8177f" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7759dY8XF6s" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
index 468400a2a0..fed3660a1e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
@@ -5228,7 +5228,7 @@
                   <node concept="3clFbF" id="5bElvpNid68" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNie9a" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNiegH" role="3K4E3e">
-                        <ref role="3cqZAo" node="4z0AnX8177h" />
+                        <ref role="3cqZAo" node="4z0AnX8177h" resolve="next" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNienQ" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNicmR" resolve="min" />
@@ -5236,7 +5236,7 @@
                       <node concept="1rXfSq" id="5bElvpNid67" role="3K4Cdx">
                         <ref role="37wK5l" node="2NHHcg2EXov" resolve="less" />
                         <node concept="37vLTw" id="5bElvpNidvP" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX8177h" />
+                          <ref role="3cqZAo" node="4z0AnX8177h" resolve="next" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNidKr" role="37wK5m">
                           <ref role="3cqZAo" node="5bElvpNicmR" resolve="min" />
@@ -5288,7 +5288,7 @@
                   <node concept="3clFbF" id="5bElvpNify_" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNifyA" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNifyB" role="3K4E3e">
-                        <ref role="3cqZAo" node="4z0AnX8177j" />
+                        <ref role="3cqZAo" node="4z0AnX8177j" resolve="next" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNifyC" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNifyG" resolve="min" />
@@ -5296,7 +5296,7 @@
                       <node concept="1rXfSq" id="5bElvpNifyD" role="3K4Cdx">
                         <ref role="37wK5l" node="2NHHcg2F6z3" resolve="greater" />
                         <node concept="37vLTw" id="5bElvpNifyE" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX8177j" />
+                          <ref role="3cqZAo" node="4z0AnX8177j" resolve="next" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNifyF" role="37wK5m">
                           <ref role="3cqZAo" node="5bElvpNifyG" resolve="min" />
@@ -5348,7 +5348,7 @@
                   <node concept="3clFbF" id="5bElvpNhVHi" role="3cqZAp">
                     <node concept="3K4zz7" id="5bElvpNhXxi" role="3clFbG">
                       <node concept="37vLTw" id="5bElvpNhXFT" role="3K4E3e">
-                        <ref role="3cqZAo" node="4z0AnX8177l" />
+                        <ref role="3cqZAo" node="4z0AnX8177l" resolve="next" />
                       </node>
                       <node concept="37vLTw" id="5bElvpNhXQf" role="3K4GZi">
                         <ref role="3cqZAo" node="5bElvpNhV9C" resolve="max" />
@@ -5358,7 +5358,7 @@
                           <ref role="3cqZAo" node="5bElvpNhV9C" resolve="max" />
                         </node>
                         <node concept="37vLTw" id="5bElvpNhVHh" role="3uHU7B">
-                          <ref role="3cqZAo" node="4z0AnX8177l" />
+                          <ref role="3cqZAo" node="4z0AnX8177l" resolve="next" />
                         </node>
                       </node>
                     </node>
@@ -11211,7 +11211,7 @@
                             <node concept="2OqwBi" id="5I_8B5uitzu" role="3uHU7B">
                               <node concept="2OqwBi" id="5I_8B5uisz3" role="2Oq$k0">
                                 <node concept="37vLTw" id="5I_8B5uisfp" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8177n" />
+                                  <ref role="3cqZAo" node="4z0AnX8177n" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5I_8B5uit0i" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11227,7 +11227,7 @@
                               <node concept="2OqwBi" id="5I_8B5uioBI" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5I_8B5uinCx" role="2Oq$k0">
                                   <node concept="37vLTw" id="5I_8B5uinko" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8177n" />
+                                    <ref role="3cqZAo" node="4z0AnX8177n" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5I_8B5uio42" role="2OqNvi">
                                     <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11240,7 +11240,7 @@
                                   <node concept="2OqwBi" id="5I_8B5uiyEJ" role="25KhWn">
                                     <node concept="2OqwBi" id="5I_8B5uixe_" role="2Oq$k0">
                                       <node concept="37vLTw" id="5I_8B5uiwLG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8177n" />
+                                        <ref role="3cqZAo" node="4z0AnX8177n" resolve="it" />
                                       </node>
                                       <node concept="1mfA1w" id="5I_8B5uiy0$" role="2OqNvi" />
                                     </node>
@@ -11331,7 +11331,7 @@
                           <node concept="2OqwBi" id="5I_8B5uimz2" role="3clFbG">
                             <node concept="2OqwBi" id="5I_8B5uimz3" role="2Oq$k0">
                               <node concept="37vLTw" id="5I_8B5uimz4" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177p" />
+                                <ref role="3cqZAo" node="4z0AnX8177p" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="4llm6dDWJPh" role="2OqNvi" />
                             </node>
@@ -11421,7 +11421,7 @@
                             <node concept="2OqwBi" id="5I_8B5ui00L" role="3fr31v">
                               <node concept="2OqwBi" id="5I_8B5ui00M" role="2Oq$k0">
                                 <node concept="37vLTw" id="5I_8B5ui00N" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8177r" />
+                                  <ref role="3cqZAo" node="4z0AnX8177r" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="5I_8B5ui00O" role="2OqNvi" />
                               </node>
@@ -11513,7 +11513,7 @@
                           <node concept="2OqwBi" id="6VfJ$$eJWm_" role="3clFbG">
                             <node concept="2OqwBi" id="6VfJ$$eJWmA" role="2Oq$k0">
                               <node concept="37vLTw" id="6VfJ$$eJWmB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177t" />
+                                <ref role="3cqZAo" node="4z0AnX8177t" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6VfJ$$eJWmC" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11606,7 +11606,7 @@
                           <node concept="2OqwBi" id="2nByCcy04EG" role="3clFbG">
                             <node concept="2OqwBi" id="2nByCcy04EH" role="2Oq$k0">
                               <node concept="37vLTw" id="2nByCcy04EI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177v" />
+                                <ref role="3cqZAo" node="4z0AnX8177v" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2nByCcy04EJ" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11699,7 +11699,7 @@
                           <node concept="2OqwBi" id="2nByCcy055m" role="3clFbG">
                             <node concept="2OqwBi" id="2nByCcy055n" role="2Oq$k0">
                               <node concept="37vLTw" id="2nByCcy055o" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177x" />
+                                <ref role="3cqZAo" node="4z0AnX8177x" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2nByCcy055p" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:4rZeNQ6OJ5M" resolve="expr" />
@@ -11833,7 +11833,7 @@
                         <node concept="3clFbF" id="73INLerZ8hK" role="3cqZAp">
                           <node concept="2OqwBi" id="73INLerZ8hL" role="3clFbG">
                             <node concept="37vLTw" id="73INLerZ8hM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8177z" />
+                              <ref role="3cqZAo" node="4z0AnX8177z" resolve="it" />
                             </node>
                             <node concept="liA8E" id="73INLerZ8hN" role="2OqNvi">
                               <ref role="37wK5l" node="73INLerZ8i4" resolve="getPriorityLevel" />
@@ -12778,7 +12778,7 @@
                       <node concept="3clFbF" id="UwUtc1okwd" role="3cqZAp">
                         <node concept="2OqwBi" id="UwUtc1okwe" role="3clFbG">
                           <node concept="37vLTw" id="UwUtc1okwf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8177_" />
+                            <ref role="3cqZAo" node="4z0AnX8177_" resolve="it" />
                           </node>
                           <node concept="liA8E" id="UwUtc1okwg" role="2OqNvi">
                             <ref role="37wK5l" node="UwUtc1ny1F" resolve="proposals" />
@@ -12804,7 +12804,7 @@
                   <node concept="3clFbS" id="UwUtc1okwn" role="1bW5cS">
                     <node concept="3clFbF" id="UwUtc1okwo" role="3cqZAp">
                       <node concept="37vLTw" id="UwUtc1okwq" role="3clFbG">
-                        <ref role="3cqZAo" node="4z0AnX8177B" />
+                        <ref role="3cqZAo" node="4z0AnX8177B" resolve="it" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index 0974341dfb..d3b90b09b5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -3061,7 +3061,7 @@
                         <node concept="TSZUe" id="5aHkq2w3izl" role="2OqNvi">
                           <node concept="2OqwBi" id="5aHkq2w3izm" role="25WWJ7">
                             <node concept="37vLTw" id="5aHkq2w3izn" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8176L" />
+                              <ref role="3cqZAo" node="4z0AnX8176L" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5aHkq2w3izo" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:69zaTr1V8fI" resolve="expr" />
@@ -3216,7 +3216,7 @@
                                           <node concept="TSZUe" id="5aHkq2wa6L2" role="2OqNvi">
                                             <node concept="2OqwBi" id="5aHkq2wa8uE" role="25WWJ7">
                                               <node concept="37vLTw" id="5aHkq2wa7su" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8176N" />
+                                                <ref role="3cqZAo" node="4z0AnX8176N" resolve="it" />
                                               </node>
                                               <node concept="1$rogu" id="5aHkq2wa95T" role="2OqNvi" />
                                             </node>
@@ -3847,7 +3847,7 @@
                           <node concept="3fqX7Q" id="7ZvWWnqM20L" role="3clFbG">
                             <node concept="2OqwBi" id="7ZvWWnqM20M" role="3fr31v">
                               <node concept="37vLTw" id="7ZvWWnqM20N" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8176P" />
+                                <ref role="3cqZAo" node="4z0AnX8176P" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="7ZvWWnqM20O" role="2OqNvi">
                                 <node concept="chp4Y" id="7ZvWWnqM20P" role="cj9EA">
@@ -3970,7 +3970,7 @@
                     <node concept="3clFbF" id="7ZvWWnqLX0Z" role="3cqZAp">
                       <node concept="2OqwBi" id="7ZvWWnqLXc8" role="3clFbG">
                         <node concept="37vLTw" id="7ZvWWnqLX0Y" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8176R" />
+                          <ref role="3cqZAo" node="4z0AnX8176R" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="7ZvWWnqLXiQ" role="2OqNvi">
                           <node concept="chp4Y" id="7ZvWWnqLXq$" role="cj9EA">
@@ -4040,7 +4040,7 @@
                           <node concept="3clFbF" id="12WRc28WT7l" role="3cqZAp">
                             <node concept="2OqwBi" id="12WRc28WUYc" role="3clFbG">
                               <node concept="37vLTw" id="12WRc28WTWg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8176T" />
+                                <ref role="3cqZAo" node="4z0AnX8176T" resolve="existing" />
                               </node>
                               <node concept="2qgKlT" id="12WRc28WVg9" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:69zaTr1Z8aS" resolve="isSameAs" />
@@ -4120,7 +4120,7 @@
                           <node concept="3fqX7Q" id="6bG6MAG5yIF" role="3clFbG">
                             <node concept="2OqwBi" id="6bG6MAG5yIH" role="3fr31v">
                               <node concept="37vLTw" id="6bG6MAG5yII" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8176V" />
+                                <ref role="3cqZAo" node="4z0AnX8176V" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6bG6MAG5yIJ" role="2OqNvi">
                                 <node concept="chp4Y" id="6bG6MAG5yIK" role="cj9EA">
@@ -4228,7 +4228,7 @@
                   <node concept="3clFbF" id="12WRc28W_pu" role="3cqZAp">
                     <node concept="2OqwBi" id="12WRc28W_sX" role="3clFbG">
                       <node concept="37vLTw" id="12WRc28W_pt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8176X" />
+                        <ref role="3cqZAo" node="4z0AnX8176X" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="12WRc28W_wB" role="2OqNvi">
                         <node concept="chp4Y" id="12WRc28W_$1" role="cj9EA">
@@ -4324,7 +4324,7 @@
                                   <ref role="cht4Q" to="hm2y:7VuYlCQZ3ll" resolve="JoinType" />
                                 </node>
                                 <node concept="37vLTw" id="bA6f$pFc_c" role="1m5AlR">
-                                  <ref role="3cqZAo" node="4z0AnX81771" />
+                                  <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                                 </node>
                               </node>
                               <node concept="3Tsc0h" id="bA6f$pFc_d" role="2OqNvi">
@@ -4343,7 +4343,7 @@
                     </node>
                     <node concept="2OqwBi" id="bA6f$py8y1" role="3clFbw">
                       <node concept="37vLTw" id="bA6f$py8y2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX81771" />
+                        <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="bA6f$py8y3" role="2OqNvi">
                         <node concept="chp4Y" id="bA6f$py8y4" role="cj9EA">
@@ -4380,7 +4380,7 @@
                                     <ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
                                   </node>
                                   <node concept="37vLTw" id="bA6f$pDcy$" role="1m5AlR">
-                                    <ref role="3cqZAo" node="4z0AnX81771" />
+                                    <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="3TrEf2" id="bA6f$pGoiP" role="2OqNvi">
@@ -4412,7 +4412,7 @@
                       </node>
                       <node concept="2OqwBi" id="bA6f$pBynU" role="3eO9$A">
                         <node concept="37vLTw" id="bA6f$pBynV" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81771" />
+                          <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="bA6f$pBynW" role="2OqNvi">
                           <node concept="chp4Y" id="bA6f$pBynX" role="cj9EA">
@@ -4432,7 +4432,7 @@
                                 </node>
                                 <node concept="TSZUe" id="bA6f$pyhQ_" role="2OqNvi">
                                   <node concept="37vLTw" id="bA6f$pyhQA" role="25WWJ7">
-                                    <ref role="3cqZAo" node="4z0AnX81771" />
+                                    <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -4449,12 +4449,12 @@
                                     <node concept="3clFbF" id="bA6f$pyhQH" role="3cqZAp">
                                       <node concept="2OqwBi" id="bA6f$pyhQM" role="3clFbG">
                                         <node concept="37vLTw" id="bA6f$pyhQN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8176Z" />
+                                          <ref role="3cqZAo" node="4z0AnX8176Z" resolve="t" />
                                         </node>
                                         <node concept="2qgKlT" id="bA6f$pL_pv" role="2OqNvi">
                                           <ref role="37wK5l" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
                                           <node concept="37vLTw" id="bA6f$pLC3g" role="37wK5m">
-                                            <ref role="3cqZAo" node="4z0AnX81771" />
+                                            <ref role="3cqZAo" node="4z0AnX81771" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
@@ -5041,7 +5041,7 @@
                             <node concept="1rXfSq" id="KoRsm$peAf" role="3clFbG">
                               <ref role="37wK5l" node="KoRsm$oTxn" resolve="areTypesComparable" />
                               <node concept="37vLTw" id="KoRsm$peAg" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX81773" />
+                                <ref role="3cqZAo" node="4z0AnX81773" resolve="joined" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$peAh" role="37wK5m">
                                 <ref role="3cqZAo" node="7KDVkAErx_$" resolve="rightType" />
@@ -5239,7 +5239,7 @@
                                 <ref role="3cqZAo" node="7KDVkAErvHj" resolve="leftType" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$pwLD" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX81775" />
+                                <ref role="3cqZAo" node="4z0AnX81775" resolve="joined" />
                               </node>
                               <node concept="37vLTw" id="KoRsm$pwLE" role="37wK5m">
                                 <ref role="3cqZAo" node="7KDVkAErzPC" resolve="isPrimitiveTypeComparable" />
@@ -8297,7 +8297,7 @@
                                 <ref role="2Gs0qQ" node="7VuYlCR5J9z" resolve="tt" />
                               </node>
                               <node concept="37vLTw" id="7VuYlCR5Rc1" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX81777" />
+                                <ref role="3cqZAo" node="4z0AnX81777" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -8909,7 +8909,7 @@
                       <node concept="10Nm6u" id="37t_e$LfDpj" role="3uHU7w" />
                       <node concept="2OqwBi" id="37t_e$LfAg9" role="3uHU7B">
                         <node concept="37vLTw" id="37t_e$Lf_MW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX81779" />
+                          <ref role="3cqZAo" node="4z0AnX81779" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="37t_e$LfBaZ" role="2OqNvi">
                           <ref role="3Tt5mk" to="4kwy:cJpacq40jC" resolve="optionalName" />
@@ -10655,7 +10655,7 @@
                         </node>
                         <node concept="TSZUe" id="2V2blxGMIvo" role="2OqNvi">
                           <node concept="37vLTw" id="2V2blxGMJSz" role="25WWJ7">
-                            <ref role="3cqZAo" node="4z0AnX8177b" />
+                            <ref role="3cqZAo" node="4z0AnX8177b" resolve="elementType" />
                           </node>
                         </node>
                       </node>
@@ -10668,7 +10668,7 @@
                         <node concept="X8dFx" id="2V2blxGMOzA" role="2OqNvi">
                           <node concept="2OqwBi" id="2V2blxGLmcW" role="25WWJ7">
                             <node concept="37vLTw" id="2V2blxGLmcX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8177b" />
+                              <ref role="3cqZAo" node="4z0AnX8177b" resolve="elementType" />
                             </node>
                             <node concept="2qgKlT" id="2V2blxGLmcY" role="2OqNvi">
                               <ref role="37wK5l" to="pbu6:4Q4DxjDsh$t" resolve="allSupertypes" />
@@ -10719,7 +10719,7 @@
                             <ref role="2pIpSl" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
                             <node concept="36biLy" id="2V2blxGLvXM" role="28nt2d">
                               <node concept="37vLTw" id="2V2blxGLw9G" role="36biLW">
-                                <ref role="3cqZAo" node="4z0AnX8177d" />
+                                <ref role="3cqZAo" node="4z0AnX8177d" resolve="types" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
index 87f95314a7..8309f66480 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps
@@ -2874,7 +2874,7 @@
                       <node concept="TSZUe" id="4_KMC82Eb$w" role="2OqNvi">
                         <node concept="2OqwBi" id="4_KMC82Eb$x" role="25WWJ7">
                           <node concept="37vLTw" id="4_KMC82Eb$y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8177D" />
+                            <ref role="3cqZAo" node="4z0AnX8177D" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4_KMC82Eb$z" role="2OqNvi">
                             <ref role="3Tt5mk" to="700h:7kYh9WszdHE" resolve="key" />
@@ -2891,7 +2891,7 @@
                       <node concept="TSZUe" id="4_KMC82Eb$B" role="2OqNvi">
                         <node concept="2OqwBi" id="4_KMC82Eb$C" role="25WWJ7">
                           <node concept="37vLTw" id="4_KMC82Eb$D" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8177D" />
+                            <ref role="3cqZAo" node="4z0AnX8177D" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4_KMC82Eb$E" role="2OqNvi">
                             <ref role="3Tt5mk" to="700h:7kYh9WszdHG" resolve="val" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
index 1f2fc3d91c..98b809f82b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
@@ -550,7 +550,7 @@
                                 <node concept="2OqwBi" id="5hullqu1Knj" role="2Oq$k0">
                                   <node concept="2OqwBi" id="5hullqu1Knk" role="2Oq$k0">
                                     <node concept="37vLTw" id="5hullqu1Knl" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8177K" />
+                                      <ref role="3cqZAo" node="4z0AnX8177K" resolve="row" />
                                     </node>
                                     <node concept="3Tsc0h" id="cPLa7FpZwu" role="2OqNvi">
                                       <ref role="3TtcxE" to="e9k1:cPLa7FpcRm" resolve="cells" />
@@ -566,7 +566,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="5hullqu1Knt" role="3uHU7B">
                                               <node concept="37vLTw" id="5hullqu1Knu" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8177G" />
+                                                <ref role="3cqZAo" node="4z0AnX8177G" resolve="c" />
                                               </node>
                                               <node concept="3TrEf2" id="cPLa7FpZXy" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -588,7 +588,7 @@
                                       <node concept="3clFbF" id="5hullqu1Kn_" role="3cqZAp">
                                         <node concept="2OqwBi" id="5hullqu1KnA" role="3clFbG">
                                           <node concept="37vLTw" id="5hullqu1KnB" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8177I" />
+                                            <ref role="3cqZAo" node="4z0AnX8177I" resolve="c" />
                                           </node>
                                           <node concept="3YRAZt" id="5hullqu1KnC" role="2OqNvi" />
                                         </node>
@@ -816,7 +816,7 @@
                             </node>
                             <node concept="2OqwBi" id="4_sn_QHl$rY" role="3uHU7B">
                               <node concept="37vLTw" id="4_sn_QHl$by" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177M" />
+                                <ref role="3cqZAo" node="4z0AnX8177M" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="cPLa7Fqhd2" role="2OqNvi">
                                 <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -923,7 +923,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5yPljRY0Pmi" role="3uHU7B">
                                     <node concept="37vLTw" id="5yPljRY0Pmj" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8177O" />
+                                      <ref role="3cqZAo" node="4z0AnX8177O" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5yPljRY0Pmk" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
index 6f3882d09e..6654add726 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.migration.mps
@@ -236,7 +236,7 @@
                           <node concept="2OqwBi" id="2OsjbbtceDo" role="3clFbG">
                             <node concept="2OqwBi" id="2Osjbbtce0F" role="2Oq$k0">
                               <node concept="37vLTw" id="2OsjbbtcdCh" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX81780" />
+                                <ref role="3cqZAo" node="4z0AnX81780" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2OsjbbtcemI" role="2OqNvi">
                                 <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
@@ -266,7 +266,7 @@
                                 <node concept="36biLy" id="2Osjbbtchld" role="28nt2d">
                                   <node concept="2OqwBi" id="2OsjbbtchMu" role="36biLW">
                                     <node concept="37vLTw" id="2Osjbbtchqb" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX81782" />
+                                      <ref role="3cqZAo" node="4z0AnX81782" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2Osjbbtcif2" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
@@ -278,7 +278,7 @@
                           </node>
                           <node concept="2OqwBi" id="2Osjbbtcg59" role="37vLTJ">
                             <node concept="37vLTw" id="2OsjbbtcfRF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81782" />
+                              <ref role="3cqZAo" node="4z0AnX81782" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2Osjbbtcg$o" role="2OqNvi">
                               <ref role="3Tt5mk" to="e9k1:7F9023_Orfu" resolve="col" />
@@ -291,7 +291,7 @@
                           <node concept="10Nm6u" id="2OsjbbtcjPM" role="37vLTx" />
                           <node concept="2OqwBi" id="2OsjbbtcivV" role="37vLTJ">
                             <node concept="37vLTw" id="2Osjbbtcis9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX81782" />
+                              <ref role="3cqZAo" node="4z0AnX81782" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2Osjbbtcj3e" role="2OqNvi">
                               <ref role="3Tt5mk" to="e9k1:stdmzxm7Y5" resolve="col_old" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
index acda62fb09..f7cd2e4a8f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.typesystem.mps
@@ -360,7 +360,7 @@
                       <node concept="2OqwBi" id="4PRpvcZvBVD" role="2MkoU_">
                         <node concept="2OqwBi" id="4PRpvcZvBxb" role="2Oq$k0">
                           <node concept="37vLTw" id="4PRpvcZvBlZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8177Q" />
+                            <ref role="3cqZAo" node="4z0AnX8177Q" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4PRpvcZvBFF" role="2OqNvi">
                             <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -377,7 +377,7 @@
                       </node>
                       <node concept="2OqwBi" id="4PRpvcZw7qS" role="1urrMF">
                         <node concept="37vLTw" id="4PRpvcZvD72" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8177Q" />
+                          <ref role="3cqZAo" node="4z0AnX8177Q" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4PRpvcZw7_B" role="2OqNvi">
                           <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -478,11 +478,11 @@
                                     <node concept="1Wc70l" id="2KRUNf1mG2W" role="3clFbG">
                                       <node concept="17R0WA" id="2KRUNf1mG2X" role="3uHU7w">
                                         <node concept="37vLTw" id="2KRUNf1mG2Y" role="3uHU7w">
-                                          <ref role="3cqZAo" node="4z0AnX8177U" />
+                                          <ref role="3cqZAo" node="4z0AnX8177U" resolve="col" />
                                         </node>
                                         <node concept="2OqwBi" id="2KRUNf1mG2Z" role="3uHU7B">
                                           <node concept="37vLTw" id="2KRUNf1mG30" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8177S" />
+                                            <ref role="3cqZAo" node="4z0AnX8177S" resolve="row" />
                                           </node>
                                           <node concept="3TrEf2" id="2KRUNf1mG31" role="2OqNvi">
                                             <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -492,7 +492,7 @@
                                       <node concept="2OqwBi" id="2KRUNf1mG32" role="3uHU7B">
                                         <node concept="2OqwBi" id="2KRUNf1mG33" role="2Oq$k0">
                                           <node concept="37vLTw" id="2KRUNf1mG34" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX8177S" />
+                                            <ref role="3cqZAo" node="4z0AnX8177S" resolve="row" />
                                           </node>
                                           <node concept="3TrEf2" id="2KRUNf1mG35" role="2OqNvi">
                                             <ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
@@ -541,7 +541,7 @@
                           <node concept="2OqwBi" id="2KRUNf1mNSP" role="3clFbG">
                             <node concept="2OqwBi" id="2KRUNf1mMwl" role="2Oq$k0">
                               <node concept="37vLTw" id="2KRUNf1mL8f" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8177Y" />
+                                <ref role="3cqZAo" node="4z0AnX8177Y" resolve="defaultValues" />
                               </node>
                               <node concept="7r0gD" id="2KRUNf1mNvp" role="2OqNvi">
                                 <node concept="3cmrfG" id="2KRUNf1mND7" role="7T0AP">
@@ -557,7 +557,7 @@
                                       <property role="Xl_RC" value="only one empty input value per column is allowed." />
                                     </node>
                                     <node concept="37vLTw" id="2KRUNf1mR8t" role="1urrMF">
-                                      <ref role="3cqZAo" node="4z0AnX8177W" />
+                                      <ref role="3cqZAo" node="4z0AnX8177W" resolve="def" />
                                     </node>
                                   </node>
                                 </node>
@@ -576,7 +576,7 @@
                         </node>
                         <node concept="2OqwBi" id="2KRUNf1mIsD" role="3uHU7B">
                           <node concept="37vLTw" id="2KRUNf1mHlr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8177Y" />
+                            <ref role="3cqZAo" node="4z0AnX8177Y" resolve="defaultValues" />
                           </node>
                           <node concept="34oBXx" id="2KRUNf1mJG3" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
index 2e244e4987..67615455dc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/behavior.mps
@@ -679,11 +679,11 @@
                                 <node concept="3clFbF" id="2vkvJYSR2su" role="3cqZAp">
                                   <node concept="3clFbC" id="2vkvJYSR2sv" role="3clFbG">
                                     <node concept="37vLTw" id="2vkvJYSR2sw" role="3uHU7w">
-                                      <ref role="3cqZAo" node="4z0AnX81786" />
+                                      <ref role="3cqZAo" node="4z0AnX81786" resolve="p" />
                                     </node>
                                     <node concept="2OqwBi" id="2vkvJYSR2sx" role="3uHU7B">
                                       <node concept="37vLTw" id="2vkvJYSR2sy" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX81784" />
+                                        <ref role="3cqZAo" node="4z0AnX81784" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="2vkvJYSR2sz" role="2OqNvi">
                                         <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
@@ -901,7 +901,7 @@
                   <node concept="3clFbF" id="2nByCcxAqyQ" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxAqHg" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxAqyP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178a" />
+                        <ref role="3cqZAo" node="4z0AnX8178a" resolve="ipr" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxArcZ" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxArhv" role="1P9ThW">
@@ -927,7 +927,7 @@
                                             <node concept="2OqwBi" id="2nByCcxAEwb" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxCr36" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxCcrS" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8178a" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178a" resolve="ipr" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxCr_f" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:4YhD5cZsmN4" resolve="port" />
@@ -939,7 +939,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxACcb" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxABUf" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX81788" />
+                                                <ref role="3cqZAo" node="4z0AnX81788" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxACEG" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -997,7 +997,7 @@
                   <node concept="3clFbF" id="2nByCcxAFlo" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxAFlp" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxAFlq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178e" />
+                        <ref role="3cqZAo" node="4z0AnX8178e" resolve="pr" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxAFlr" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxAFls" role="1P9ThW">
@@ -1023,7 +1023,7 @@
                                             <node concept="2OqwBi" id="2nByCcxAFlD" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxCAL_" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxCc9W" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8178e" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178e" resolve="pr" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxCE7u" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:2vkvJYSMWJA" resolve="param" />
@@ -1035,7 +1035,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxAFlG" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxAFlH" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8178c" />
+                                                <ref role="3cqZAo" node="4z0AnX8178c" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxAFlI" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1716,7 +1716,7 @@
                   <node concept="3clFbF" id="2nByCcxUvdy" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxUvdz" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxUvd$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178i" />
+                        <ref role="3cqZAo" node="4z0AnX8178i" resolve="ipr" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxUvd_" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxUvdA" role="1P9ThW">
@@ -1742,7 +1742,7 @@
                                             <node concept="2OqwBi" id="2nByCcxUvdN" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxUvdO" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxUvdP" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8178i" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178i" resolve="ipr" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxUvdQ" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:4YhD5cZsmN4" resolve="port" />
@@ -1754,7 +1754,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxUvdS" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxUvdT" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8178g" />
+                                                <ref role="3cqZAo" node="4z0AnX8178g" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxUvdU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1812,7 +1812,7 @@
                   <node concept="3clFbF" id="2nByCcxUveb" role="3cqZAp">
                     <node concept="2OqwBi" id="2nByCcxUvec" role="3clFbG">
                       <node concept="37vLTw" id="2nByCcxUved" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178m" />
+                        <ref role="3cqZAo" node="4z0AnX8178m" resolve="pr" />
                       </node>
                       <node concept="1P9Npp" id="2nByCcxUvee" role="2OqNvi">
                         <node concept="2pJPEk" id="2nByCcxUvef" role="1P9ThW">
@@ -1838,7 +1838,7 @@
                                             <node concept="2OqwBi" id="2nByCcxUves" role="3uHU7w">
                                               <node concept="2OqwBi" id="2nByCcxUvet" role="2Oq$k0">
                                                 <node concept="37vLTw" id="2nByCcxUveu" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8178m" />
+                                                  <ref role="3cqZAo" node="4z0AnX8178m" resolve="pr" />
                                                 </node>
                                                 <node concept="3TrEf2" id="2nByCcxUvev" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="gx5r:2vkvJYSMWJA" resolve="param" />
@@ -1850,7 +1850,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="2nByCcxUvex" role="3uHU7B">
                                               <node concept="37vLTw" id="2nByCcxUvey" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8178k" />
+                                                <ref role="3cqZAo" node="4z0AnX8178k" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2nByCcxUvez" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1924,7 +1924,7 @@
                       <node concept="3clFbF" id="2vkvJYTf3Z9" role="3cqZAp">
                         <node concept="2OqwBi" id="2vkvJYTf3Za" role="3clFbG">
                           <node concept="37vLTw" id="2vkvJYTf3Zb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8178o" />
+                            <ref role="3cqZAo" node="4z0AnX8178o" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2vkvJYTf3Zc" role="2OqNvi">
                             <ref role="37wK5l" node="5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -2009,7 +2009,7 @@
                               </node>
                               <node concept="2OqwBi" id="2nByCcxISTN" role="3uHU7B">
                                 <node concept="37vLTw" id="2nByCcxIS_t" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8178q" />
+                                  <ref role="3cqZAo" node="4z0AnX8178q" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2nByCcxITH4" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2182,7 +2182,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="2nByCcxTyMW" role="3uHU7B">
                                     <node concept="37vLTw" id="2nByCcxTysP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8178s" />
+                                      <ref role="3cqZAo" node="4z0AnX8178s" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2nByCcxTzgA" role="2OqNvi">
                                       <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
@@ -2246,7 +2246,7 @@
                         <node concept="3clFbF" id="2vkvJYTf_OK" role="3cqZAp">
                           <node concept="2OqwBi" id="2vkvJYTf_OL" role="3clFbG">
                             <node concept="37vLTw" id="2vkvJYTf_OM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX8178u" />
+                              <ref role="3cqZAo" node="4z0AnX8178u" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2vkvJYTf_ON" role="2OqNvi">
                               <ref role="37wK5l" node="5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
index 7361029ca0..7bc5c3bc3e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps
@@ -1087,7 +1087,7 @@
                                           <node concept="17R0WA" id="3_milxHPcFW" role="3clFbG">
                                             <node concept="2OqwBi" id="3_milxHPb7f" role="3uHU7B">
                                               <node concept="37vLTw" id="3_milxHPaSw" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8178w" />
+                                                <ref role="3cqZAo" node="4z0AnX8178w" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="3_milxHPbGU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1247,7 +1247,7 @@
                                           <node concept="17R0WA" id="3_milxHPdxm" role="3clFbG">
                                             <node concept="2OqwBi" id="3_milxHPdxn" role="3uHU7B">
                                               <node concept="37vLTw" id="3_milxHPdxo" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8178y" />
+                                                <ref role="3cqZAo" node="4z0AnX8178y" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="3_milxHPdxp" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1388,7 +1388,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3_milxHOACM" role="3uHU7B">
                                     <node concept="37vLTw" id="3_milxHOAhq" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8178$" />
+                                      <ref role="3cqZAo" node="4z0AnX8178$" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="3_milxHOBGd" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1446,7 +1446,7 @@
                                 <node concept="3clFbF" id="2nByCcxyQw3" role="3cqZAp">
                                   <node concept="2OqwBi" id="2nByCcxyQT5" role="3clFbG">
                                     <node concept="37vLTw" id="2nByCcxyQw2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8178A" />
+                                      <ref role="3cqZAo" node="4z0AnX8178A" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="2nByCcxyRtj" role="2OqNvi">
                                       <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -1543,7 +1543,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="2nByCcxzicC" role="3uHU7B">
                                       <node concept="37vLTw" id="2nByCcxzicD" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8178C" />
+                                        <ref role="3cqZAo" node="4z0AnX8178C" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="2nByCcxzicE" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1593,7 +1593,7 @@
                                 <node concept="3clFbF" id="2nByCcxzlY_" role="3cqZAp">
                                   <node concept="2OqwBi" id="2nByCcxzlYA" role="3clFbG">
                                     <node concept="37vLTw" id="2nByCcxzlYB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8178E" />
+                                      <ref role="3cqZAo" node="4z0AnX8178E" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="2nByCcxzlYC" role="2OqNvi">
                                       <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -1917,7 +1917,7 @@
                       <node concept="3clFbF" id="30L$xlcesJh" role="3cqZAp">
                         <node concept="2OqwBi" id="30L$xlcesUF" role="3clFbG">
                           <node concept="37vLTw" id="30L$xlcesJg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8178G" />
+                            <ref role="3cqZAo" node="4z0AnX8178G" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="30L$xlcet9v" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:30L$xlcejQ2" resolve="connectsToInstance" />
@@ -1939,7 +1939,7 @@
                     <node concept="3clFbF" id="30L$xlceuKv" role="3cqZAp">
                       <node concept="2OqwBi" id="30L$xlceuUD" role="3clFbG">
                         <node concept="37vLTw" id="30L$xlceuKu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8178I" />
+                          <ref role="3cqZAo" node="4z0AnX8178I" resolve="it" />
                         </node>
                         <node concept="3YRAZt" id="30L$xlcevpA" role="2OqNvi" />
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
index e90cbc3201..5f38fa4a06 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/typesystem.mps
@@ -290,7 +290,7 @@
                       <node concept="3clFbF" id="5Q9FzcI57n0" role="3cqZAp">
                         <node concept="2OqwBi" id="5Q9FzcI57n1" role="3clFbG">
                           <node concept="37vLTw" id="5Q9FzcI57n2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8178K" />
+                            <ref role="3cqZAo" node="4z0AnX8178K" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5Q9FzcI57n3" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -401,7 +401,7 @@
                       <node concept="3clFbF" id="5Q9FzcI6uoY" role="3cqZAp">
                         <node concept="2OqwBi" id="5Q9FzcI6uoZ" role="3clFbG">
                           <node concept="37vLTw" id="5Q9FzcI6up0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8178M" />
+                            <ref role="3cqZAo" node="4z0AnX8178M" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="5Q9FzcI6up1" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
index e3bbf2ef52..6d2814f616 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/intentions.mps
@@ -229,7 +229,7 @@
                   <node concept="3clFbF" id="2c2AzQcAh15" role="3cqZAp">
                     <node concept="2OqwBi" id="2c2AzQcAhf0" role="3clFbG">
                       <node concept="37vLTw" id="2c2AzQcAh14" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178Q" />
+                        <ref role="3cqZAo" node="4z0AnX8178Q" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="2c2AzQcAhF3" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2c2AzQc_YDC" resolve="takeScreenshot" />
@@ -383,7 +383,7 @@
                       <node concept="3clFbF" id="2c2AzQddjhu" role="3cqZAp">
                         <node concept="2OqwBi" id="2c2AzQddjGg" role="3clFbG">
                           <node concept="37vLTw" id="2c2AzQddjht" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8178S" />
+                            <ref role="3cqZAo" node="4z0AnX8178S" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="2c2AzQddkqI" role="2OqNvi" />
                         </node>
@@ -426,7 +426,7 @@
                     <node concept="3clFbF" id="5AlTalNHAPI" role="3cqZAp">
                       <node concept="2OqwBi" id="5AlTalNHAPJ" role="3clFbG">
                         <node concept="37vLTw" id="5AlTalNHAPK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8178U" />
+                          <ref role="3cqZAo" node="4z0AnX8178U" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="5AlTalNHAPL" role="2OqNvi">
                           <node concept="chp4Y" id="5AlTalNHAPM" role="cj9EA">
@@ -561,7 +561,7 @@
                   <node concept="3clFbF" id="5AlTalNHBc8" role="3cqZAp">
                     <node concept="2OqwBi" id="5AlTalNHBc9" role="3clFbG">
                       <node concept="37vLTw" id="5AlTalNHBca" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178W" />
+                        <ref role="3cqZAo" node="4z0AnX8178W" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5AlTalNHBcb" role="2OqNvi">
                         <node concept="chp4Y" id="5AlTalNHBcc" role="cj9EA">
@@ -668,7 +668,7 @@
                   <node concept="3clFbF" id="C_BpXjS3OP" role="3cqZAp">
                     <node concept="2OqwBi" id="C_BpXjS3OR" role="3clFbG">
                       <node concept="37vLTw" id="C_BpXjS3OS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8178Y" />
+                        <ref role="3cqZAo" node="4z0AnX8178Y" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="C_BpXjS3OT" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2c2AzQc_YDC" resolve="takeScreenshot" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
index 40ab2d6dd3..f40f841961 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
@@ -10958,7 +10958,7 @@
                                         <node concept="2OqwBi" id="4VwmaR3wuMs" role="3clFbG">
                                           <node concept="2OqwBi" id="4VwmaR3wxuZ" role="2Oq$k0">
                                             <node concept="37vLTw" id="4VwmaR3wute" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX81791" />
+                                              <ref role="3cqZAo" node="4z0AnX81791" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4VwmaR3wxRo" role="2OqNvi">
                                               <ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
@@ -13419,7 +13419,7 @@
                                                 <node concept="2OqwBi" id="1URTIF$SSau" role="3clFbG">
                                                   <node concept="2OqwBi" id="1URTIF$SSav" role="2Oq$k0">
                                                     <node concept="37vLTw" id="1URTIF$SSaw" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4z0AnX81793" />
+                                                      <ref role="3cqZAo" node="4z0AnX81793" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1URTIF$SSax" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -13737,7 +13737,7 @@
                                                 <node concept="2OqwBi" id="1URTIF$SHGH" role="3clFbG">
                                                   <node concept="2OqwBi" id="1URTIF$SA$p" role="2Oq$k0">
                                                     <node concept="37vLTw" id="1URTIF$S$qD" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4z0AnX81795" />
+                                                      <ref role="3cqZAo" node="4z0AnX81795" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="1URTIF$SD3$" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -14129,7 +14129,7 @@
                                                 <node concept="2OqwBi" id="66if2wb6c79" role="3clFbG">
                                                   <node concept="2OqwBi" id="66if2wb6c7a" role="2Oq$k0">
                                                     <node concept="37vLTw" id="66if2wb6c7b" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4z0AnX81797" />
+                                                      <ref role="3cqZAo" node="4z0AnX81797" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="66if2wb6c7c" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -14463,7 +14463,7 @@
                                                 <node concept="2OqwBi" id="66if2wb6qSn" role="3clFbG">
                                                   <node concept="2OqwBi" id="66if2wb6qSo" role="2Oq$k0">
                                                     <node concept="37vLTw" id="66if2wb6qSp" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4z0AnX81799" />
+                                                      <ref role="3cqZAo" node="4z0AnX81799" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="66if2wb6qSq" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="hm2y:69zaTr1Z623" resolve="errorLiteral" />
@@ -19214,12 +19214,12 @@
                   <node concept="3clFbF" id="6WstIz8LVtF" role="3cqZAp">
                     <node concept="2OqwBi" id="6WstIz8LVCb" role="3clFbG">
                       <node concept="37vLTw" id="6WstIz8LVtE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX8179b" />
+                        <ref role="3cqZAo" node="4z0AnX8179b" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="6WstIz8LW1Q" role="2OqNvi">
                         <node concept="2OqwBi" id="6WstIz8LWfz" role="1P9ThW">
                           <node concept="37vLTw" id="6WstIz8LW4B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8179b" />
+                            <ref role="3cqZAo" node="4z0AnX8179b" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6WstIz8LWuj" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4CksDrmwwdX" resolve="reduce" />
@@ -19666,7 +19666,7 @@
                                     <node concept="2OqwBi" id="TA$XW2qqzk" role="2Oq$k0">
                                       <node concept="2OqwBi" id="TA$XW2qn8N" role="2Oq$k0">
                                         <node concept="37vLTw" id="TA$XW2qmNj" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8179f" />
+                                          <ref role="3cqZAo" node="4z0AnX8179f" resolve="it" />
                                         </node>
                                         <node concept="2z74zc" id="TA$XW2qp0y" role="2OqNvi" />
                                       </node>
@@ -19676,7 +19676,7 @@
                                             <node concept="3clFbF" id="TA$XW2rJOj" role="3cqZAp">
                                               <node concept="2OqwBi" id="TA$XW2rJOk" role="3clFbG">
                                                 <node concept="37vLTw" id="TA$XW2rJOl" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX8179d" />
+                                                  <ref role="3cqZAo" node="4z0AnX8179d" resolve="n" />
                                                 </node>
                                                 <node concept="2ZHEkA" id="TA$XW2rJOm" role="2OqNvi" />
                                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
index 031c41861d..cbcc623821 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/generator/template/org.iets3.core.expr.genjava.contracts@generator.mps
@@ -431,7 +431,7 @@
                               <node concept="3fqX7Q" id="kKmKqgh5Sl" role="3clFbG">
                                 <node concept="2OqwBi" id="kKmKqgh6dy" role="3fr31v">
                                   <node concept="37vLTw" id="kKmKqgh5Sy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8179i" />
+                                    <ref role="3cqZAo" node="4z0AnX8179i" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="kKmKqgh7zd" role="2OqNvi">
                                     <ref role="3TsBF5" to="1mpc:lH$PujNZqX" resolve="warning" />
@@ -461,7 +461,7 @@
                               <node concept="3clFbF" id="kKmKqghioP" role="3cqZAp">
                                 <node concept="2OqwBi" id="kKmKqghiEL" role="3clFbG">
                                   <node concept="37vLTw" id="kKmKqghioO" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8179k" />
+                                    <ref role="3cqZAo" node="4z0AnX8179k" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="kKmKqghjJF" role="2OqNvi">
                                     <ref role="3TsBF5" to="1mpc:lH$PujNZqX" resolve="warning" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
index 5ca2902fd9..72660d3e24 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps
@@ -707,7 +707,7 @@
                                           <node concept="30H73N" id="4NOdIlYzz$y" role="3uHU7w" />
                                           <node concept="2OqwBi" id="4NOdIlYzz$z" role="3uHU7B">
                                             <node concept="37vLTw" id="4NOdIlYzz$$" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8179m" />
+                                              <ref role="3cqZAo" node="4z0AnX8179m" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4NOdIlYzz$_" role="2OqNvi">
                                               <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
index 504955c786..9ac554d3b1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.messages/generator/template/org.iets3.core.expr.genjava.messages@generator.mps
@@ -625,7 +625,7 @@
                       <node concept="3clFbF" id="5LerK4rhf0N" role="3cqZAp">
                         <node concept="2OqwBi" id="5LerK4rhf0O" role="3clFbG">
                           <node concept="37vLTw" id="5LerK4rhf0P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8179o" />
+                            <ref role="3cqZAo" node="4z0AnX8179o" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5LerK4rhf0Q" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
index beae9aafab..ea5d5a7311 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes@generator.mps
@@ -4236,7 +4236,7 @@
                                           <node concept="2OqwBi" id="4ZjVa_SdrJ_" role="3uHU7w">
                                             <node concept="2OqwBi" id="4ZjVa_Sdk3K" role="2Oq$k0">
                                               <node concept="37vLTw" id="4ZjVa_SdiXc" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX8179q" />
+                                                <ref role="3cqZAo" node="4z0AnX8179q" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="4ZjVa_SdoVg" role="2OqNvi">
                                                 <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
@@ -4246,7 +4246,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="4ZjVa_Sd6$7" role="3uHU7B">
                                             <node concept="37vLTw" id="4ZjVa_Sd5sB" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8179q" />
+                                              <ref role="3cqZAo" node="4z0AnX8179q" resolve="it" />
                                             </node>
                                             <node concept="1mIQ4w" id="4ZjVa_SdbpA" role="2OqNvi">
                                               <node concept="chp4Y" id="4ZjVa_SddKT" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
index 79af0eed9b..d6b3caaddb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/org.iets3.core.expr.genjava.tests@generator.mps
@@ -545,7 +545,7 @@
                               <node concept="3fqX7Q" id="1Ds3skyz5bd" role="3clFbG">
                                 <node concept="2OqwBi" id="1Ds3skyz5SZ" role="3fr31v">
                                   <node concept="37vLTw" id="1Ds3skyz5bu" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX8179t" />
+                                    <ref role="3cqZAo" node="4z0AnX8179t" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="1Ds3skyz75X" role="2OqNvi">
                                     <node concept="chp4Y" id="1Ds3skyz7zb" role="cj9EA">
@@ -2226,7 +2226,7 @@
                                         <node concept="2OqwBi" id="27xhIwhfIhZ" role="10QFUP">
                                           <node concept="2OqwBi" id="27xhIwhfGYQ" role="2Oq$k0">
                                             <node concept="37vLTw" id="27xhIwhfGuU" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8179v" />
+                                              <ref role="3cqZAo" node="4z0AnX8179v" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="27xhIwhfHrV" role="2OqNvi">
                                               <ref role="3Tt5mk" to="av4b:6HHp2WmRVXx" resolve="item" />
@@ -2254,7 +2254,7 @@
                                 <node concept="2OqwBi" id="27xhIwhfwO2" role="2Oq$k0">
                                   <node concept="2OqwBi" id="27xhIwhfvTU" role="2Oq$k0">
                                     <node concept="37vLTw" id="27xhIwhfvDU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8179v" />
+                                      <ref role="3cqZAo" node="4z0AnX8179v" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="27xhIwhfw8C" role="2OqNvi">
                                       <ref role="3Tt5mk" to="av4b:6HHp2WmRVXx" resolve="item" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
index 4cd5810d6e..97c724d63a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/org.iets3.core.expr.genjava.toplevel@generator.mps
@@ -2759,7 +2759,7 @@
                                         <node concept="2OqwBi" id="441I_tWCz6S" role="3clFbG">
                                           <node concept="2OqwBi" id="441I_tWCvdw" role="2Oq$k0">
                                             <node concept="37vLTw" id="441I_tWCuAM" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8179x" />
+                                              <ref role="3cqZAo" node="4z0AnX8179x" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="441I_tWCxip" role="2OqNvi">
                                               <ref role="3Tt5mk" to="tpee:h9B3oxE" resolve="visibility" />
@@ -2843,7 +2843,7 @@
                                         <node concept="2OqwBi" id="2cnTPpTo0Wt" role="3clFbG">
                                           <node concept="2OqwBi" id="2cnTPpT$fUv" role="2Oq$k0">
                                             <node concept="37vLTw" id="2cnTPpT$fDo" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX8179z" />
+                                              <ref role="3cqZAo" node="4z0AnX8179z" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="2cnTPpT$gdk" role="2OqNvi">
                                               <ref role="3Tt5mk" to="yv47:4ptnK4jbqZQ" resolve="field" />
@@ -2949,7 +2949,7 @@
                       <node concept="3clFbF" id="2cnTPpTnunO" role="3cqZAp">
                         <node concept="2OqwBi" id="2cnTPpTnuTz" role="3clFbG">
                           <node concept="37vLTw" id="2cnTPpTnunN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8179_" />
+                            <ref role="3cqZAo" node="4z0AnX8179_" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="2cnTPpTnvTQ" role="2OqNvi">
                             <node concept="chp4Y" id="2cnTPpTnwct" role="cj9EA">
@@ -7432,7 +7432,7 @@
                           <node concept="2OqwBi" id="oj24_oaDOY" role="3uHU7B">
                             <node concept="2OqwBi" id="oj24_oa$_w" role="2Oq$k0">
                               <node concept="37vLTw" id="oj24_oa$lw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8179B" />
+                                <ref role="3cqZAo" node="4z0AnX8179B" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="oj24_oa$YI" role="2OqNvi">
                                 <ref role="3TtcxE" to="yv47:15mJ3JeHVgR" resolve="setters" />
@@ -7693,7 +7693,7 @@
                           <node concept="2OqwBi" id="oj24_oclfD" role="3uHU7B">
                             <node concept="2OqwBi" id="oj24_oclfE" role="2Oq$k0">
                               <node concept="37vLTw" id="oj24_oclfF" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX8179D" />
+                                <ref role="3cqZAo" node="4z0AnX8179D" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="oj24_oclfG" role="2OqNvi">
                                 <ref role="3TtcxE" to="yv47:15mJ3JeHVgR" resolve="setters" />
@@ -9493,14 +9493,14 @@
                     <node concept="2OqwBi" id="7rdMSLlhUw_" role="3clFbG">
                       <node concept="2OqwBi" id="7rdMSLlhU1K" role="2Oq$k0">
                         <node concept="37vLTw" id="7rdMSLlhTRT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8179F" />
+                          <ref role="3cqZAo" node="4z0AnX8179F" resolve="it" />
                         </node>
                         <node concept="1mfA1w" id="7rdMSLlhUea" role="2OqNvi" />
                       </node>
                       <node concept="1P9Npp" id="7rdMSLlhUC8" role="2OqNvi">
                         <node concept="2OqwBi" id="7rdMSLlhURZ" role="1P9ThW">
                           <node concept="37vLTw" id="7rdMSLlhUF3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX8179F" />
+                            <ref role="3cqZAo" node="4z0AnX8179F" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7rdMSLlhV5p" role="2OqNvi">
                             <ref role="37wK5l" to="nu60:4CksDrmwwdX" resolve="reduce" />
@@ -10419,7 +10419,7 @@
                                   <node concept="2OqwBi" id="Wka9OVqY9o" role="3uHU7B">
                                     <node concept="2OqwBi" id="Wka9OVqY9p" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVqY9q" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8179H" />
+                                        <ref role="3cqZAo" node="4z0AnX8179H" resolve="it" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVqY9r" role="2OqNvi" />
                                     </node>
@@ -10432,7 +10432,7 @@
                                   <node concept="2OqwBi" id="Wka9OVqY9u" role="3uHU7w">
                                     <node concept="2OqwBi" id="Wka9OVqY9v" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVqY9w" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8179H" />
+                                        <ref role="3cqZAo" node="4z0AnX8179H" resolve="it" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVqY9x" role="2OqNvi" />
                                     </node>
@@ -10599,7 +10599,7 @@
                                   <node concept="2OqwBi" id="Wka9OVsPNC" role="3uHU7w">
                                     <node concept="2OqwBi" id="Wka9OVsPND" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVsPNE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8179J" />
+                                        <ref role="3cqZAo" node="4z0AnX8179J" resolve="it" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVsPNF" role="2OqNvi" />
                                     </node>
@@ -10612,7 +10612,7 @@
                                   <node concept="2OqwBi" id="Wka9OVsPNI" role="3uHU7B">
                                     <node concept="2OqwBi" id="Wka9OVsPNJ" role="2Oq$k0">
                                       <node concept="37vLTw" id="Wka9OVsPNK" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8179J" />
+                                        <ref role="3cqZAo" node="4z0AnX8179J" resolve="it" />
                                       </node>
                                       <node concept="3JvlWi" id="Wka9OVsPNL" role="2OqNvi" />
                                     </node>
@@ -10717,7 +10717,7 @@
                                 <node concept="2OqwBi" id="6XE8Bc$gE4H" role="3clFbG">
                                   <node concept="2OqwBi" id="6XE8Bc$gE4I" role="2Oq$k0">
                                     <node concept="37vLTw" id="6XE8Bc$gE4J" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8179L" />
+                                      <ref role="3cqZAo" node="4z0AnX8179L" resolve="it" />
                                     </node>
                                     <node concept="3JvlWi" id="6XE8Bc$gE4K" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
index 4f59bb6f9a..7b0249ef27 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
@@ -644,7 +644,7 @@
                                     <node concept="2OqwBi" id="4kfjPBKftU6" role="3clFbG">
                                       <node concept="2OqwBi" id="4kfjPBKftU7" role="2Oq$k0">
                                         <node concept="37vLTw" id="4kfjPBKftU8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX8179O" />
+                                          <ref role="3cqZAo" node="4z0AnX8179O" resolve="it" />
                                         </node>
                                         <node concept="3Tsc0h" id="4kfjPBKftU9" role="2OqNvi">
                                           <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -706,7 +706,7 @@
                                 <node concept="3clFbF" id="6hYPZtwti06" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hYPZtwtig0" role="3clFbG">
                                     <node concept="37vLTw" id="6hYPZtwti05" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8179Q" />
+                                      <ref role="3cqZAo" node="4z0AnX8179Q" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="6hYPZtwtiRx" role="2OqNvi">
                                       <node concept="chp4Y" id="6hYPZtwtj54" role="cj9EA">
@@ -950,7 +950,7 @@
                                 <node concept="3clFbF" id="4FiaYBCEewC" role="3cqZAp">
                                   <node concept="2OqwBi" id="4FiaYBCEewD" role="3clFbG">
                                     <node concept="37vLTw" id="4FiaYBCEewE" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8179S" />
+                                      <ref role="3cqZAo" node="4z0AnX8179S" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="4FiaYBCEewF" role="2OqNvi">
                                       <node concept="chp4Y" id="4FiaYBCEewG" role="cj9EA">
@@ -1136,7 +1136,7 @@
                                   <node concept="3clFbF" id="4FiaYBCECtI" role="3cqZAp">
                                     <node concept="2OqwBi" id="4FiaYBCECKf" role="3clFbG">
                                       <node concept="37vLTw" id="4FiaYBCECtH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX8179U" />
+                                        <ref role="3cqZAo" node="4z0AnX8179U" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="4FiaYBCEExE" role="2OqNvi">
                                         <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
@@ -1180,7 +1180,7 @@
                                 <node concept="3clFbF" id="4FiaYBCF4cp" role="3cqZAp">
                                   <node concept="2OqwBi" id="4FiaYBCF4qz" role="3clFbG">
                                     <node concept="37vLTw" id="4FiaYBCF4co" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX8179W" />
+                                      <ref role="3cqZAo" node="4z0AnX8179W" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="4FiaYBCF5RH" role="2OqNvi">
                                       <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
index 3e2edcc8cc..f39c6dd4f6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/behavior.mps
@@ -919,7 +919,7 @@
                     <node concept="3clFbF" id="5L2mTKmAgKi" role="3cqZAp">
                       <node concept="2OqwBi" id="5L2mTKmAgXS" role="3clFbG">
                         <node concept="37vLTw" id="5L2mTKmAgKh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX8179Y" />
+                          <ref role="3cqZAo" node="4z0AnX8179Y" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5L2mTKmAhfh" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
@@ -935,7 +935,7 @@
                             <node concept="34jXtK" id="5L2mTKmAq8U" role="2OqNvi">
                               <node concept="2OqwBi" id="5L2mTKmAq_m" role="25WWJ7">
                                 <node concept="37vLTw" id="5L2mTKmAqoc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX8179Y" />
+                                  <ref role="3cqZAo" node="4z0AnX8179Y" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="5L2mTKmAr2E" role="2OqNvi" />
                               </node>
@@ -1038,7 +1038,7 @@
                     <node concept="3clFbF" id="7S4tmubEVvT" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEVIc" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEVvS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817a0" />
+                          <ref role="3cqZAo" node="4z0AnX817a0" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEVWA" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -1480,7 +1480,7 @@
                           </node>
                           <node concept="3EllGN" id="dsAFRkcOWL" role="37vLTJ">
                             <node concept="37vLTw" id="dsAFRkcPhO" role="3ElVtu">
-                              <ref role="3cqZAo" node="4z0AnX817a2" />
+                              <ref role="3cqZAo" node="4z0AnX817a2" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="dsAFRkcNEs" role="3ElQJh">
                               <ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
@@ -1491,7 +1491,7 @@
                       <node concept="3clFbF" id="49WTic8eCyZ" role="3cqZAp">
                         <node concept="2OqwBi" id="49WTic8eCA1" role="3clFbG">
                           <node concept="37vLTw" id="49WTic8eCyY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817a2" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" resolve="it" />
                           </node>
                           <node concept="1P9Npp" id="49WTic8eCFh" role="2OqNvi">
                             <node concept="37vLTw" id="dsAFRkcN1G" role="1P9ThW">
@@ -1505,7 +1505,7 @@
                       <node concept="2OqwBi" id="7cphKbKZSbM" role="3uHU7w">
                         <node concept="2OqwBi" id="7cphKbKZRrI" role="2Oq$k0">
                           <node concept="37vLTw" id="7cphKbKZR93" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817a2" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="7cphKbKZRGP" role="2OqNvi">
                             <node concept="1xMEDy" id="7cphKbKZRGR" role="1xVPHs">
@@ -1523,7 +1523,7 @@
                         </node>
                         <node concept="2OqwBi" id="6ITtBskTCMh" role="3uHU7B">
                           <node concept="37vLTw" id="6ITtBskTCAp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817a2" />
+                            <ref role="3cqZAo" node="4z0AnX817a2" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="6ITtBskTDpX" role="2OqNvi">
                             <node concept="1xMEDy" id="6ITtBskTDpZ" role="1xVPHs">
@@ -1839,7 +1839,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817a4" />
+                        <ref role="3cqZAo" node="4z0AnX817a4" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="RIvadv2IRA" role="2OqNvi">
                         <ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
@@ -2070,7 +2070,7 @@
                               <node concept="2OqwBi" id="3E_uh2jovMZ" role="3uHU7w">
                                 <node concept="2OqwBi" id="3E_uh2jouHE" role="2Oq$k0">
                                   <node concept="37vLTw" id="3E_uh2joufI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817a6" />
+                                    <ref role="3cqZAo" node="4z0AnX817a6" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3E_uh2jovym" role="2OqNvi">
                                     <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -2083,7 +2083,7 @@
                               <node concept="3cpWs3" id="3E_uh2josO4" role="3uHU7B">
                                 <node concept="2OqwBi" id="3E_uh2joqIQ" role="3uHU7B">
                                   <node concept="37vLTw" id="3E_uh2joqk5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817a6" />
+                                    <ref role="3cqZAo" node="4z0AnX817a6" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="3E_uh2jornx" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2154,7 +2154,7 @@
                                 <node concept="3clFbF" id="4zsmO3KQbN9" role="3cqZAp">
                                   <node concept="2OqwBi" id="4zsmO3KQcfn" role="3clFbG">
                                     <node concept="37vLTw" id="4zsmO3KQbN8" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817a8" />
+                                      <ref role="3cqZAo" node="4z0AnX817a8" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="4zsmO3KQnAi" role="2OqNvi">
                                       <ref role="37wK5l" to="hwgx:7NyyyjNtbn2" resolve="getTreeNode" />
@@ -2448,7 +2448,7 @@
                       <node concept="3fqX7Q" id="5YygIlaVSU_" role="3uHU7w">
                         <node concept="2OqwBi" id="5YygIlaVTih" role="3fr31v">
                           <node concept="37vLTw" id="5YygIlaVT4Q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817aa" />
+                            <ref role="3cqZAo" node="4z0AnX817aa" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5YygIlaVTEh" role="2OqNvi">
                             <node concept="chp4Y" id="5YygIlaVTSf" role="cj9EA">
@@ -2460,7 +2460,7 @@
                       <node concept="3fqX7Q" id="18$bUx58f5p" role="3uHU7B">
                         <node concept="2OqwBi" id="18$bUx58fil" role="3fr31v">
                           <node concept="37vLTw" id="18$bUx58f8f" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817aa" />
+                            <ref role="3cqZAo" node="4z0AnX817aa" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="18$bUx58fzB" role="2OqNvi">
                             <node concept="chp4Y" id="18$bUx58fIN" role="cj9EA">
@@ -2768,7 +2768,7 @@
                     <node concept="3fqX7Q" id="44yGPKlmayZ" role="3clFbG">
                       <node concept="2OqwBi" id="44yGPKlmaVo" role="3fr31v">
                         <node concept="37vLTw" id="44yGPKlmaz6" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ac" />
+                          <ref role="3cqZAo" node="4z0AnX817ac" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="44yGPKlmbxr" role="2OqNvi">
                           <node concept="chp4Y" id="44yGPKlmbNh" role="cj9EA">
@@ -3471,7 +3471,7 @@
                           <node concept="3clFbF" id="6o_i6GxnZcf" role="3cqZAp">
                             <node concept="2OqwBi" id="6o_i6GxnZcg" role="3clFbG">
                               <node concept="37vLTw" id="6o_i6GxnZch" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817ae" />
+                                <ref role="3cqZAo" node="4z0AnX817ae" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6o_i6GxnZci" role="2OqNvi">
                                 <node concept="chp4Y" id="6o_i6GxnZcj" role="cj9EA">
@@ -3494,7 +3494,7 @@
                         <node concept="3clFbF" id="6o_i6GxnZcp" role="3cqZAp">
                           <node concept="2OqwBi" id="6o_i6GxnZcq" role="3clFbG">
                             <node concept="37vLTw" id="6o_i6GxnZcr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ag" />
+                              <ref role="3cqZAo" node="4z0AnX817ag" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6o_i6GxnZcs" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3721,7 +3721,7 @@
                               <node concept="3clFbF" id="74u6qanU7x2" role="3cqZAp">
                                 <node concept="2OqwBi" id="74u6qanU7MJ" role="3clFbG">
                                   <node concept="37vLTw" id="74u6qanU7x1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817ai" />
+                                    <ref role="3cqZAo" node="4z0AnX817ai" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="74u6qanU8kC" role="2OqNvi">
                                     <node concept="chp4Y" id="74u6qanU8Fd" role="cj9EA">
@@ -3746,7 +3746,7 @@
                                 <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                                 <node concept="2OqwBi" id="74u6qanUbPk" role="37wK5m">
                                   <node concept="37vLTw" id="74u6qanUbkN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817ak" />
+                                    <ref role="3cqZAo" node="4z0AnX817ak" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="74u6qanUc89" role="2OqNvi">
                                     <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -4215,7 +4215,7 @@
                     <node concept="3clFbF" id="7S4tmubEBqN" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEBD6" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEBqM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817am" />
+                          <ref role="3cqZAo" node="4z0AnX817am" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEBRg" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -4734,7 +4734,7 @@
                     <node concept="2OqwBi" id="6NpHfQ5HXCa" role="3clFbG">
                       <node concept="2OqwBi" id="6NpHfQ5HU2y" role="2Oq$k0">
                         <node concept="37vLTw" id="6NpHfQ5HTOn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ao" />
+                          <ref role="3cqZAo" node="4z0AnX817ao" resolve="it" />
                         </node>
                         <node concept="1mfA1w" id="6NpHfQ5HUiy" role="2OqNvi" />
                       </node>
@@ -4792,7 +4792,7 @@
                       <node concept="2OqwBi" id="6NpHfQ5I9oM" role="3fr31v">
                         <node concept="2OqwBi" id="6NpHfQ5I9oN" role="2Oq$k0">
                           <node concept="37vLTw" id="6NpHfQ5I9oO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817aq" />
+                            <ref role="3cqZAo" node="4z0AnX817aq" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="6NpHfQ5I9oP" role="2OqNvi" />
                         </node>
@@ -5110,7 +5110,7 @@
                     <node concept="3clFbF" id="7S4tmubEJUp" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubEK6B" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubEJUo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817as" />
+                          <ref role="3cqZAo" node="4z0AnX817as" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubEKkQ" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
index fa5d71feba..0477bac10f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/constraints.mps
@@ -369,7 +369,7 @@
                     <node concept="3clFbF" id="6b_jefnKy$L" role="3cqZAp">
                       <node concept="2OqwBi" id="6b_jefnKy$M" role="3clFbG">
                         <node concept="37vLTw" id="6b_jefnKy$N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817au" />
+                          <ref role="3cqZAo" node="4z0AnX817au" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="6b_jefnKy$O" role="2OqNvi">
                           <node concept="chp4Y" id="6b_jefnKy$P" role="cj9EA">
@@ -733,7 +733,7 @@
                                 <node concept="2OqwBi" id="4U5vykej9IO" role="3clFbG">
                                   <node concept="2OqwBi" id="4U5vykej9IP" role="2Oq$k0">
                                     <node concept="37vLTw" id="4U5vykej9IQ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817aw" />
+                                      <ref role="3cqZAo" node="4z0AnX817aw" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="4U5vykej9IR" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
@@ -967,7 +967,7 @@
                         <node concept="2OqwBi" id="1VmWkC0H$gv" role="3clFbG">
                           <node concept="2OqwBi" id="1VmWkC0HwZj" role="2Oq$k0">
                             <node concept="37vLTw" id="1VmWkC0Hw$V" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ay" />
+                              <ref role="3cqZAo" node="4z0AnX817ay" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="1VmWkC0HxR8" role="2OqNvi">
                               <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
index 7d70567f05..0df0c14137 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/intentions.mps
@@ -332,7 +332,7 @@
                         </node>
                         <node concept="2OqwBi" id="8xLOUtasQp" role="3uHU7B">
                           <node concept="37vLTw" id="8xLOUtasGn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817a$" />
+                            <ref role="3cqZAo" node="4z0AnX817a$" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="8xLOUtat2K" role="2OqNvi">
                             <ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
@@ -354,7 +354,7 @@
                   <node concept="3clFbF" id="49WTic8eOGk" role="3cqZAp">
                     <node concept="2OqwBi" id="49WTic8eOJm" role="3clFbG">
                       <node concept="37vLTw" id="49WTic8eOGj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817aA" />
+                        <ref role="3cqZAo" node="4z0AnX817aA" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="49WTic8eOP2" role="2OqNvi">
                         <node concept="2pJPEk" id="49WTic8eOYX" role="1P9ThW">
@@ -442,7 +442,7 @@
                           <node concept="2OqwBi" id="4hUtPTIY8QT" role="2Oq$k0">
                             <node concept="2OqwBi" id="4hUtPTIY8QU" role="2Oq$k0">
                               <node concept="37vLTw" id="4hUtPTIY8QV" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817aE" />
+                                <ref role="3cqZAo" node="4z0AnX817aE" resolve="shortLambda" />
                               </node>
                               <node concept="2Rf3mk" id="4hUtPTIY8QW" role="2OqNvi">
                                 <node concept="1xMEDy" id="4hUtPTIY8QX" role="1xVPHs">
@@ -468,7 +468,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="4hUtPTIY8R9" role="3uHU7B">
                                         <node concept="37vLTw" id="4hUtPTIY8Ra" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817aC" />
+                                          <ref role="3cqZAo" node="4z0AnX817aC" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="4hUtPTIY8Rb" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:6zmBjqUkHam" resolve="arg" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
index 3bad46595b..d7b61e09ce 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps
@@ -451,7 +451,7 @@
                     <node concept="3clFbF" id="22hm_0zJCvx" role="3cqZAp">
                       <node concept="2OqwBi" id="22hm_0zJCvy" role="3clFbG">
                         <node concept="37vLTw" id="22hm_0zJCvz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817aY" />
+                          <ref role="3cqZAo" node="4z0AnX817aY" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="22hm_0zJCv$" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:22hm_0zJBUZ" resolve="targetStateIsMutable" />
@@ -991,7 +991,7 @@
                           </node>
                           <node concept="3EllGN" id="6ITtBskYEkp" role="3uHU7B">
                             <node concept="37vLTw" id="6ITtBskYEkq" role="3ElVtu">
-                              <ref role="3cqZAo" node="4z0AnX817b0" />
+                              <ref role="3cqZAo" node="4z0AnX817b0" resolve="key" />
                             </node>
                             <node concept="37vLTw" id="6ITtBskYEkr" role="3ElQJh">
                               <ref role="3cqZAo" node="dsAFRk0GB0" resolve="mapping" />
@@ -1140,7 +1140,7 @@
                               </node>
                               <node concept="3EllGN" id="6ITtBskXoUd" role="3uHU7B">
                                 <node concept="37vLTw" id="6ITtBskXoUe" role="3ElVtu">
-                                  <ref role="3cqZAo" node="4z0AnX817b2" />
+                                  <ref role="3cqZAo" node="4z0AnX817b2" resolve="key" />
                                 </node>
                                 <node concept="37vLTw" id="6ITtBskXoUf" role="3ElQJh">
                                   <ref role="3cqZAo" node="dsAFRk4B7x" resolve="shortLambdaMapping" />
@@ -1267,7 +1267,7 @@
                                     <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                     <node concept="2OqwBi" id="dsAFRk6FhD" role="37wK5m">
                                       <node concept="37vLTw" id="dsAFRk6ESX" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817b4" />
+                                        <ref role="3cqZAo" node="4z0AnX817b4" resolve="mapping" />
                                       </node>
                                       <node concept="3AV6Ez" id="dsAFRka_Qp" role="2OqNvi" />
                                     </node>
@@ -1282,7 +1282,7 @@
                                           <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                           <node concept="2OqwBi" id="dsAFRk6ImD" role="37wK5m">
                                             <node concept="37vLTw" id="dsAFRk6I05" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817b4" />
+                                              <ref role="3cqZAo" node="4z0AnX817b4" resolve="mapping" />
                                             </node>
                                             <node concept="3AY5_j" id="dsAFRkaAEM" role="2OqNvi" />
                                           </node>
@@ -1326,11 +1326,11 @@
                               <node concept="3clFbF" id="dsAFRk2nFu" role="3cqZAp">
                                 <node concept="3clFbC" id="dsAFRk2r8w" role="3clFbG">
                                   <node concept="37vLTw" id="dsAFRk2spL" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4z0AnX817b8" />
+                                    <ref role="3cqZAo" node="4z0AnX817b8" resolve="descendant" />
                                   </node>
                                   <node concept="3EllGN" id="dsAFRk2q08" role="3uHU7B">
                                     <node concept="37vLTw" id="dsAFRk2qrp" role="3ElVtu">
-                                      <ref role="3cqZAo" node="4z0AnX817b6" />
+                                      <ref role="3cqZAo" node="4z0AnX817b6" resolve="key" />
                                     </node>
                                     <node concept="37vLTw" id="dsAFRk2p1B" role="3ElQJh">
                                       <ref role="3cqZAo" node="dsAFRk0GB0" resolve="mapping" />
@@ -1369,7 +1369,7 @@
                       <ref role="37wK5l" to="pbu6:1WlYLwX3McV" resolve="isNodeCovered" />
                       <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                       <node concept="37vLTw" id="230vOq3ig5J" role="37wK5m">
-                        <ref role="3cqZAo" node="4z0AnX817b8" />
+                        <ref role="3cqZAo" node="4z0AnX817b8" resolve="descendant" />
                       </node>
                     </node>
                   </node>
@@ -2196,7 +2196,7 @@
                           <node concept="liA8E" id="$yb$20ldT9" role="2OqNvi">
                             <ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
                             <node concept="37vLTw" id="$yb$20ldTa" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX817ba" />
+                              <ref role="3cqZAo" node="4z0AnX817ba" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="$yb$20ldTb" role="37wK5m">
                               <ref role="3cqZAo" node="$yb$20laHc" resolve="context" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
index ee533a833d..0406455bd9 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/typesystem.mps
@@ -1316,7 +1316,7 @@
                           <node concept="2OqwBi" id="49WTic8hsct" role="25WWJ7">
                             <node concept="2OqwBi" id="49WTic8htyS" role="2Oq$k0">
                               <node concept="37vLTw" id="49WTic8hs25" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817aG" />
+                                <ref role="3cqZAo" node="4z0AnX817aG" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="49WTic8htKR" role="2OqNvi">
                                 <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -1929,7 +1929,7 @@
                         <node concept="2OqwBi" id="KaZMgydRvC" role="3clFbG">
                           <node concept="2OqwBi" id="KaZMgydRvD" role="2Oq$k0">
                             <node concept="37vLTw" id="KaZMgydRvE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817aM" />
+                              <ref role="3cqZAo" node="4z0AnX817aM" resolve="e" />
                             </node>
                             <node concept="2Rf3mk" id="KaZMgydRvF" role="2OqNvi">
                               <node concept="1xMEDy" id="KaZMgydRvG" role="1xVPHs">
@@ -1950,7 +1950,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="KaZMgydRvP" role="3uHU7B">
                                       <node concept="37vLTw" id="KaZMgydRvQ" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817aK" />
+                                        <ref role="3cqZAo" node="4z0AnX817aK" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="KaZMgydRvR" role="2OqNvi">
                                         <ref role="3Tt5mk" to="zzzn:49WTic8iI9_" resolve="val" />
@@ -2046,7 +2046,7 @@
                         <node concept="3clFbF" id="5ipapt3xRG4" role="3cqZAp">
                           <node concept="2OqwBi" id="5ipapt3xRG5" role="3clFbG">
                             <node concept="37vLTw" id="5ipapt3xRG6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817aO" />
+                              <ref role="3cqZAo" node="4z0AnX817aO" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="5ipapt3xRG7" role="2OqNvi">
                               <node concept="1xMEDy" id="5ipapt3xRG8" role="1xVPHs">
@@ -2076,7 +2076,7 @@
                           </node>
                           <node concept="2OqwBi" id="5ipapt3xRGi" role="3uHU7B">
                             <node concept="37vLTw" id="5ipapt3xRGj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817aQ" />
+                              <ref role="3cqZAo" node="4z0AnX817aQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5ipapt3xRGk" role="2OqNvi">
                               <ref role="3Tt5mk" to="zzzn:49WTic8iI9_" resolve="val" />
@@ -2675,7 +2675,7 @@
                         <node concept="2OqwBi" id="RIvadv3fFu" role="3uHU7B">
                           <node concept="1PxgMI" id="RIvadv3fhj" role="2Oq$k0">
                             <node concept="37vLTw" id="RIvadv3eDk" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX817aS" />
+                              <ref role="3cqZAo" node="4z0AnX817aS" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="6b_jefnKyD8" role="3oSUPX">
                               <ref role="cht4Q" to="zzzn:49WTic8eSCJ" resolve="IFunctionLike" />
@@ -3558,7 +3558,7 @@
                     <node concept="2OqwBi" id="1VmWkC0ESWh" role="3clFbG">
                       <node concept="2OqwBi" id="1VmWkC0EQcI" role="2Oq$k0">
                         <node concept="37vLTw" id="1VmWkC0EPMu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817aU" />
+                          <ref role="3cqZAo" node="4z0AnX817aU" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="1VmWkC0EQFg" role="2OqNvi">
                           <ref role="3TtcxE" to="zzzn:49WTic8ig5E" resolve="expressions" />
@@ -3594,7 +3594,7 @@
                     </node>
                     <node concept="2OqwBi" id="1VmWkC0EXwZ" role="3uHU7B">
                       <node concept="37vLTw" id="1VmWkC0EX8P" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817aW" />
+                        <ref role="3cqZAo" node="4z0AnX817aW" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="1VmWkC0EY35" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
index daf48cbe94..9674c61e71 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/editor.mps
@@ -446,7 +446,7 @@
                                   <node concept="3clFbC" id="55lPkJGJtsP" role="3uHU7w">
                                     <node concept="2OqwBi" id="55lPkJGJoY1" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGJohH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817bc" />
+                                        <ref role="3cqZAo" node="4z0AnX817bc" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGJpFY" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -459,7 +459,7 @@
                                   <node concept="3clFbC" id="55lPkJGJseZ" role="3uHU7B">
                                     <node concept="2OqwBi" id="55lPkJGJ6tk" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGJ6gy" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817bc" />
+                                        <ref role="3cqZAo" node="4z0AnX817bc" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGJ6Py" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -548,7 +548,7 @@
                                         <node concept="17R0WA" id="5yPljRY4Koc" role="3uHU7B">
                                           <node concept="2OqwBi" id="5yPljRY4Kod" role="3uHU7B">
                                             <node concept="37vLTw" id="5yPljRY4Koe" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817be" />
+                                              <ref role="3cqZAo" node="4z0AnX817be" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="5yPljRY4Kof" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -564,7 +564,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="5yPljRY4Koj" role="3uHU7B">
                                             <node concept="37vLTw" id="5yPljRY4Kok" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817be" />
+                                              <ref role="3cqZAo" node="4z0AnX817be" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="5yPljRY4Kol" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -810,7 +810,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="55lPkJGL2wI" role="3uHU7B">
                                       <node concept="37vLTw" id="55lPkJGL2j8" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817bg" />
+                                        <ref role="3cqZAo" node="4z0AnX817bg" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="55lPkJGL2QE" role="2OqNvi">
                                         <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
@@ -832,7 +832,7 @@
                               <node concept="3clFbF" id="55lPkJGLglo" role="3cqZAp">
                                 <node concept="2OqwBi" id="55lPkJGLgwQ" role="3clFbG">
                                   <node concept="37vLTw" id="55lPkJGLgln" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817bi" />
+                                    <ref role="3cqZAo" node="4z0AnX817bi" resolve="it" />
                                   </node>
                                   <node concept="3YRAZt" id="55lPkJGLhWi" role="2OqNvi" />
                                 </node>
@@ -986,7 +986,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="55lPkJGLqQR" role="3uHU7B">
                                         <node concept="37vLTw" id="55lPkJGLqQS" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817bk" />
+                                          <ref role="3cqZAo" node="4z0AnX817bk" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="55lPkJGLs3L" role="2OqNvi">
                                           <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -1008,7 +1008,7 @@
                                 <node concept="3clFbF" id="55lPkJGLqQZ" role="3cqZAp">
                                   <node concept="2OqwBi" id="55lPkJGLqR0" role="3clFbG">
                                     <node concept="37vLTw" id="55lPkJGLqR1" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817bm" />
+                                      <ref role="3cqZAo" node="4z0AnX817bm" resolve="it" />
                                     </node>
                                     <node concept="3YRAZt" id="55lPkJGLqR2" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
index b68a8084b1..310d1919d8 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/behavior.mps
@@ -1563,7 +1563,7 @@
                         <ref role="37wK5l" to="7xqi:2aG75lpC1hM" resolve="mapToPowerExpressions" />
                         <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                         <node concept="37vLTw" id="2aG75lpCirv" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817bo" />
+                          <ref role="3cqZAo" node="4z0AnX817bo" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="2aG75lpCmQn" role="37wK5m">
                           <node concept="2OqwBi" id="2aG75lpCj9M" role="2Oq$k0">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
index 1028e84d03..55ec5ee835 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/constraints.mps
@@ -209,7 +209,7 @@
                           <node concept="3clFbF" id="1F1F0IV2N2_" role="3cqZAp">
                             <node concept="2OqwBi" id="1F1F0IV2N2A" role="3clFbG">
                               <node concept="37vLTw" id="1F1F0IV2N2B" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bq" />
+                                <ref role="3cqZAo" node="4z0AnX817bq" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="1F1F0IV2N2C" role="2OqNvi">
                                 <node concept="chp4Y" id="1F1F0IV2N2D" role="cj9EA">
@@ -232,7 +232,7 @@
                         <node concept="3clFbF" id="1F1F0IV2N2J" role="3cqZAp">
                           <node concept="1PxgMI" id="1F1F0IV2N2K" role="3clFbG">
                             <node concept="37vLTw" id="1F1F0IV2N2L" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX817bs" />
+                              <ref role="3cqZAo" node="4z0AnX817bs" resolve="it" />
                             </node>
                             <node concept="chp4Y" id="1F1F0IV2N2M" role="3oSUPX">
                               <ref role="cht4Q" to="1qv1:4iu6t1eAYrK" resolve="MathLoopExpr" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
index 6df546ecea..811d903d97 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/editor.mps
@@ -1169,7 +1169,7 @@
                             <node concept="3fqX7Q" id="1eTp1AxLPF8" role="3clFbG">
                               <node concept="2OqwBi" id="1eTp1AxLPF9" role="3fr31v">
                                 <node concept="37vLTw" id="1eTp1AxLPFa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817bu" />
+                                  <ref role="3cqZAo" node="4z0AnX817bu" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="1eTp1AxLPFb" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1198,7 +1198,7 @@
                             </node>
                             <node concept="2OqwBi" id="1eTp1AxLPFl" role="3uHU7B">
                               <node concept="37vLTw" id="1eTp1AxLPFm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bw" />
+                                <ref role="3cqZAo" node="4z0AnX817bw" resolve="it" />
                               </node>
                               <node concept="liA8E" id="1eTp1AxLPFn" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
@@ -1390,7 +1390,7 @@
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
                                 <node concept="2OqwBi" id="61R9vA3NxDQ" role="37wK5m">
                                   <node concept="37vLTw" id="61R9vA3NxDR" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817by" />
+                                    <ref role="3cqZAo" node="4z0AnX817by" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="61R9vA3NxDS" role="2OqNvi">
                                     <ref role="37wK5l" to="c17a:~SAbstractLink.getTargetConcept()" resolve="getTargetConcept" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
index 1117f46a8c..d969dd70e2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps
@@ -489,7 +489,7 @@
                     <node concept="3fqX7Q" id="1yW0h04DHXR" role="3uHU7w">
                       <node concept="2OqwBi" id="1yW0h04DHXT" role="3fr31v">
                         <node concept="37vLTw" id="1yW0h04DHXU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817b$" />
+                          <ref role="3cqZAo" node="4z0AnX817b$" resolve="it" />
                         </node>
                         <node concept="liA8E" id="1yW0h04DHXV" role="2OqNvi">
                           <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -498,7 +498,7 @@
                     </node>
                     <node concept="2OqwBi" id="1yW0h04CzQj" role="3uHU7B">
                       <node concept="37vLTw" id="1yW0h04CzA3" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817b$" />
+                        <ref role="3cqZAo" node="4z0AnX817b$" resolve="it" />
                       </node>
                       <node concept="2Zo12i" id="1yW0h04C$p_" role="2OqNvi">
                         <node concept="chp4Y" id="1yW0h04C$$k" role="2Zo12j">
@@ -634,7 +634,7 @@
                           <node concept="2OqwBi" id="3iWt5efL91z" role="3fr31v">
                             <node concept="2OqwBi" id="3iWt5efL91$" role="2Oq$k0">
                               <node concept="37vLTw" id="3iWt5efL91_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bA" />
+                                <ref role="3cqZAo" node="4z0AnX817bA" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3iWt5efL91A" role="2OqNvi">
                                 <ref role="3Tt5mk" to="1qv1:4iu6t1eBdVy" resolve="expr" />
@@ -1379,7 +1379,7 @@
                         <node concept="3fqX7Q" id="4wFKMWZd2N0" role="3clFbG">
                           <node concept="2OqwBi" id="4wFKMWZd2N1" role="3fr31v">
                             <node concept="37vLTw" id="4wFKMWZd2N2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817bC" />
+                              <ref role="3cqZAo" node="4z0AnX817bC" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="4wFKMWZd2N3" role="2OqNvi">
                               <node concept="chp4Y" id="4wFKMWZd2N4" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
index f766ed2073..f332e6fae1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps
@@ -1633,7 +1633,7 @@
                               <node concept="2OqwBi" id="6q$NxWgeFBI" role="3K4E3e">
                                 <node concept="2OqwBi" id="6q$NxWgeFBJ" role="2Oq$k0">
                                   <node concept="37vLTw" id="6q$NxWgeFBK" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817bE" />
+                                    <ref role="3cqZAo" node="4z0AnX817bE" resolve="it" />
                                   </node>
                                   <node concept="2yIwOk" id="6q$NxWgeFBL" role="2OqNvi" />
                                 </node>
@@ -1646,7 +1646,7 @@
                               </node>
                               <node concept="2OqwBi" id="6q$NxWgeFBO" role="3K4Cdx">
                                 <node concept="37vLTw" id="6q$NxWgeFBP" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817bE" />
+                                  <ref role="3cqZAo" node="4z0AnX817bE" resolve="it" />
                                 </node>
                                 <node concept="3x8VRR" id="6q$NxWgeFBQ" role="2OqNvi" />
                               </node>
@@ -1890,7 +1890,7 @@
                         <ref role="37wK5l" to="7xqi:4wFKMWZSULn" resolve="canBeChildOfInnerExpression" />
                         <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                         <node concept="37vLTw" id="4wFKMWZT52q" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817bG" />
+                          <ref role="3cqZAo" node="4z0AnX817bG" resolve="expr" />
                         </node>
                       </node>
                     </node>
@@ -2056,7 +2056,7 @@
                         <node concept="2OqwBi" id="3C0hCYbT693" role="3fr31v">
                           <node concept="2OqwBi" id="3C0hCYbT694" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbT695" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817bI" />
+                              <ref role="3cqZAo" node="4z0AnX817bI" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbT696" role="2OqNvi">
                               <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2142,7 +2142,7 @@
                         <node concept="2OqwBi" id="3C0hCYbSW79" role="3clFbG">
                           <node concept="2OqwBi" id="3C0hCYbSW7a" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbSW7b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817bK" />
+                              <ref role="3cqZAo" node="4z0AnX817bK" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbSW7c" role="2OqNvi">
                               <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2178,7 +2178,7 @@
                             </node>
                             <node concept="2OqwBi" id="3C0hCYbT2U6" role="1m5AlR">
                               <node concept="37vLTw" id="3C0hCYbSYiG" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bM" />
+                                <ref role="3cqZAo" node="4z0AnX817bM" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3C0hCYbT3jk" role="2OqNvi">
                                 <ref role="3Tt5mk" to="1qv1:4r1mNB_o5WJ" resolve="exponent" />
@@ -2264,7 +2264,7 @@
                           <ref role="37wK5l" to="7xqi:7LghZUctGPf" resolve="isValidMulExpression" />
                           <ref role="1Pybhc" to="7xqi:3iWt5efKWGp" resolve="PolynomialExpressionUtil" />
                           <node concept="37vLTw" id="7LghZUctVzr" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817bO" />
+                            <ref role="3cqZAo" node="4z0AnX817bO" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -2336,7 +2336,7 @@
                         <node concept="2OqwBi" id="3C0hCYbVFGV" role="3uHU7w">
                           <node concept="2OqwBi" id="3C0hCYbVFGW" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbVFGX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817bQ" />
+                              <ref role="3cqZAo" node="4z0AnX817bQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbVFGY" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
@@ -2351,7 +2351,7 @@
                         <node concept="2OqwBi" id="3C0hCYbVFH1" role="3uHU7B">
                           <node concept="2OqwBi" id="3C0hCYbVFH2" role="2Oq$k0">
                             <node concept="37vLTw" id="3C0hCYbVFH3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817bQ" />
+                              <ref role="3cqZAo" node="4z0AnX817bQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3C0hCYbVFH4" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKm" resolve="left" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
index 799c7cc0b0..82f244f438 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
@@ -721,7 +721,7 @@
                             </node>
                             <node concept="2OqwBi" id="1CNpG_h8NWS" role="37wK5m">
                               <node concept="37vLTw" id="1CNpG_h8NWT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bT" />
+                                <ref role="3cqZAo" node="4z0AnX817bT" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1CNpG_h8NWU" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kelk:3vxfdxblP3X" resolve="type" />
@@ -761,7 +761,7 @@
                             <node concept="2OqwBi" id="1CNpG_h9Z47" role="3uHU7w">
                               <node concept="2OqwBi" id="1CNpG_h8QMF" role="2Oq$k0">
                                 <node concept="37vLTw" id="1CNpG_h8QzW" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817bV" />
+                                  <ref role="3cqZAo" node="4z0AnX817bV" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1CNpG_h8Reu" role="2OqNvi">
                                   <ref role="3Tt5mk" to="kelk:3vxfdxblP3X" resolve="type" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
index cf66529c8f..c2e31f3078 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/behavior.mps
@@ -1091,7 +1091,7 @@
                             </node>
                             <node concept="2OqwBi" id="3WWvqarxz2e" role="3uHU7B">
                               <node concept="37vLTw" id="3WWvqarxz2f" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817bX" />
+                                <ref role="3cqZAo" node="4z0AnX817bX" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="3WWvqarxz2g" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1239,7 +1239,7 @@
                           </node>
                           <node concept="3JPx81" id="3WWvqarxRU2" role="2OqNvi">
                             <node concept="37vLTw" id="3WWvqarxRU3" role="25WWJ7">
-                              <ref role="3cqZAo" node="4z0AnX817bZ" />
+                              <ref role="3cqZAo" node="4z0AnX817bZ" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -1266,7 +1266,7 @@
                   <node concept="3clFbF" id="3WWvqarxSNE" role="3cqZAp">
                     <node concept="2OqwBi" id="3WWvqarxT0b" role="3clFbG">
                       <node concept="37vLTw" id="3WWvqarxSND" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817c1" />
+                        <ref role="3cqZAo" node="4z0AnX817c1" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="3WWvqarxTxO" role="2OqNvi" />
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
index ce4f76bb65..9aa961151a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.metafunction/models/plugin.mps
@@ -372,7 +372,7 @@
                       <node concept="2OqwBi" id="5cK3QOdiKgM" role="3clFbG">
                         <node concept="2OqwBi" id="5cK3QOdiKgN" role="2Oq$k0">
                           <node concept="37vLTw" id="5cK3QOdiKgO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817c3" />
+                            <ref role="3cqZAo" node="4z0AnX817c3" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5cK3QOdiKgP" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -495,7 +495,7 @@
                       <node concept="2OqwBi" id="559q5A2CC9x" role="3clFbG">
                         <node concept="2OqwBi" id="559q5A2CC9y" role="2Oq$k0">
                           <node concept="37vLTw" id="559q5A2CC9z" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817c5" />
+                            <ref role="3cqZAo" node="4z0AnX817c5" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="559q5A2CC9$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
index 16d927d547..461a72877e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps
@@ -915,7 +915,7 @@
                     <node concept="3clFbF" id="31HpwbwBaPp" role="3cqZAp">
                       <node concept="2OqwBi" id="31HpwbwBb3N" role="3clFbG">
                         <node concept="37vLTw" id="31HpwbwBaPo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817c7" />
+                          <ref role="3cqZAo" node="4z0AnX817c7" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="31HpwbwBbm9" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
index 48486503fc..8714ef0c76 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/editor.mps
@@ -1467,7 +1467,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817c9" />
+                            <ref role="3cqZAo" node="4z0AnX817c9" resolve="it" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -1482,7 +1482,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817c9" />
+                            <ref role="3cqZAo" node="4z0AnX817c9" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
@@ -1775,7 +1775,7 @@
                       </node>
                       <node concept="2OqwBi" id="5kGo$yLRRiB" role="3uHU7B">
                         <node concept="37vLTw" id="5kGo$yLRR1I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cb" />
+                          <ref role="3cqZAo" node="4z0AnX817cb" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="5kGo$yLRRYy" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -2292,7 +2292,7 @@
                               <node concept="3clFbF" id="6XMQOZe8nv4" role="3cqZAp">
                                 <node concept="2OqwBi" id="6XMQOZe8nZQ" role="3clFbG">
                                   <node concept="37vLTw" id="6XMQOZe8nv3" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817cd" />
+                                    <ref role="3cqZAo" node="4z0AnX817cd" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="6XMQOZe8s8c" role="2OqNvi">
                                     <ref role="37wK5l" to="n9sl:6XMQOZe876T" resolve="canBeUsedWithThisValue" />
@@ -2354,7 +2354,7 @@
                     <node concept="3clFbF" id="6XMQOZe81JA" role="3cqZAp">
                       <node concept="2OqwBi" id="6XMQOZe81JB" role="3clFbG">
                         <node concept="37vLTw" id="6XMQOZe81JC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cf" />
+                          <ref role="3cqZAo" node="4z0AnX817cf" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="6XMQOZe81JD" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -2454,7 +2454,7 @@
                     <node concept="3clFbF" id="Z4fkwz75Vd" role="3cqZAp">
                       <node concept="2OqwBi" id="Z4fkwz75Ve" role="3clFbG">
                         <node concept="37vLTw" id="Z4fkwz75Vf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ch" />
+                          <ref role="3cqZAo" node="4z0AnX817ch" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="Z4fkwz75Vg" role="2OqNvi">
                           <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
index 0a89ec1236..55fa66f61b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/plugin.mps
@@ -1485,7 +1485,7 @@
                     <node concept="2OqwBi" id="Z4fkwz70fS" role="3clFbG">
                       <node concept="2OqwBi" id="Z4fkwz6Zib" role="2Oq$k0">
                         <node concept="37vLTw" id="Z4fkwz6Z18" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cj" />
+                          <ref role="3cqZAo" node="4z0AnX817cj" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="Z4fkwz6Z_$" role="2OqNvi">
                           <ref role="2Oxat5" node="5y3VELftA2d" resolve="name" />
@@ -4010,7 +4010,7 @@
                             <ref role="37wK5l" node="4IV0h47l1qI" resolve="ContextValue" />
                             <node concept="2OqwBi" id="4IV0h47O$Hk" role="37wK5m">
                               <node concept="37vLTw" id="4IV0h47O$Hl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817cl" />
+                                <ref role="3cqZAo" node="4z0AnX817cl" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4IV0h47O$Hm" role="2OqNvi">
                                 <ref role="3Tt5mk" to="8lgj:4IV0h47hCXz" resolve="argument" />
@@ -4029,7 +4029,7 @@
                                 <ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
                                 <node concept="2OqwBi" id="4IV0h47O$Ho" role="37wK5m">
                                   <node concept="37vLTw" id="4IV0h47O$Hp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817cl" />
+                                    <ref role="3cqZAo" node="4z0AnX817cl" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4IV0h47O$Hq" role="2OqNvi">
                                     <ref role="3Tt5mk" to="8lgj:4IV0h47hCX_" resolve="value" />
@@ -4679,7 +4679,7 @@
                     <node concept="3clFbF" id="4IV0h48ipFa" role="3cqZAp">
                       <node concept="2OqwBi" id="4IV0h48ipFb" role="3clFbG">
                         <node concept="37vLTw" id="4IV0h48ipFc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cn" />
+                          <ref role="3cqZAo" node="4z0AnX817cn" resolve="it" />
                         </node>
                         <node concept="liA8E" id="4IV0h48ipFd" role="2OqNvi">
                           <ref role="37wK5l" node="4IV0h48f60S" resolve="isAfter" />
@@ -4785,7 +4785,7 @@
                         <node concept="3clFbF" id="5hiN5PkqD5H" role="3cqZAp">
                           <node concept="2OqwBi" id="5hiN5PkqD5I" role="3clFbG">
                             <node concept="37vLTw" id="5hiN5PkqD5J" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817cp" />
+                              <ref role="3cqZAo" node="4z0AnX817cp" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5hiN5PkqD5K" role="2OqNvi">
                               <node concept="25Kdxt" id="5hiN5PkqD5L" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
index 20a9f850b4..f9d4f93627 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/behavior.mps
@@ -206,7 +206,7 @@
                       <node concept="3clFbF" id="5Q45tqZqIty" role="3cqZAp">
                         <node concept="37vLTI" id="5Q45tqZqItz" role="3clFbG">
                           <node concept="37vLTw" id="5Q45tqZqIt$" role="37vLTx">
-                            <ref role="3cqZAo" node="4z0AnX817cs" />
+                            <ref role="3cqZAo" node="4z0AnX817cs" resolve="it" />
                           </node>
                           <node concept="2OqwBi" id="5Q45tqZqIt_" role="37vLTJ">
                             <node concept="37vLTw" id="5Q45tqZqItA" role="2Oq$k0">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
index 430038b3d9..9235d97c71 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/constraints.mps
@@ -300,7 +300,7 @@
                           <node concept="2OqwBi" id="1F1F0IV2N96" role="3uHU7w">
                             <node concept="2OqwBi" id="1F1F0IV2N97" role="2Oq$k0">
                               <node concept="37vLTw" id="1F1F0IV2N98" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817cu" />
+                                <ref role="3cqZAo" node="4z0AnX817cu" resolve="it" />
                               </node>
                               <node concept="3CFZ6_" id="1F1F0IV2N99" role="2OqNvi">
                                 <node concept="3CFYIy" id="1F1F0IV2N9a" role="3CFYIz">
@@ -312,7 +312,7 @@
                           </node>
                           <node concept="2OqwBi" id="1F1F0IV2N9c" role="3uHU7B">
                             <node concept="37vLTw" id="1F1F0IV2N9d" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817cu" />
+                              <ref role="3cqZAo" node="4z0AnX817cu" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1F1F0IV2N9e" role="2OqNvi">
                               <ref role="3TsBF5" to="zzzn:2uR5X5azvjH" resolve="ext" />
@@ -387,7 +387,7 @@
                                 <node concept="2OqwBi" id="1F1F0IV2NlI" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1F1F0IV2NlJ" role="2Oq$k0">
                                     <node concept="37vLTw" id="1F1F0IV2NlK" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817cw" />
+                                      <ref role="3cqZAo" node="4z0AnX817cw" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="1F1F0IV2NlL" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8eSCZ" resolve="args" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
index 28e81f112f..f2c494556a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps
@@ -1113,7 +1113,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="ywgKCSJYaD" role="3uHU7B">
                                     <node concept="37vLTw" id="ywgKCSJY7z" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817cy" />
+                                      <ref role="3cqZAo" node="4z0AnX817cy" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5Q45tqZsgiU" role="2OqNvi">
                                       <ref role="3Tt5mk" to="1xa4:1u1U5lEZLAq" resolve="param" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
index 8b2eda0497..9b03efaf2b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.behavior.mps
@@ -478,7 +478,7 @@
                       <node concept="liA8E" id="1mDdTFSvNt" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~Collection.contains(java.lang.Object)" resolve="contains" />
                         <node concept="37vLTw" id="1mDdTFSvRG" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817c$" />
+                          <ref role="3cqZAo" node="4z0AnX817c$" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -923,7 +923,7 @@
                       <node concept="2OqwBi" id="4IV0h47t3Ap" role="3clFbG">
                         <node concept="2OqwBi" id="4IV0h47t3Aq" role="2Oq$k0">
                           <node concept="37vLTw" id="4IV0h47t3Ar" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817cA" />
+                            <ref role="3cqZAo" node="4z0AnX817cA" resolve="it" />
                           </node>
                           <node concept="2OwXpG" id="4IV0h47t3As" role="2OqNvi">
                             <ref role="2Oxat5" to="n9sl:4IV0h47l1DZ" resolve="arg" />
@@ -1338,7 +1338,7 @@
                       <node concept="2OqwBi" id="4IV0h48m1SO" role="3clFbG">
                         <node concept="2OqwBi" id="4IV0h48m1SP" role="2Oq$k0">
                           <node concept="37vLTw" id="4IV0h48m1SQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817cC" />
+                            <ref role="3cqZAo" node="4z0AnX817cC" resolve="it" />
                           </node>
                           <node concept="2OwXpG" id="4IV0h48m1SR" role="2OqNvi">
                             <ref role="2Oxat5" to="n9sl:4IV0h47l1DZ" resolve="arg" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
index 341aee5cd9..7699bc08c2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/plugin.mps
@@ -1337,7 +1337,7 @@
                           <node concept="1rXfSq" id="VApoyDGfeg" role="37wK5m">
                             <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                             <node concept="37vLTw" id="VApoyDGfDl" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX817cE" />
+                              <ref role="3cqZAo" node="4z0AnX817cE" resolve="it" />
                             </node>
                             <node concept="2ShNRf" id="VApoyDGfZ3" role="37wK5m">
                               <node concept="1pGfFk" id="VApoyDGfXi" role="2ShVmc">
@@ -2199,7 +2199,7 @@
                                 <node concept="1rXfSq" id="1mDdTFSOfR" role="3clFbG">
                                   <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                                   <node concept="37vLTw" id="1mDdTFSOfS" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817cG" />
+                                    <ref role="3cqZAo" node="4z0AnX817cG" resolve="it" />
                                   </node>
                                   <node concept="37vLTw" id="1mDdTFSOfT" role="37wK5m">
                                     <ref role="3cqZAo" node="Z4fkwziK1L" resolve="trace" />
@@ -2282,7 +2282,7 @@
                                     <node concept="1rXfSq" id="3wXkdMVm9aj" role="3clFbG">
                                       <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                                       <node concept="37vLTw" id="3wXkdMVm9ak" role="37wK5m">
-                                        <ref role="3cqZAo" node="4z0AnX817cI" />
+                                        <ref role="3cqZAo" node="4z0AnX817cI" resolve="it" />
                                       </node>
                                       <node concept="37vLTw" id="3wXkdMVm9al" role="37wK5m">
                                         <ref role="3cqZAo" node="Z4fkwziK1L" resolve="trace" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
index 3b8936658d..ece9559543 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/intentions.mps
@@ -1124,7 +1124,7 @@
                   <node concept="3clFbF" id="5avmkTFRv4s" role="3cqZAp">
                     <node concept="2OqwBi" id="5avmkTFRvkb" role="3clFbG">
                       <node concept="37vLTw" id="5avmkTFRv4r" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817dx" />
+                        <ref role="3cqZAo" node="4z0AnX817dx" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5avmkTFRvEf" role="2OqNvi">
                         <node concept="25Kdxt" id="5avmkTFRwgh" role="cj9EA">
@@ -1174,7 +1174,7 @@
                         <node concept="3clFbF" id="5avmkTFRDpq" role="3cqZAp">
                           <node concept="2OqwBi" id="5avmkTFRDpr" role="3clFbG">
                             <node concept="37vLTw" id="5avmkTFRDps" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dz" />
+                              <ref role="3cqZAo" node="4z0AnX817dz" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5avmkTFRDpt" role="2OqNvi">
                               <node concept="25Kdxt" id="5avmkTFRDpu" role="cj9EA">
@@ -1197,7 +1197,7 @@
                       <node concept="3clFbF" id="5avmkTFRE6n" role="3cqZAp">
                         <node concept="2OqwBi" id="5avmkTFREiX" role="3clFbG">
                           <node concept="37vLTw" id="5avmkTFRE6m" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817d_" />
+                            <ref role="3cqZAo" node="4z0AnX817d_" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="5avmkTFRE_A" role="2OqNvi" />
                         </node>
@@ -1225,7 +1225,7 @@
                   <node concept="3clFbF" id="5avmkTFR$Mf" role="3cqZAp">
                     <node concept="2OqwBi" id="5avmkTFR$Mg" role="3clFbG">
                       <node concept="37vLTw" id="5avmkTFR$Mh" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817dB" />
+                        <ref role="3cqZAo" node="4z0AnX817dB" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5avmkTFR$Mi" role="2OqNvi">
                         <node concept="25Kdxt" id="5avmkTFR$Mj" role="cj9EA">
@@ -1293,7 +1293,7 @@
                       <node concept="3fqX7Q" id="5avmkTFS_na" role="3clFbG">
                         <node concept="2OqwBi" id="5avmkTFS_nc" role="3fr31v">
                           <node concept="37vLTw" id="5avmkTFS_nd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dD" />
+                            <ref role="3cqZAo" node="4z0AnX817dD" resolve="it" />
                           </node>
                           <node concept="liA8E" id="5avmkTFS_ne" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1975,7 +1975,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="48DDwlwZ$xM" role="3uHU7B">
                                         <node concept="37vLTw" id="48DDwlwZ$gA" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817dF" />
+                                          <ref role="3cqZAo" node="4z0AnX817dF" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="48DDwlwZ$XD" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2073,7 +2073,7 @@
                                       <node concept="3clFbF" id="48DDwlx19_b" role="3cqZAp">
                                         <node concept="2OqwBi" id="48DDwlx19QG" role="3clFbG">
                                           <node concept="37vLTw" id="48DDwlx19_7" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817dH" />
+                                            <ref role="3cqZAo" node="4z0AnX817dH" resolve="it" />
                                           </node>
                                           <node concept="1$rogu" id="48DDwlx1acZ" role="2OqNvi" />
                                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
index 991a9534dd..0bd9536734 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/behavior.mps
@@ -449,7 +449,7 @@
                     <node concept="3y3z36" id="2HpFPvT8riC" role="3clFbG">
                       <node concept="2OqwBi" id="2HpFPvT8qel" role="3uHU7B">
                         <node concept="37vLTw" id="2HpFPvT8qem" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cL" />
+                          <ref role="3cqZAo" node="4z0AnX817cL" resolve="it" />
                         </node>
                         <node concept="2yIwOk" id="2HpFPvT8qen" role="2OqNvi" />
                       </node>
@@ -538,7 +538,7 @@
                         <node concept="3fqX7Q" id="2HpFPvTa_JR" role="3clFbG">
                           <node concept="2OqwBi" id="2HpFPvTa_Uj" role="3fr31v">
                             <node concept="37vLTw" id="2HpFPvTa_JY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817cN" />
+                              <ref role="3cqZAo" node="4z0AnX817cN" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="2HpFPvTaAgl" role="2OqNvi">
                               <node concept="chp4Y" id="2HpFPvTaAvn" role="cj9EA">
@@ -1476,7 +1476,7 @@
                     <node concept="3fqX7Q" id="2HpFPvT64XY" role="3clFbG">
                       <node concept="2OqwBi" id="2HpFPvT64Y0" role="3fr31v">
                         <node concept="37vLTw" id="2HpFPvT64Y1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cP" />
+                          <ref role="3cqZAo" node="4z0AnX817cP" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="2HpFPvT64Y2" role="2OqNvi">
                           <node concept="chp4Y" id="2HpFPvT64Y3" role="cj9EA">
@@ -1932,7 +1932,7 @@
                         <node concept="2OqwBi" id="4Pi6J8Cbqvd" role="3uHU7B">
                           <node concept="2OqwBi" id="4Pi6J8Cbqve" role="2Oq$k0">
                             <node concept="37vLTw" id="4Pi6J8Cbqvf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817cR" />
+                              <ref role="3cqZAo" node="4z0AnX817cR" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4Pi6J8Cbqvg" role="2OqNvi">
                               <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
@@ -1959,7 +1959,7 @@
                   <node concept="3clFbF" id="4Pi6J8Cbqvo" role="3cqZAp">
                     <node concept="2OqwBi" id="4Pi6J8Cbqvp" role="3clFbG">
                       <node concept="37vLTw" id="4Pi6J8Cbqvq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817cT" />
+                        <ref role="3cqZAo" node="4z0AnX817cT" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4Pi6J8Cbqvr" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
@@ -2289,7 +2289,7 @@
                       </node>
                       <node concept="2OqwBi" id="4nY0kF8p1bO" role="33vP2m">
                         <node concept="37vLTw" id="4nY0kF8p13e" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817cV" />
+                          <ref role="3cqZAo" node="4z0AnX817cV" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2jITtfD_TC7" role="2OqNvi">
                           <ref role="37wK5l" node="4nY0kF8seDJ" resolve="evaluateEntryWithDownstreamUpdates" />
@@ -2342,7 +2342,7 @@
                           </node>
                           <node concept="2OqwBi" id="4nY0kF8oYLk" role="3uHU7B">
                             <node concept="37vLTw" id="4nY0kF8oYLl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817cX" />
+                              <ref role="3cqZAo" node="4z0AnX817cX" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="4nY0kF8oYLm" role="2OqNvi" />
                           </node>
@@ -2376,7 +2376,7 @@
                     <node concept="2OqwBi" id="4nY0kF8oMxB" role="3clFbG">
                       <node concept="2OqwBi" id="4nY0kF8oIER" role="2Oq$k0">
                         <node concept="37vLTw" id="4nY0kF8oIuG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817d3" />
+                          <ref role="3cqZAo" node="4z0AnX817d3" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="4nY0kF8oJgA" role="2OqNvi">
                           <node concept="1xMEDy" id="4nY0kF8oJgC" role="1xVPHs">
@@ -2394,7 +2394,7 @@
                                 <node concept="3clFbC" id="4nY0kF8oSDR" role="3uHU7B">
                                   <node concept="2OqwBi" id="4nY0kF8oRNO" role="3uHU7B">
                                     <node concept="37vLTw" id="4nY0kF8oRyV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817d1" />
+                                      <ref role="3cqZAo" node="4z0AnX817d1" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4nY0kF8oS7Z" role="2OqNvi">
                                       <ref role="3Tt5mk" to="wtll:2HpFPvT9Hfy" resolve="entry" />
@@ -2405,7 +2405,7 @@
                                 <node concept="2OqwBi" id="4nY0kF8oTzQ" role="3uHU7w">
                                   <node concept="2OqwBi" id="4nY0kF8oTzR" role="2Oq$k0">
                                     <node concept="37vLTw" id="4nY0kF8oTzS" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817d1" />
+                                      <ref role="3cqZAo" node="4z0AnX817d1" resolve="it" />
                                     </node>
                                     <node concept="2Rf3mk" id="4nY0kF8oTzT" role="2OqNvi">
                                       <node concept="1xMEDy" id="4nY0kF8oTzU" role="1xVPHs">
@@ -2422,7 +2422,7 @@
                                           <node concept="3clFbC" id="4nY0kF8oT$1" role="3clFbG">
                                             <node concept="2OqwBi" id="4nY0kF8oT$2" role="3uHU7B">
                                               <node concept="37vLTw" id="4nY0kF8oT$3" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817cZ" />
+                                                <ref role="3cqZAo" node="4z0AnX817cZ" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="4nY0kF8oT$4" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="wtll:5nEyPbMpXeg" resolve="entry" />
@@ -2778,7 +2778,7 @@
                       <node concept="10Nm6u" id="5xEoEMrw83M" role="3uHU7w" />
                       <node concept="2OqwBi" id="5xEoEMrw7m3" role="3uHU7B">
                         <node concept="37vLTw" id="5xEoEMrw7aa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817d5" />
+                          <ref role="3cqZAo" node="4z0AnX817d5" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5xEoEMrw7yM" role="2OqNvi">
                           <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -2926,7 +2926,7 @@
                       <node concept="10Nm6u" id="5avmkTFFJeI" role="3uHU7w" />
                       <node concept="2OqwBi" id="5avmkTFFJeJ" role="3uHU7B">
                         <node concept="37vLTw" id="5avmkTFFJeK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817d7" />
+                          <ref role="3cqZAo" node="4z0AnX817d7" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="5avmkTFFJeL" role="2OqNvi">
                           <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -3198,7 +3198,7 @@
                               <node concept="3clFbF" id="7HzLUeHEjNL" role="3cqZAp">
                                 <node concept="2OqwBi" id="7HzLUeHEjNM" role="3clFbG">
                                   <node concept="37vLTw" id="7HzLUeHEjNN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817d9" />
+                                    <ref role="3cqZAo" node="4z0AnX817d9" resolve="it" />
                                   </node>
                                   <node concept="1$rogu" id="7HzLUeHEjNO" role="2OqNvi" />
                                 </node>
@@ -3344,7 +3344,7 @@
                               <node concept="3clFbF" id="56SqGtkTGK7" role="3cqZAp">
                                 <node concept="2OqwBi" id="56SqGtkTGK8" role="3clFbG">
                                   <node concept="37vLTw" id="56SqGtkTGK9" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817db" />
+                                    <ref role="3cqZAo" node="4z0AnX817db" resolve="it" />
                                   </node>
                                   <node concept="1$rogu" id="56SqGtkTGKa" role="2OqNvi" />
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
index 09008ae883..b2d587ae6f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
@@ -320,7 +320,7 @@
                             <ref role="3cqZAo" node="1F1F0IUZA$C" resolve="de" />
                           </node>
                           <node concept="37vLTw" id="2QxWJFK_2kG" role="3uHU7B">
-                            <ref role="3cqZAo" node="4z0AnX817dd" />
+                            <ref role="3cqZAo" node="4z0AnX817dd" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -353,7 +353,7 @@
                           </node>
                           <node concept="2OqwBi" id="5nEyPbMspdH" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMspdI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817df" />
+                              <ref role="3cqZAo" node="4z0AnX817df" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="5nEyPbMspdJ" role="2OqNvi" />
                           </node>
@@ -386,7 +386,7 @@
                       <node concept="3clFbF" id="2QxWJFK_3Pw" role="3cqZAp">
                         <node concept="2OqwBi" id="2QxWJFK_RIT" role="3clFbG">
                           <node concept="37vLTw" id="2QxWJFK_RwW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dh" />
+                            <ref role="3cqZAo" node="4z0AnX817dh" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2QxWJFK_Swi" role="2OqNvi">
                             <ref role="37wK5l" to="31n1:2QxWJFK_S9T" resolve="isReferenceable" />
@@ -466,7 +466,7 @@
                             <ref role="3cqZAo" node="5nEyPbMpXLD" resolve="de" />
                           </node>
                           <node concept="37vLTw" id="5nEyPbMpXM4" role="3uHU7B">
-                            <ref role="3cqZAo" node="4z0AnX817dj" />
+                            <ref role="3cqZAo" node="4z0AnX817dj" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -499,7 +499,7 @@
                           </node>
                           <node concept="2OqwBi" id="5nEyPbMslcc" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMskUg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dl" />
+                              <ref role="3cqZAo" node="4z0AnX817dl" resolve="it" />
                             </node>
                             <node concept="2bSWHS" id="5nEyPbMslzQ" role="2OqNvi" />
                           </node>
@@ -533,7 +533,7 @@
                         <node concept="3clFbF" id="5nEyPbMpXMe" role="3cqZAp">
                           <node concept="2OqwBi" id="5nEyPbMpXMf" role="3clFbG">
                             <node concept="37vLTw" id="5nEyPbMpXMg" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dn" />
+                              <ref role="3cqZAo" node="4z0AnX817dn" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5nEyPbMpXMh" role="2OqNvi">
                               <ref role="37wK5l" to="31n1:2QxWJFK_S9T" resolve="isReferenceable" />
@@ -556,7 +556,7 @@
                           <node concept="10Nm6u" id="5nEyPbMq2i7" role="3uHU7w" />
                           <node concept="2OqwBi" id="5nEyPbMq12T" role="3uHU7B">
                             <node concept="37vLTw" id="5nEyPbMq0MC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dp" />
+                              <ref role="3cqZAo" node="4z0AnX817dp" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="5nEyPbMq1pc" role="2OqNvi">
                               <ref role="3TsBF5" to="wtll:2QxWJFKDebM" resolve="optionalName" />
@@ -842,7 +842,7 @@
                       <node concept="3clFbF" id="3pIANU_0L_X" role="3cqZAp">
                         <node concept="2OqwBi" id="3pIANU_0LV2" role="3clFbG">
                           <node concept="37vLTw" id="3pIANU_0L_W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dr" />
+                            <ref role="3cqZAo" node="4z0AnX817dr" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3pIANU_0Mr0" role="2OqNvi">
                             <ref role="3TsBF5" to="wtll:3pIANU_03o9" resolve="template" />
@@ -931,7 +931,7 @@
                         <node concept="3fqX7Q" id="3pIANU_3nK6" role="3clFbG">
                           <node concept="2OqwBi" id="3pIANU_3nK8" role="3fr31v">
                             <node concept="37vLTw" id="3pIANU_3nK9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dt" />
+                              <ref role="3cqZAo" node="4z0AnX817dt" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="3pIANU_3nKa" role="2OqNvi">
                               <ref role="3TsBF5" to="wtll:3pIANU_03o9" resolve="template" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
index d86819e41f..0008352781 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
@@ -4412,7 +4412,7 @@
                                 <node concept="3clFbF" id="3_Nra3E9qVw" role="3cqZAp">
                                   <node concept="2OqwBi" id="3_Nra3E9rfq" role="3clFbG">
                                     <node concept="37vLTw" id="3_Nra3E9qVv" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817dv" />
+                                      <ref role="3cqZAo" node="4z0AnX817dv" resolve="it" />
                                     </node>
                                     <node concept="1mIQ4w" id="3_Nra3E9sJo" role="2OqNvi">
                                       <node concept="chp4Y" id="3_Nra3E9tk9" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
index 200186e7b7..decdd15537 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps
@@ -1120,7 +1120,7 @@
                       <node concept="3clFbF" id="48DDwlwVDVw" role="3cqZAp">
                         <node concept="2OqwBi" id="48DDwlwVDVx" role="3clFbG">
                           <node concept="37vLTw" id="48DDwlwVDVy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dJ" />
+                            <ref role="3cqZAo" node="4z0AnX817dJ" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="48DDwlwVDVz" role="2OqNvi">
                             <ref role="3TsBF5" to="wtll:48DDwlwUXpx" resolve="result" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
index 18bd824814..3afe3e6ff5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/models/behavior.mps
@@ -3563,7 +3563,7 @@
                               </node>
                               <node concept="2OqwBi" id="5bB0DPkzfma" role="1m5AlR">
                                 <node concept="37vLTw" id="5bB0DPkzcoh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817dL" />
+                                  <ref role="3cqZAo" node="4z0AnX817dL" resolve="it" />
                                 </node>
                                 <node concept="3JvlWi" id="5bB0DPk$VPe" role="2OqNvi" />
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
index 6c7c048371..7f659dcbf0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
@@ -676,7 +676,7 @@
                         <node concept="2OqwBi" id="7VuYlCRLHJb" role="3fr31v">
                           <node concept="2OqwBi" id="7VuYlCRLHJc" role="2Oq$k0">
                             <node concept="37vLTw" id="7VuYlCRLHJd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817dO" />
+                              <ref role="3cqZAo" node="4z0AnX817dO" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7VuYlCRLHJe" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -720,7 +720,7 @@
                       <node concept="2OqwBi" id="7VuYlCRLJ9S" role="3clFbG">
                         <node concept="2OqwBi" id="7VuYlCRLJ9T" role="2Oq$k0">
                           <node concept="37vLTw" id="7VuYlCRLJ9U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dQ" />
+                            <ref role="3cqZAo" node="4z0AnX817dQ" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7VuYlCRLJ9V" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -823,7 +823,7 @@
                       <node concept="2OqwBi" id="7VuYlCRLsNi" role="3clFbG">
                         <node concept="2OqwBi" id="7VuYlCRLrGk" role="2Oq$k0">
                           <node concept="37vLTw" id="7VuYlCRLrrD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817dS" />
+                            <ref role="3cqZAo" node="4z0AnX817dS" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7VuYlCRLsoa" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
index 8f5a3da6bc..2b79f75a57 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps
@@ -1724,7 +1724,7 @@
                   <node concept="3clFbF" id="zJfofgCwst" role="3cqZAp">
                     <node concept="3y3z36" id="zJfofgCxGt" role="3clFbG">
                       <node concept="37vLTw" id="zJfofgCwss" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817dY" />
+                        <ref role="3cqZAo" node="4z0AnX817dY" resolve="it" />
                       </node>
                       <node concept="2OqwBi" id="bA6f$piPZq" role="3uHU7w">
                         <node concept="37vLTw" id="bA6f$piPZr" role="2Oq$k0">
@@ -2052,7 +2052,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="1PW6P0ZLheW" role="1LFl5Q">
                                   <node concept="37vLTw" id="1PW6P0ZLheX" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817e0" />
+                                    <ref role="3cqZAo" node="4z0AnX817e0" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="1PW6P0ZLheY" role="2OqNvi">
                                     <ref role="37wK5l" to="b1h1:2NHHcg2Ff6S" resolve="range" />
@@ -2092,7 +2092,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="1PW6P0ZLhfd" role="1LFl5Q">
                                   <node concept="37vLTw" id="1PW6P0ZLhfe" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817e2" />
+                                    <ref role="3cqZAo" node="4z0AnX817e2" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="1PW6P0ZLhff" role="2OqNvi">
                                     <ref role="37wK5l" to="b1h1:2NHHcg2Ff6S" resolve="range" />
@@ -2183,7 +2183,7 @@
                         <node concept="3clFbF" id="1PW6P0ZLhfK" role="3cqZAp">
                           <node concept="2OqwBi" id="1PW6P0ZLhfL" role="3clFbG">
                             <node concept="37vLTw" id="1PW6P0ZLhfM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817e4" />
+                              <ref role="3cqZAo" node="4z0AnX817e4" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="1PW6P0ZLhfN" role="2OqNvi">
                               <ref role="37wK5l" to="b1h1:19PglA20ASE" resolve="precision" />
@@ -2442,13 +2442,13 @@
                               <node concept="22lmx$" id="x6NxUzmLE5" role="3clFbG">
                                 <node concept="3clFbC" id="x6NxUzmviX" role="3uHU7B">
                                   <node concept="37vLTw" id="x6NxUzmqPZ" role="3uHU7B">
-                                    <ref role="3cqZAo" node="4z0AnX817e6" />
+                                    <ref role="3cqZAo" node="4z0AnX817e6" resolve="it" />
                                   </node>
                                   <node concept="10Nm6u" id="x6NxUzm$LQ" role="3uHU7w" />
                                 </node>
                                 <node concept="2OqwBi" id="5Am5nOLsgTA" role="3uHU7w">
                                   <node concept="37vLTw" id="1G7Ce6ww1h5" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817e6" />
+                                    <ref role="3cqZAo" node="4z0AnX817e6" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="5Am5nOLsxWo" role="2OqNvi">
                                     <node concept="chp4Y" id="5Am5nOLsFwD" role="cj9EA">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
index 5fb143c245..5adb7b38e2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
@@ -4246,7 +4246,7 @@
                                   <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                                   <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
                                   <node concept="37vLTw" id="53cOfDpyX5I" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817dU" />
+                                    <ref role="3cqZAo" node="4z0AnX817dU" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -4275,7 +4275,7 @@
                                     <property role="Xl_RC" value="Multiple otherwise literals are not allowed" />
                                   </node>
                                   <node concept="37vLTw" id="53cOfDpd6ik" role="1urrMF">
-                                    <ref role="3cqZAo" node="4z0AnX817dW" />
+                                    <ref role="3cqZAo" node="4z0AnX817dW" resolve="it" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
index 68a796a968..e75d7d601e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/behavior.mps
@@ -281,7 +281,7 @@
                     <node concept="3clFbF" id="7S4tmubDTU4" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDU8u" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDTU3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817e8" />
+                          <ref role="3cqZAo" node="4z0AnX817e8" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDUtm" role="2OqNvi">
                           <ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
@@ -503,7 +503,7 @@
                     <node concept="2OqwBi" id="7bd8pkkAIAf" role="3clFbG">
                       <node concept="2OqwBi" id="7bd8pkkAHoq" role="2Oq$k0">
                         <node concept="37vLTw" id="7bd8pkkAH7A" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ea" />
+                          <ref role="3cqZAo" node="4z0AnX817ea" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7bd8pkkAHGP" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -577,7 +577,7 @@
                     <node concept="2OqwBi" id="7bd8pkk$AjA" role="3clFbG">
                       <node concept="2OqwBi" id="7bd8pkk$$SS" role="2Oq$k0">
                         <node concept="37vLTw" id="7bd8pkk$$A9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ec" />
+                          <ref role="3cqZAo" node="4z0AnX817ec" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7bd8pkk$_h5" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -625,7 +625,7 @@
                     <node concept="2OqwBi" id="4J6AqiIYd9e" role="3clFbG">
                       <node concept="2OqwBi" id="4J6AqiIYd9f" role="2Oq$k0">
                         <node concept="37vLTw" id="4J6AqiIYd9g" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ee" />
+                          <ref role="3cqZAo" node="4z0AnX817ee" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="4J6AqiIYd9h" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -687,7 +687,7 @@
                   <node concept="3clFbF" id="33mFrum_4eS" role="3cqZAp">
                     <node concept="2OqwBi" id="33mFrum_4wC" role="3clFbG">
                       <node concept="37vLTw" id="33mFrum_4eR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817eg" />
+                        <ref role="3cqZAo" node="4z0AnX817eg" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="33mFrum_4Vf" role="2OqNvi">
                         <ref role="3TsBF5" to="19m5:33mFrum_2JP" resolve="observable" />
@@ -735,7 +735,7 @@
                   <node concept="3clFbF" id="4J6AqiIUUCd" role="3cqZAp">
                     <node concept="2OqwBi" id="4J6AqiIUUCe" role="3clFbG">
                       <node concept="37vLTw" id="4J6AqiIUUCf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817ei" />
+                        <ref role="3cqZAo" node="4z0AnX817ei" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="3H4W4di$QNF" role="2OqNvi">
                         <ref role="3TsBF5" to="19m5:4J6AqiIShjW" resolve="observable" />
@@ -2286,7 +2286,7 @@
                     <node concept="3clFbF" id="4IV0h47Gaud" role="3cqZAp">
                       <node concept="2OqwBi" id="4IV0h47GaFW" role="3clFbG">
                         <node concept="37vLTw" id="4IV0h47Gauc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ek" />
+                          <ref role="3cqZAo" node="4z0AnX817ek" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="4IV0h47GaTl" role="2OqNvi">
                           <ref role="37wK5l" to="4lqd:4IV0h47FYNX" resolve="guaranteesContextArguments" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
index 9f4a024f1e..cf26d611ea 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/editor.mps
@@ -1880,7 +1880,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817em" />
+                            <ref role="3cqZAo" node="4z0AnX817em" resolve="it" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -1895,7 +1895,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817em" />
+                            <ref role="3cqZAo" node="4z0AnX817em" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
index 57d9ef5f87..84d762ea7f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/intentions.mps
@@ -218,7 +218,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="agNjvGhIKA" role="1m5AlR">
                                     <node concept="37vLTw" id="agNjvGhHXp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817eq" />
+                                      <ref role="3cqZAo" node="4z0AnX817eq" resolve="action" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGhJDn" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -244,7 +244,7 @@
                                         </node>
                                         <node concept="TSZUe" id="agNjvGhAhj" role="2OqNvi">
                                           <node concept="37vLTw" id="agNjvGhATK" role="25WWJ7">
-                                            <ref role="3cqZAo" node="4z0AnX817eo" />
+                                            <ref role="3cqZAo" node="4z0AnX817eo" resolve="expr" />
                                           </node>
                                         </node>
                                       </node>
@@ -262,7 +262,7 @@
                         <node concept="2OqwBi" id="agNjvGhEht" role="3clFbw">
                           <node concept="2OqwBi" id="agNjvGhCTZ" role="2Oq$k0">
                             <node concept="37vLTw" id="agNjvGhClX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817eq" />
+                              <ref role="3cqZAo" node="4z0AnX817eq" resolve="action" />
                             </node>
                             <node concept="3TrEf2" id="agNjvGhDxy" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -289,7 +289,7 @@
                                 <node concept="TSZUe" id="agNjvGgZnA" role="2OqNvi">
                                   <node concept="2OqwBi" id="agNjvGgZnC" role="25WWJ7">
                                     <node concept="37vLTw" id="agNjvGgZnD" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817eq" />
+                                      <ref role="3cqZAo" node="4z0AnX817eq" resolve="action" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGgZnE" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -304,7 +304,7 @@
                       <node concept="3clFbF" id="agNjvGgZnG" role="3cqZAp">
                         <node concept="2OqwBi" id="agNjvGgZnH" role="3clFbG">
                           <node concept="37vLTw" id="agNjvGgZnI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817eq" />
+                            <ref role="3cqZAo" node="4z0AnX817eq" resolve="action" />
                           </node>
                           <node concept="3YRAZt" id="agNjvGgZnJ" role="2OqNvi" />
                         </node>
@@ -445,7 +445,7 @@
                         <node concept="2OqwBi" id="agNjvGrSHE" role="3clFbw">
                           <node concept="2OqwBi" id="agNjvGrRRX" role="2Oq$k0">
                             <node concept="37vLTw" id="agNjvGrR_W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817eu" />
+                              <ref role="3cqZAo" node="4z0AnX817eu" resolve="action" />
                             </node>
                             <node concept="3TrEf2" id="agNjvGrSbv" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -467,7 +467,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="agNjvGrU8t" role="1m5AlR">
                                     <node concept="37vLTw" id="agNjvGrTJG" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817eu" />
+                                      <ref role="3cqZAo" node="4z0AnX817eu" resolve="action" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGrUL0" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -493,7 +493,7 @@
                                         </node>
                                         <node concept="TSZUe" id="agNjvGs9$b" role="2OqNvi">
                                           <node concept="37vLTw" id="agNjvGsaa_" role="25WWJ7">
-                                            <ref role="3cqZAo" node="4z0AnX817es" />
+                                            <ref role="3cqZAo" node="4z0AnX817es" resolve="expr" />
                                           </node>
                                         </node>
                                       </node>
@@ -523,7 +523,7 @@
                                 <node concept="TSZUe" id="agNjvGsjKH" role="2OqNvi">
                                   <node concept="2OqwBi" id="agNjvGslqS" role="25WWJ7">
                                     <node concept="37vLTw" id="agNjvGskwr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817eu" />
+                                      <ref role="3cqZAo" node="4z0AnX817eu" resolve="action" />
                                     </node>
                                     <node concept="3TrEf2" id="agNjvGsmxo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="19m5:7$TgoCYhZdu" resolve="expr" />
@@ -538,7 +538,7 @@
                       <node concept="3clFbF" id="agNjvGsnXu" role="3cqZAp">
                         <node concept="2OqwBi" id="agNjvGsoAv" role="3clFbG">
                           <node concept="37vLTw" id="agNjvGsnXs" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817eu" />
+                            <ref role="3cqZAo" node="4z0AnX817eu" resolve="action" />
                           </node>
                           <node concept="3YRAZt" id="agNjvGspwk" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
index b7dea07196..f184d7477a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.statemachines/models/plugin.mps
@@ -565,7 +565,7 @@
                     <node concept="1rXfSq" id="3H4W4diDgU1" role="3clFbG">
                       <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                       <node concept="37vLTw" id="3H4W4diDgU2" role="37wK5m">
-                        <ref role="3cqZAo" node="4z0AnX817ew" />
+                        <ref role="3cqZAo" node="4z0AnX817ew" resolve="it" />
                       </node>
                       <node concept="2ShNRf" id="k9boAuazL3" role="37wK5m">
                         <node concept="1pGfFk" id="k9boAua_aU" role="2ShVmc">
@@ -1214,7 +1214,7 @@
                                           <ref role="37wK5l" to="n9sl:Z4fkwzao$i" resolve="IDArg" />
                                           <node concept="2OqwBi" id="7bd8pkkwhmk" role="37wK5m">
                                             <node concept="37vLTw" id="7bd8pkkwgY6" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817ey" />
+                                              <ref role="3cqZAo" node="4z0AnX817ey" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="7bd8pkkwifV" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1223,7 +1223,7 @@
                                           <node concept="2OqwBi" id="7bd8pkkwkzb" role="37wK5m">
                                             <node concept="2OqwBi" id="7bd8pkkwj6Z" role="2Oq$k0">
                                               <node concept="37vLTw" id="7bd8pkkwiG0" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817ey" />
+                                                <ref role="3cqZAo" node="4z0AnX817ey" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="7bd8pkkwjS6" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="zzzn:6zmBjqUkwsc" resolve="type" />
@@ -2093,7 +2093,7 @@
                         <node concept="2OqwBi" id="7bd8pkk_nwf" role="3uHU7B">
                           <node concept="2OqwBi" id="7bd8pkk_nwg" role="2Oq$k0">
                             <node concept="37vLTw" id="7bd8pkk_nwh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817e$" />
+                              <ref role="3cqZAo" node="4z0AnX817e$" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7bd8pkk_nwi" role="2OqNvi">
                               <ref role="3Tt5mk" to="19m5:33mFrumFlOJ" resolve="trigger" />
@@ -2116,7 +2116,7 @@
                               </node>
                               <node concept="2OqwBi" id="7bd8pkk_nws" role="1m5AlR">
                                 <node concept="37vLTw" id="7bd8pkk_nwt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817e$" />
+                                  <ref role="3cqZAo" node="4z0AnX817e$" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="7bd8pkk_nwu" role="2OqNvi">
                                   <ref role="3Tt5mk" to="19m5:33mFrumFlOJ" resolve="trigger" />
@@ -2647,7 +2647,7 @@
                             <node concept="1rXfSq" id="7Z_fDCwm5Yh" role="3clFbG">
                               <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                               <node concept="37vLTw" id="7Z_fDCwm5Yi" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX817eA" />
+                                <ref role="3cqZAo" node="4z0AnX817eA" resolve="it" />
                               </node>
                               <node concept="2OqwBi" id="7Z_fDCwm5Yj" role="37wK5m">
                                 <node concept="37vLTw" id="7Z_fDCwm5ZO" role="2Oq$k0">
@@ -2656,7 +2656,7 @@
                                 <node concept="liA8E" id="7Z_fDCwm5Yl" role="2OqNvi">
                                   <ref role="37wK5l" to="2ahs:6gYCXSucFwO" resolve="newChild" />
                                   <node concept="37vLTw" id="7Z_fDCwm5Ym" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817eA" />
+                                    <ref role="3cqZAo" node="4z0AnX817eA" resolve="it" />
                                   </node>
                                   <node concept="3clFbT" id="7Z_fDCwm5Yn" role="37wK5m">
                                     <property role="3clFbU" value="true" />
@@ -2665,7 +2665,7 @@
                                     <property role="Xl_RC" value="exit action" />
                                   </node>
                                   <node concept="37vLTw" id="7Z_fDCwm5Yp" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817eA" />
+                                    <ref role="3cqZAo" node="4z0AnX817eA" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -2814,7 +2814,7 @@
                             <node concept="1rXfSq" id="k9boAuanvC" role="3clFbG">
                               <ref role="37wK5l" to="n9sl:Z4fkwzhf8Q" resolve="eval" />
                               <node concept="37vLTw" id="k9boAuanvD" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX817eC" />
+                                <ref role="3cqZAo" node="4z0AnX817eC" resolve="it" />
                               </node>
                               <node concept="2OqwBi" id="k9boAuanvE" role="37wK5m">
                                 <node concept="37vLTw" id="k9boAuanvF" role="2Oq$k0">
@@ -2823,7 +2823,7 @@
                                 <node concept="liA8E" id="k9boAuanvG" role="2OqNvi">
                                   <ref role="37wK5l" to="2ahs:6gYCXSucFwO" resolve="newChild" />
                                   <node concept="37vLTw" id="k9boAuanvH" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817eC" />
+                                    <ref role="3cqZAo" node="4z0AnX817eC" resolve="it" />
                                   </node>
                                   <node concept="3clFbT" id="k9boAuanvI" role="37wK5m">
                                     <property role="3clFbU" value="true" />
@@ -2832,7 +2832,7 @@
                                     <property role="Xl_RC" value="entry action" />
                                   </node>
                                   <node concept="37vLTw" id="k9boAuanvK" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817eC" />
+                                    <ref role="3cqZAo" node="4z0AnX817eC" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -3173,7 +3173,7 @@
                         <node concept="2OqwBi" id="6XMQOZeaC19" role="3clFbG">
                           <node concept="2OqwBi" id="6XMQOZeaC1a" role="2Oq$k0">
                             <node concept="37vLTw" id="6XMQOZeaC1b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817eE" />
+                              <ref role="3cqZAo" node="4z0AnX817eE" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6XMQOZeaC1c" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3660,7 +3660,7 @@
                               <node concept="2OqwBi" id="7dN4gbaezqD" role="3uHU7B">
                                 <node concept="2OqwBi" id="7dN4gbaeynh" role="2Oq$k0">
                                   <node concept="37vLTw" id="7dN4gbaey6$" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817eG" />
+                                    <ref role="3cqZAo" node="4z0AnX817eG" resolve="it" />
                                   </node>
                                   <node concept="3AY5_j" id="7dN4gbaeyTU" role="2OqNvi" />
                                 </node>
@@ -3676,7 +3676,7 @@
                               <node concept="2OqwBi" id="7dN4gbag1hH" role="2Oq$k0">
                                 <node concept="2OqwBi" id="7dN4gbaeAb9" role="2Oq$k0">
                                   <node concept="37vLTw" id="7dN4gbae_QI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817eG" />
+                                    <ref role="3cqZAo" node="4z0AnX817eG" resolve="it" />
                                   </node>
                                   <node concept="3AV6Ez" id="7dN4gbaeAAk" role="2OqNvi" />
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
index f09af9e54c..9314b24502 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.behavior.mps
@@ -439,7 +439,7 @@
                       <node concept="2OqwBi" id="6KviS2K_Jer" role="3clFbG">
                         <node concept="2OqwBi" id="6KviS2K_IT0" role="2Oq$k0">
                           <node concept="37vLTw" id="6KviS2K_IES" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817eJ" />
+                            <ref role="3cqZAo" node="4z0AnX817eJ" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="6KviS2K_J7u" role="2OqNvi">
                             <ref role="37wK5l" node="4lCUG7OsQyi" resolve="resolve" />
@@ -489,7 +489,7 @@
                         <node concept="3clFbF" id="pOv0_Xzl8M" role="3cqZAp">
                           <node concept="2OqwBi" id="pOv0_Xzlkc" role="3clFbG">
                             <node concept="37vLTw" id="pOv0_Xzl8L" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817eL" />
+                              <ref role="3cqZAo" node="4z0AnX817eL" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="pOv0_XzlzC" role="2OqNvi">
                               <ref role="37wK5l" node="5wF$o0BLTj$" resolve="makeX" />
@@ -906,7 +906,7 @@
                         <node concept="3clFbF" id="5wF$o0BM0z5" role="3cqZAp">
                           <node concept="2OqwBi" id="5wF$o0BM0J_" role="3clFbG">
                             <node concept="37vLTw" id="5wF$o0BM0z4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817eN" />
+                              <ref role="3cqZAo" node="4z0AnX817eN" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5wF$o0BM1ay" role="2OqNvi">
                               <ref role="37wK5l" node="5wF$o0BLWcU" resolve="makeX" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
index a0a5dc14e3..0aa81f15df 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/plugin.mps
@@ -574,7 +574,7 @@
                 <node concept="3clFbS" id="3nGzaxUtfSw" role="1bW5cS">
                   <node concept="3clFbF" id="3nGzaxUtfSx" role="3cqZAp">
                     <node concept="37vLTw" id="3nGzaxUtfSy" role="3clFbG">
-                      <ref role="3cqZAo" node="4z0AnX817eU" />
+                      <ref role="3cqZAo" node="4z0AnX817eU" resolve="it" />
                     </node>
                   </node>
                 </node>
@@ -968,7 +968,7 @@
                 <node concept="3clFbS" id="4eVSC65wKJe" role="1bW5cS">
                   <node concept="3clFbF" id="4eVSC65wKJf" role="3cqZAp">
                     <node concept="37vLTw" id="4eVSC65wKJg" role="3clFbG">
-                      <ref role="3cqZAo" node="4z0AnX817eW" />
+                      <ref role="3cqZAo" node="4z0AnX817eW" resolve="it" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
index 6ea0184739..5165848bc1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models/typesystem.mps
@@ -931,7 +931,7 @@
                       <ref role="1Pybhc" node="6belQKqkKUV" resolve="TemporalHelper" />
                       <node concept="2OqwBi" id="7Ndb$5paR9y" role="37wK5m">
                         <node concept="37vLTw" id="7Ndb$5paR9z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817eS" />
+                          <ref role="3cqZAo" node="4z0AnX817eS" resolve="slice" />
                         </node>
                         <node concept="3TrEf2" id="7Ndb$5paR9$" role="2OqNvi">
                           <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -948,7 +948,7 @@
                       </node>
                       <node concept="2OqwBi" id="6belQKqlyc4" role="1urrMF">
                         <node concept="37vLTw" id="6belQKqlxC7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817eS" />
+                          <ref role="3cqZAo" node="4z0AnX817eS" resolve="slice" />
                         </node>
                         <node concept="3TrEf2" id="6belQKqlz5j" role="2OqNvi">
                           <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -972,7 +972,7 @@
                             </node>
                             <node concept="2OqwBi" id="6belQKqo2Ua" role="1urrMF">
                               <node concept="37vLTw" id="6W4XqNw255u" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817eS" />
+                                <ref role="3cqZAo" node="4z0AnX817eS" resolve="slice" />
                               </node>
                               <node concept="3TrEf2" id="6belQKqo3TC" role="2OqNvi">
                                 <ref role="3Tt5mk" to="l462:50smQ1V8QEi" resolve="pointInTime" />
@@ -1026,7 +1026,7 @@
                                     <node concept="3cpWs6" id="JblrdgIKOg" role="3cqZAp">
                                       <node concept="2OqwBi" id="JblrdgIKOi" role="3cqZAk">
                                         <node concept="37vLTw" id="JblrdgIKOj" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817eQ" />
+                                          <ref role="3cqZAo" node="4z0AnX817eQ" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="JblrdgIKOk" role="2OqNvi">
                                           <ref role="37wK5l" to="pbu6:7GwCuf2r4g6" resolve="isSameAs" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
index fe9b357e4e..bfb46200ce 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/generator/template/main@generator.mps
@@ -637,8 +637,8 @@
                       <node concept="1Y3b0j" id="7MpFXKnGw3o" role="YeSDq">
                         <property role="2bfB8j" value="true" />
                         <property role="373rjd" value="true" />
-                        <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="ExceptionRunnable" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                        <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="BaseTestBody.ExceptionRunnable" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                         <node concept="3Tm1VV" id="7MpFXKnGw3p" role="1B3o_S" />
                         <node concept="3clFb_" id="7MpFXKnGw3C" role="jymVt">
                           <property role="TrG5h" value="run" />
@@ -701,7 +701,7 @@
                             </node>
                           </node>
                           <node concept="2AHcQZ" id="7MpFXKnGw3J" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" />
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
@@ -777,8 +777,8 @@
                     <node concept="1Y3b0j" id="7MpFXKnGxNj" role="YeSDq">
                       <property role="2bfB8j" value="true" />
                       <property role="373rjd" value="true" />
-                      <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="ExceptionRunnable" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                      <ref role="1Y3XeK" to="tp6m:ZcWKOiCwiP" resolve="BaseTestBody.ExceptionRunnable" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                       <node concept="3Tm1VV" id="7MpFXKnGxNk" role="1B3o_S" />
                       <node concept="3clFb_" id="7MpFXKnGxNz" role="jymVt">
                         <property role="TrG5h" value="run" />
@@ -882,7 +882,7 @@
                           </node>
                         </node>
                         <node concept="2AHcQZ" id="7MpFXKnGxNE" role="2AJF6D">
-                          <ref role="2AI5Lk" to="wyt6:~Override" />
+                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
index a5b0fc0c33..ac3f8d1c6d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
@@ -556,7 +556,7 @@
                       <node concept="2OqwBi" id="5Pgo_AS5DlS" role="3clFbG">
                         <node concept="2OqwBi" id="5Pgo_AS5CzJ" role="2Oq$k0">
                           <node concept="37vLTw" id="5Pgo_AS5CzK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817eY" />
+                            <ref role="3cqZAo" node="4z0AnX817eY" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="5Pgo_AS5CzL" role="2OqNvi" />
                         </node>
@@ -614,7 +614,7 @@
                       <node concept="2OqwBi" id="5Pgo_AS5FdJ" role="3clFbG">
                         <node concept="2OqwBi" id="5Pgo_AS5CMH" role="2Oq$k0">
                           <node concept="37vLTw" id="5Pgo_AS5CMI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817f0" />
+                            <ref role="3cqZAo" node="4z0AnX817f0" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="5Pgo_AS5CMJ" role="2OqNvi" />
                         </node>
@@ -1798,7 +1798,7 @@
                   <node concept="3clFbF" id="4ssrwy9SEuU" role="3cqZAp">
                     <node concept="2OqwBi" id="4ssrwy9SEuV" role="3clFbG">
                       <node concept="37vLTw" id="4ssrwy9SEuW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817f2" />
+                        <ref role="3cqZAo" node="4z0AnX817f2" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="59WscmUTnLB" role="2OqNvi">
                         <ref role="37wK5l" node="59WscmUTju7" resolve="nonEmptyItems" />
@@ -1840,7 +1840,7 @@
                   <node concept="3clFbF" id="ub9nkyQ5tv" role="3cqZAp">
                     <node concept="2OqwBi" id="ub9nkyQ5xj" role="3clFbG">
                       <node concept="37vLTw" id="ub9nkyQ5tt" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817f4" />
+                        <ref role="3cqZAo" node="4z0AnX817f4" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="ub9nkyQaN8" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumrTm" resolve="runManually" />
@@ -2114,7 +2114,7 @@
                         <ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
                         <ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
                         <node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817f6" />
+                          <ref role="3cqZAo" node="4z0AnX817f6" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -3135,7 +3135,7 @@
                     <node concept="3fqX7Q" id="4_qY3E4DnMj" role="3clFbG">
                       <node concept="2OqwBi" id="4_qY3E4Do9D" role="3fr31v">
                         <node concept="37vLTw" id="4_qY3E4DnVy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817f8" />
+                          <ref role="3cqZAo" node="4z0AnX817f8" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4_qY3E4DoN5" role="2OqNvi">
                           <node concept="chp4Y" id="4_qY3E4DoZe" role="cj9EA">
@@ -4913,7 +4913,7 @@
                         <node concept="2OqwBi" id="6UrZmTWpfp4" role="3clFbG">
                           <node concept="2OqwBi" id="6UrZmTWpdBF" role="2Oq$k0">
                             <node concept="37vLTw" id="6UrZmTWpdBG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fa" />
+                              <ref role="3cqZAo" node="4z0AnX817fa" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="6UrZmTWpdBH" role="2OqNvi" />
                           </node>
@@ -5196,7 +5196,7 @@
                           <node concept="3fqX7Q" id="18$bUx5DE1n" role="3K4E3e">
                             <node concept="2OqwBi" id="18$bUx5DE1p" role="3fr31v">
                               <node concept="37vLTw" id="18$bUx5DE1q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fc" />
+                                <ref role="3cqZAo" node="4z0AnX817fc" resolve="it" />
                               </node>
                               <node concept="liA8E" id="18$bUx5DE1r" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:6SpoPQg9EIA" resolve="isComplete" />
@@ -5254,7 +5254,7 @@
                           <node concept="2OqwBi" id="18$bUx5_ErM" role="1m5AlR">
                             <node concept="2OqwBi" id="18$bUx5_ErN" role="2Oq$k0">
                               <node concept="37vLTw" id="18$bUx5_J3X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fe" />
+                                <ref role="3cqZAo" node="4z0AnX817fe" resolve="it" />
                               </node>
                               <node concept="liA8E" id="18$bUx5_ErP" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:3_DFadMHbO3" resolve="concept" />
@@ -5282,7 +5282,7 @@
                         </node>
                         <node concept="2OqwBi" id="18$bUx5_ErW" role="37vLTx">
                           <node concept="37vLTw" id="18$bUx5_Jq2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fe" />
+                            <ref role="3cqZAo" node="4z0AnX817fe" resolve="it" />
                           </node>
                           <node concept="liA8E" id="18$bUx5_ErY" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:3_DFadMPhUx" resolve="status" />
@@ -5970,7 +5970,7 @@
                             <node concept="3fqX7Q" id="77QyhEfRbDt" role="3uHU7w">
                               <node concept="2OqwBi" id="77QyhEfRbDv" role="3fr31v">
                                 <node concept="37vLTw" id="77QyhEfRbDw" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fg" />
+                                  <ref role="3cqZAo" node="4z0AnX817fg" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="77QyhEfRbDx" role="2OqNvi">
                                   <node concept="chp4Y" id="77QyhEfRbDy" role="cj9EA">
@@ -5982,7 +5982,7 @@
                             <node concept="3clFbC" id="4e_7uAswuMb" role="3uHU7B">
                               <node concept="2OqwBi" id="4e_7uAswu5i" role="3uHU7B">
                                 <node concept="37vLTw" id="4e_7uAswtSB" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fg" />
+                                  <ref role="3cqZAo" node="4z0AnX817fg" resolve="it" />
                                 </node>
                                 <node concept="1mfA1w" id="4e_7uAswurt" role="2OqNvi" />
                               </node>
@@ -6203,7 +6203,7 @@
                                 <node concept="2OqwBi" id="1yEri41iIyS" role="1m5AlR">
                                   <node concept="2OqwBi" id="1yEri41iIyT" role="2Oq$k0">
                                     <node concept="37vLTw" id="1yEri41iIyU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817fi" />
+                                      <ref role="3cqZAo" node="4z0AnX817fi" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="1yEri41iIyV" role="2OqNvi">
                                       <ref role="37wK5l" to="mhbf:~SReference.getLink()" resolve="getLink" />
@@ -6328,7 +6328,7 @@
                                 <node concept="liA8E" id="5s_Nuat2wec" role="2OqNvi">
                                   <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
                                   <node concept="37vLTw" id="5s_Nuat2wnz" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817fk" />
+                                    <ref role="3cqZAo" node="4z0AnX817fk" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -6342,7 +6342,7 @@
                               </node>
                               <node concept="2OqwBi" id="5s_Nuat4_NR" role="33vP2m">
                                 <node concept="37vLTw" id="5s_Nuat4_NS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fk" />
+                                  <ref role="3cqZAo" node="4z0AnX817fk" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="5s_Nuat4_NT" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
@@ -6364,7 +6364,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="5s_NuasXDYU" role="1m5AlR">
                                       <node concept="37vLTw" id="5s_NuasXDGe" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817fk" />
+                                        <ref role="3cqZAo" node="4z0AnX817fk" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="5s_NuasXEev" role="2OqNvi">
                                         <ref role="37wK5l" to="c17a:~SProperty.getDeclarationNode()" resolve="getDeclarationNode" />
@@ -6466,7 +6466,7 @@
                           <node concept="3fqX7Q" id="4XlPKepcfR3" role="3K4E3e">
                             <node concept="2OqwBi" id="4XlPKepcfR4" role="3fr31v">
                               <node concept="37vLTw" id="4XlPKepcfR5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fm" />
+                                <ref role="3cqZAo" node="4z0AnX817fm" resolve="it" />
                               </node>
                               <node concept="liA8E" id="4XlPKepcfR6" role="2OqNvi">
                                 <ref role="37wK5l" to="pbu6:4XlPKepacYB" resolve="isComplete" />
@@ -6515,7 +6515,7 @@
                         <node concept="2OqwBi" id="4XlPKepcfRs" role="37vLTx">
                           <node concept="2OqwBi" id="4XlPKepcfRt" role="2Oq$k0">
                             <node concept="37vLTw" id="4XlPKepcfRu" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fo" />
+                              <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4XlPKepcfRv" role="2OqNvi">
                               <ref role="37wK5l" to="pbu6:4XlPKepacYa" resolve="concept" />
@@ -6545,7 +6545,7 @@
                         </node>
                         <node concept="2OqwBi" id="4XlPKepcfRA" role="37vLTx">
                           <node concept="37vLTw" id="4XlPKepcfRB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fo" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="4XlPKepcfRC" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4XlPKepacZ6" resolve="status" />
@@ -6557,7 +6557,7 @@
                       <node concept="37vLTI" id="3MHhZL0uvZ0" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uwjd" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uw6w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fo" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uBU2" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:3MHhZL0uyid" resolve="testCount" />
@@ -6577,7 +6577,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCcu" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCcv" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCcw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fo" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCcx" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9KlDr8" resolve="testVolume" />
@@ -6597,7 +6597,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCdh" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCdi" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCdj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fo" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCdk" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9Kl7HS" resolve="minimumHeterogeneity" />
@@ -6617,7 +6617,7 @@
                       <node concept="37vLTI" id="3MHhZL0uCec" role="3clFbG">
                         <node concept="2OqwBi" id="3MHhZL0uCed" role="37vLTx">
                           <node concept="37vLTw" id="3MHhZL0uCee" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fo" />
+                            <ref role="3cqZAo" node="4z0AnX817fo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3MHhZL0uCef" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:7zqxZ9KluoX" resolve="maximumHeterogeneity" />
@@ -6792,7 +6792,7 @@
                               </node>
                               <node concept="2OqwBi" id="5DEy7AGcxWM" role="1m5AlR">
                                 <node concept="37vLTw" id="5DEy7AGcxWN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fq" />
+                                  <ref role="3cqZAo" node="4z0AnX817fq" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5DEy7AGcxWO" role="2OqNvi">
                                   <ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
@@ -7589,7 +7589,7 @@
                           <node concept="2OqwBi" id="1vo80p3dJp" role="25KhWn">
                             <node concept="2OqwBi" id="1vo80p3dJq" role="2Oq$k0">
                               <node concept="37vLTw" id="1vo80p3dJr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fs" />
+                                <ref role="3cqZAo" node="4z0AnX817fs" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1vo80p3dJs" role="2OqNvi">
                                 <ref role="3Tt5mk" to="av4b:1vo80oMkMR" resolve="concept" />
@@ -7767,7 +7767,7 @@
                           <node concept="3fqX7Q" id="1vo80p9of_" role="3uHU7w">
                             <node concept="2OqwBi" id="1vo80p9ofB" role="3fr31v">
                               <node concept="37vLTw" id="1vo80p9ofC" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fu" />
+                                <ref role="3cqZAo" node="4z0AnX817fu" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="1vo80p9ofD" role="2OqNvi">
                                 <node concept="chp4Y" id="1vo80p9ofE" role="cj9EA">
@@ -7780,7 +7780,7 @@
                             <ref role="37wK5l" node="1vo80oO$S9" resolve="shouldAnalyze" />
                             <node concept="2OqwBi" id="1vo80oOJkF" role="37wK5m">
                               <node concept="37vLTw" id="1vo80oOJ5u" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fu" />
+                                <ref role="3cqZAo" node="4z0AnX817fu" resolve="it" />
                               </node>
                               <node concept="2yIwOk" id="1vo80oOJQv" role="2OqNvi" />
                             </node>
@@ -7824,7 +7824,7 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="5IKJrJIe5TX" role="37vLTx">
-                          <ref role="3cqZAo" node="4z0AnX817fw" />
+                          <ref role="3cqZAo" node="4z0AnX817fw" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -7848,7 +7848,7 @@
                                 <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                                 <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                 <node concept="37vLTw" id="7fsCTt5VPFn" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX817fw" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -7863,7 +7863,7 @@
                               <ref role="37wK5l" node="1vo80p38XS" resolve="getSpecFor" />
                               <node concept="2OqwBi" id="1vo80p3kzV" role="37wK5m">
                                 <node concept="37vLTw" id="1vo80p3kjJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fw" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="1vo80p3l3c" role="2OqNvi" />
                               </node>
@@ -7880,7 +7880,7 @@
                               <ref role="37wK5l" node="1vo80p38XS" resolve="getSpecFor" />
                               <node concept="2OqwBi" id="1vo80p3hHs" role="37wK5m">
                                 <node concept="37vLTw" id="1vo80p3htS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fw" />
+                                  <ref role="3cqZAo" node="4z0AnX817fw" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="1vo80p3ic1" role="2OqNvi" />
                               </node>
@@ -7903,7 +7903,7 @@
                                   <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                                   <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                                   <node concept="37vLTw" id="1vo80p3ozG" role="37wK5m">
-                                    <ref role="3cqZAo" node="4z0AnX817fw" />
+                                    <ref role="3cqZAo" node="4z0AnX817fw" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -8093,7 +8093,7 @@
                     <node concept="3clFbF" id="7fsCTt5WvCU" role="3cqZAp">
                       <node concept="2OqwBi" id="7fsCTt5WvCV" role="3clFbG">
                         <node concept="37vLTw" id="7fsCTt5WvCW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817fy" />
+                          <ref role="3cqZAo" node="4z0AnX817fy" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7fsCTt5WvCX" role="2OqNvi">
                           <ref role="37wK5l" to="kqnq:2hXd3rsZYy8" resolve="isToplevelCoverageContent" />
@@ -8130,7 +8130,7 @@
                           <ref role="37wK5l" to="pbu6:5DizcGOb6ar" resolve="getNodeCoverage" />
                           <ref role="1Pybhc" to="pbu6:4_qY3E5IXRD" resolve="DefaultCoverageAnalyzer" />
                           <node concept="37vLTw" id="7fsCTt5Wygj" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817f$" />
+                            <ref role="3cqZAo" node="4z0AnX817f$" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -8265,7 +8265,7 @@
                           </node>
                           <node concept="2OqwBi" id="1gw9pCYp0tr" role="1m5AlR">
                             <node concept="37vLTw" id="1gw9pCYoAwb" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fA" />
+                              <ref role="3cqZAo" node="4z0AnX817fA" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1gw9pCYp0KQ" role="2OqNvi">
                               <ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
@@ -8736,7 +8736,7 @@
                           </node>
                           <node concept="2OqwBi" id="4e_7uAt7r4n" role="3uHU7B">
                             <node concept="37vLTw" id="4e_7uAt7r4o" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fC" />
+                              <ref role="3cqZAo" node="4z0AnX817fC" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="4e_7uAt7r4p" role="2OqNvi" />
                           </node>
@@ -9877,7 +9877,7 @@
                             <node concept="2OqwBi" id="5AG05XYAQ8N" role="3clFbG">
                               <node concept="2OqwBi" id="5AG05XYAMMt" role="2Oq$k0">
                                 <node concept="37vLTw" id="5AG05XYALhK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817fE" />
+                                  <ref role="3cqZAo" node="4z0AnX817fE" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5AG05XYAP0s" role="2OqNvi">
                                   <ref role="3Tt5mk" to="av4b:1bwJEEf2HGQ" resolve="value" />
@@ -11340,7 +11340,7 @@
                       <node concept="2OqwBi" id="3_xsRJ4LLL1" role="3clFbG">
                         <node concept="2OqwBi" id="3_xsRJ4LL7e" role="2Oq$k0">
                           <node concept="37vLTw" id="3_xsRJ4LKTE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fG" />
+                            <ref role="3cqZAo" node="4z0AnX817fG" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3_xsRJ4LLhk" role="2OqNvi">
                             <ref role="3TsBF5" to="av4b:3_xsRJ4sa6R" resolve="internalUniqueID" />
@@ -11580,7 +11580,7 @@
                               <node concept="liA8E" id="7WSgHRL9pxD" role="2OqNvi">
                                 <ref role="37wK5l" to="oq0c:7WSgHRKY1NI" resolve="appliesTo" />
                                 <node concept="37vLTw" id="7WSgHRL9pxE" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX817fI" />
+                                  <ref role="3cqZAo" node="4z0AnX817fI" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -11859,7 +11859,7 @@
                       <node concept="2OqwBi" id="1qjbRymX3fq" role="37wK5m">
                         <node concept="2OqwBi" id="1qjbRymX2Ld" role="2Oq$k0">
                           <node concept="37vLTw" id="1qjbRymX2C7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fK" />
+                            <ref role="3cqZAo" node="4z0AnX817fK" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1qjbRymX2W3" role="2OqNvi">
                             <ref role="3Tt5mk" to="av4b:1qjbRymSXmZ" resolve="newNode" />
@@ -11875,7 +11875,7 @@
                   <node concept="3clFbF" id="1qjbRymXP7x" role="3cqZAp">
                     <node concept="2OqwBi" id="1qjbRymXPgN" role="3clFbG">
                       <node concept="37vLTw" id="1qjbRymXP7v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817fK" />
+                        <ref role="3cqZAo" node="4z0AnX817fK" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="1qjbRymXPAc" role="2OqNvi" />
                     </node>
@@ -12644,7 +12644,7 @@
                         </node>
                         <node concept="2OqwBi" id="7aipPVpHkcG" role="3uHU7B">
                           <node concept="37vLTw" id="7aipPVpHkcH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817fM" />
+                            <ref role="3cqZAo" node="4z0AnX817fM" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="7aipPVpHkcI" role="2OqNvi" />
                         </node>
@@ -13332,7 +13332,7 @@
                         <node concept="2OqwBi" id="5Pgo_AS5orO" role="3fr31v">
                           <node concept="2OqwBi" id="5Pgo_AS5orP" role="2Oq$k0">
                             <node concept="37vLTw" id="5Pgo_AS5orQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fO" />
+                              <ref role="3cqZAo" node="4z0AnX817fO" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="5Pgo_AS5orR" role="2OqNvi" />
                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
index bc395f4f40..07e5a22c31 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
@@ -180,7 +180,7 @@
                           <node concept="10Nm6u" id="1F1F0IUZAJD" role="3uHU7w" />
                           <node concept="2OqwBi" id="1F1F0IUZAJE" role="3uHU7B">
                             <node concept="37vLTw" id="1F1F0IUZAJF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817fQ" />
+                              <ref role="3cqZAo" node="4z0AnX817fQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1F1F0IUZAJG" role="2OqNvi">
                               <ref role="3Tt5mk" to="4kwy:cJpacq40jC" resolve="optionalName" />
@@ -439,7 +439,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="GEat54MAOd" role="1LFl5Q">
-                            <ref role="3cqZAo" node="4z0AnX817fS" />
+                            <ref role="3cqZAo" node="4z0AnX817fS" resolve="it" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
index 500b3a785e..5ae956c75a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
@@ -3260,7 +3260,7 @@
                           <node concept="3clFbF" id="1vJWYav6Cka" role="3cqZAp">
                             <node concept="2OqwBi" id="1vJWYav6Ckb" role="3clFbG">
                               <node concept="37vLTw" id="1vJWYav6Ckc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817fU" />
+                                <ref role="3cqZAo" node="4z0AnX817fU" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="1vJWYav6Ckd" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3301,7 +3301,7 @@
                                 <property role="3cmrfH" value="1" />
                               </node>
                               <node concept="37vLTw" id="1vJWYav6GbL" role="1LFl5Q">
-                                <ref role="3cqZAo" node="4z0AnX817fW" />
+                                <ref role="3cqZAo" node="4z0AnX817fW" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -3666,7 +3666,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="1bwJEEf3A$J" role="3uHU7B">
                                             <node concept="37vLTw" id="1bwJEEf3Al7" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817fY" />
+                                              <ref role="3cqZAo" node="4z0AnX817fY" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="1bwJEEf3AZv" role="2OqNvi">
                                               <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -3842,7 +3842,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="1bwJEEgpA8z" role="3uHU7B">
                                               <node concept="37vLTw" id="1bwJEEgpA8$" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817g0" />
+                                                <ref role="3cqZAo" node="4z0AnX817g0" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="1bwJEEgpBAR" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="av4b:1bwJEEgpfj2" resolve="out" />
@@ -4297,7 +4297,7 @@
                               </node>
                               <node concept="2OqwBi" id="1bwJEEfccT0" role="3uHU7B">
                                 <node concept="37vLTw" id="1bwJEEfccAQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817g2" />
+                                  <ref role="3cqZAo" node="4z0AnX817g2" resolve="it" />
                                 </node>
                                 <node concept="2bSWHS" id="1bwJEEfcd7N" role="2OqNvi" />
                               </node>
@@ -4329,7 +4329,7 @@
                             <node concept="1frAZD" id="1bwJEEfN604" role="2Oq$k0" />
                             <node concept="2CJim2" id="1bwJEEfN6Fl" role="2OqNvi">
                               <node concept="37vLTw" id="1bwJEEfN7Pm" role="2CJshu">
-                                <ref role="3cqZAo" node="4z0AnX817g4" />
+                                <ref role="3cqZAo" node="4z0AnX817g4" resolve="it" />
                               </node>
                               <node concept="2CJsh3" id="1bwJEEfN6Fn" role="2CJshi">
                                 <node concept="3EZMnI" id="1bwJEEfN85K" role="2wV5jI">
@@ -5592,7 +5592,7 @@
                                 <node concept="3clFbF" id="5Pgo_ASgPsn" role="3cqZAp">
                                   <node concept="2OqwBi" id="5Pgo_ASgPso" role="3clFbG">
                                     <node concept="37vLTw" id="5Pgo_ASgPsp" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817g6" />
+                                      <ref role="3cqZAo" node="4z0AnX817g6" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="5Pgo_ASgPsq" role="2OqNvi">
                                       <ref role="37wK5l" to="2ahs:4fb2DFB6IMb" resolve="getTargetNode" />
@@ -6612,7 +6612,7 @@
                                 <node concept="3clFbF" id="1gw9pCYi7z0" role="3cqZAp">
                                   <node concept="2OqwBi" id="1gw9pCYi7z1" role="3clFbG">
                                     <node concept="37vLTw" id="1gw9pCYi7z2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817g8" />
+                                      <ref role="3cqZAo" node="4z0AnX817g8" resolve="it" />
                                     </node>
                                     <node concept="I4A8Y" id="1gw9pCYi7z3" role="2OqNvi" />
                                   </node>
@@ -6633,7 +6633,7 @@
                             <node concept="3clFbF" id="1gw9pCYi7za" role="3cqZAp">
                               <node concept="2OqwBi" id="1gw9pCYi7zd" role="3clFbG">
                                 <node concept="37vLTw" id="1gw9pCYi7ze" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ga" />
+                                  <ref role="3cqZAo" node="4z0AnX817ga" resolve="it" />
                                 </node>
                                 <node concept="LkI2h" id="1gw9pCYi7zf" role="2OqNvi" />
                               </node>
@@ -6656,7 +6656,7 @@
                                   <ref role="3cqZAo" node="1gw9pCYiuTs" resolve="s" />
                                 </node>
                                 <node concept="37vLTw" id="1gw9pCYiy9s" role="3uHU7w">
-                                  <ref role="3cqZAo" node="4z0AnX817gc" />
+                                  <ref role="3cqZAo" node="4z0AnX817gc" resolve="it" />
                                 </node>
                               </node>
                               <node concept="Xl_RD" id="1gw9pCYkvFU" role="3uHU7w">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
index d9db75e66d..7083b17a77 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/findUsages.mps
@@ -215,7 +215,7 @@
                     <node concept="3clFbS" id="18$bUx5qi2X" role="1bW5cS">
                       <node concept="1O1abz" id="18$bUx5q6uv" role="3cqZAp">
                         <node concept="37vLTw" id="18$bUx5qizy" role="1O1k6O">
-                          <ref role="3cqZAo" node="4z0AnX817ge" />
+                          <ref role="3cqZAo" node="4z0AnX817ge" resolve="it" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
index a8472e8c9e..f0f5b06708 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/intentions.mps
@@ -455,7 +455,7 @@
                   <node concept="3clFbF" id="ub9nkyQ51e" role="3cqZAp">
                     <node concept="2OqwBi" id="ub9nkyPnC$" role="3clFbG">
                       <node concept="37vLTw" id="ub9nkyPnC_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817gg" />
+                        <ref role="3cqZAo" node="4z0AnX817gg" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="ub9nkyQb6k" role="2OqNvi">
                         <ref role="37wK5l" to="gdgh:3R3AIvumrTm" resolve="runManually" />
@@ -883,7 +883,7 @@
                       <node concept="2OqwBi" id="1bwJEEfPJii" role="3clFbG">
                         <node concept="2OqwBi" id="1bwJEEfPIRh" role="2Oq$k0">
                           <node concept="37vLTw" id="1bwJEEfPIFJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817gi" />
+                            <ref role="3cqZAo" node="4z0AnX817gi" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1bwJEEfPJ10" role="2OqNvi">
                             <ref role="3Tt5mk" to="av4b:1bwJEEfL7oM" resolve="outcome" />
@@ -910,7 +910,7 @@
                   <node concept="3clFbF" id="1bwJEEfPKHV" role="3cqZAp">
                     <node concept="2OqwBi" id="1bwJEEfPKVl" role="3clFbG">
                       <node concept="37vLTw" id="1bwJEEfPKHU" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817gk" />
+                        <ref role="3cqZAo" node="4z0AnX817gk" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="1bwJEEfPLjc" role="2OqNvi" />
                     </node>
@@ -981,7 +981,7 @@
                               <node concept="2OqwBi" id="1bwJEEgu7lf" role="3uHU7B">
                                 <node concept="2OqwBi" id="1bwJEEgu6$P" role="2Oq$k0">
                                   <node concept="37vLTw" id="1bwJEEgu6ot" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817gm" />
+                                    <ref role="3cqZAo" node="4z0AnX817gm" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="1bwJEEgu6XJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -994,7 +994,7 @@
                               <node concept="2OqwBi" id="1bwJEEgt_Qn" role="3uHU7B">
                                 <node concept="2OqwBi" id="1bwJEEgt$TR" role="2Oq$k0">
                                   <node concept="37vLTw" id="1bwJEEgt$Io" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817gm" />
+                                    <ref role="3cqZAo" node="4z0AnX817gm" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="1bwJEEgt_3x" role="2OqNvi">
                                     <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -1006,7 +1006,7 @@
                                 <node concept="2OqwBi" id="1bwJEEgtSo2" role="3uHU7B">
                                   <node concept="2OqwBi" id="1bwJEEgtRI$" role="2Oq$k0">
                                     <node concept="37vLTw" id="1bwJEEgtRsA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817gm" />
+                                      <ref role="3cqZAo" node="4z0AnX817gm" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="1bwJEEgtS73" role="2OqNvi">
                                       <ref role="3Tt5mk" to="av4b:1bwJEEf2HGO" resolve="argument" />
@@ -1033,7 +1033,7 @@
                       <node concept="3clFbF" id="1bwJEEgtANN" role="3cqZAp">
                         <node concept="2OqwBi" id="1bwJEEgtAXT" role="3clFbG">
                           <node concept="37vLTw" id="1bwJEEgtANM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817go" />
+                            <ref role="3cqZAo" node="4z0AnX817go" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="1bwJEEgtBcn" role="2OqNvi" />
                         </node>
@@ -1065,7 +1065,7 @@
                           <node concept="3clFbF" id="1bwJEEgtBlZ" role="3cqZAp">
                             <node concept="2OqwBi" id="1bwJEEgtBm0" role="3clFbG">
                               <node concept="37vLTw" id="1bwJEEgtBm1" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817gq" />
+                                <ref role="3cqZAo" node="4z0AnX817gq" resolve="it" />
                               </node>
                               <node concept="3YRAZt" id="1bwJEEgtBm2" role="2OqNvi" />
                             </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
index a5234c3822..9a0eae54e0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/migration.mps
@@ -293,7 +293,7 @@
                           <node concept="3clFbF" id="7Z_pmaBujxa" role="3cqZAp">
                             <node concept="2OqwBi" id="7Z_pmaBujxb" role="3clFbG">
                               <node concept="37vLTw" id="7Z_pmaBujxc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817gs" />
+                                <ref role="3cqZAo" node="4z0AnX817gs" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7Z_pmaBujxd" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tp5g:hHqenIi" resolve="nodeToCheck" />
@@ -482,7 +482,7 @@
                                 <node concept="3clFbF" id="7Z_pmaBAncn" role="3cqZAp">
                                   <node concept="2OqwBi" id="7Z_pmaBAno1" role="3clFbG">
                                     <node concept="37vLTw" id="7Z_pmaBAncm" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817gu" />
+                                      <ref role="3cqZAo" node="4z0AnX817gu" resolve="it" />
                                     </node>
                                     <node concept="3YRAZt" id="7Z_pmaBAnXx" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
index 38aaf9dfcc..b066f47c11 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/listeners.mps
@@ -112,7 +112,7 @@
                   <node concept="3clFbF" id="4ptnK4jewHw" role="3cqZAp">
                     <node concept="2OqwBi" id="4ptnK4jewRL" role="3clFbG">
                       <node concept="37vLTw" id="4ptnK4jewHv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817i8" />
+                        <ref role="3cqZAo" node="4z0AnX817i8" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="4ptnK4jex3Q" role="2OqNvi" />
                     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
index 2a20179761..6970600ebc 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
@@ -751,7 +751,7 @@
                             <node concept="3clFbF" id="5fy$GmV4lLS" role="3cqZAp">
                               <node concept="2OqwBi" id="5fy$GmV4lLT" role="3clFbG">
                                 <node concept="37vLTw" id="5fy$GmV4lLU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817gw" />
+                                  <ref role="3cqZAo" node="4z0AnX817gw" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="5fy$GmV4lLV" role="2OqNvi">
                                   <node concept="chp4Y" id="5fy$GmV4lLW" role="cj9EA">
@@ -775,7 +775,7 @@
                             <node concept="2OqwBi" id="5fy$GmV50ax" role="3clFbG">
                               <node concept="2OqwBi" id="5fy$GmV4nsi" role="2Oq$k0">
                                 <node concept="37vLTw" id="5fy$GmV4nbN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817gy" />
+                                  <ref role="3cqZAo" node="4z0AnX817gy" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5fy$GmV4nFx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -818,7 +818,7 @@
                         <node concept="2OqwBi" id="3RtoCzi7o4W" role="3clFbG">
                           <node concept="2OqwBi" id="3RtoCzi7l5u" role="2Oq$k0">
                             <node concept="37vLTw" id="13V9Kfd$3Ef" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817gC" />
+                              <ref role="3cqZAo" node="4z0AnX817gC" resolve="constraint" />
                             </node>
                             <node concept="2Rf3mk" id="3RtoCzi7lBV" role="2OqNvi">
                               <node concept="1xMEDy" id="3RtoCzi7lBX" role="1xVPHs">
@@ -835,7 +835,7 @@
                                 <node concept="3clFbF" id="3RtoCzi7rUn" role="3cqZAp">
                                   <node concept="2OqwBi" id="3RtoCzi7s6G" role="3clFbG">
                                     <node concept="37vLTw" id="3RtoCzi7rUl" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817g$" />
+                                      <ref role="3cqZAo" node="4z0AnX817g$" resolve="res" />
                                     </node>
                                     <node concept="1P9Npp" id="3RtoCzi7swc" role="2OqNvi">
                                       <node concept="2pJPEk" id="3RtoCzi7zD3" role="1P9ThW">
@@ -874,7 +874,7 @@
                         <node concept="2OqwBi" id="3RtoCzidmAs" role="3clFbG">
                           <node concept="2OqwBi" id="3RtoCzidji0" role="2Oq$k0">
                             <node concept="37vLTw" id="13V9Kfd$5aZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817gC" />
+                              <ref role="3cqZAo" node="4z0AnX817gC" resolve="constraint" />
                             </node>
                             <node concept="2Rf3mk" id="3RtoCzidjzF" role="2OqNvi">
                               <node concept="1xMEDy" id="3RtoCzidjzH" role="1xVPHs">
@@ -895,7 +895,7 @@
                                     <node concept="2OqwBi" id="3RtoCziduDw" role="33vP2m">
                                       <node concept="2OqwBi" id="3RtoCziduDx" role="2Oq$k0">
                                         <node concept="37vLTw" id="3RtoCziduDy" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817gA" />
+                                          <ref role="3cqZAo" node="4z0AnX817gA" resolve="ref" />
                                         </node>
                                         <node concept="3TrEf2" id="3RtoCziduDz" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -930,7 +930,7 @@
                                 <node concept="3clFbF" id="3RtoCzidr$G" role="3cqZAp">
                                   <node concept="2OqwBi" id="3RtoCzidrLW" role="3clFbG">
                                     <node concept="37vLTw" id="3RtoCzidr$E" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817gA" />
+                                      <ref role="3cqZAo" node="4z0AnX817gA" resolve="ref" />
                                     </node>
                                     <node concept="1P9Npp" id="3RtoCzidsj$" role="2OqNvi">
                                       <node concept="2OqwBi" id="13V9Kfd$i$G" role="1P9ThW">
@@ -1037,7 +1037,7 @@
                             <node concept="BsUDl" id="74u6qanTSDb" role="3clFbG">
                               <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                               <node concept="37vLTw" id="74u6qanTT2L" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX817gE" />
+                                <ref role="3cqZAo" node="4z0AnX817gE" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -1219,7 +1219,7 @@
                         <node concept="1pGfFk" id="2nByCcxY9t1" role="2ShVmc">
                           <ref role="37wK5l" to="oq0c:3ni3WidV2MT" resolve="EffectHelper" />
                           <node concept="37vLTw" id="2nByCcxY9_I" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817gG" />
+                            <ref role="3cqZAo" node="4z0AnX817gG" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -1299,7 +1299,7 @@
                             <node concept="3clFbF" id="2i_9vDmz_lr" role="3cqZAp">
                               <node concept="2OqwBi" id="2i_9vDmz_$b" role="3clFbG">
                                 <node concept="37vLTw" id="2i_9vDmz_lq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817gI" />
+                                  <ref role="3cqZAo" node="4z0AnX817gI" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="2i_9vDmz_RC" role="2OqNvi">
                                   <node concept="chp4Y" id="2i_9vDmz_Zx" role="cj9EA">
@@ -1322,7 +1322,7 @@
                           <node concept="3clFbF" id="2i_9vDmzATt" role="3cqZAp">
                             <node concept="2OqwBi" id="2i_9vDmzB9W" role="3clFbG">
                               <node concept="37vLTw" id="2i_9vDmzATs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817gK" />
+                                <ref role="3cqZAo" node="4z0AnX817gK" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2i_9vDmzBp9" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -1388,7 +1388,7 @@
                           </node>
                           <node concept="2OqwBi" id="2i_9vDmzLFK" role="33vP2m">
                             <node concept="37vLTw" id="2i_9vDmzLv8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817gM" />
+                              <ref role="3cqZAo" node="4z0AnX817gM" resolve="c" />
                             </node>
                             <node concept="1$rogu" id="2i_9vDmzLWl" role="2OqNvi" />
                           </node>
@@ -1933,7 +1933,7 @@
                             <node concept="3clFbF" id="74u6qanTb40" role="3cqZAp">
                               <node concept="2OqwBi" id="74u6qanTb41" role="3clFbG">
                                 <node concept="37vLTw" id="74u6qanTb42" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817gO" />
+                                  <ref role="3cqZAo" node="4z0AnX817gO" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="74u6qanTb43" role="2OqNvi">
                                   <node concept="chp4Y" id="74u6qanTb44" role="cj9EA">
@@ -1957,7 +1957,7 @@
                             <node concept="2OqwBi" id="74u6qanTb4b" role="3clFbG">
                               <node concept="2OqwBi" id="74u6qanTb4c" role="2Oq$k0">
                                 <node concept="37vLTw" id="74u6qanTb4d" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817gQ" />
+                                  <ref role="3cqZAo" node="4z0AnX817gQ" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="74u6qanTb4e" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -2000,7 +2000,7 @@
                         <node concept="2OqwBi" id="74u6qanTb4v" role="3clFbG">
                           <node concept="2OqwBi" id="74u6qanTb4w" role="2Oq$k0">
                             <node concept="37vLTw" id="74u6qanTb4x" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817gW" />
+                              <ref role="3cqZAo" node="4z0AnX817gW" resolve="constraint" />
                             </node>
                             <node concept="2Rf3mk" id="74u6qanTb4y" role="2OqNvi">
                               <node concept="1xMEDy" id="74u6qanTb4z" role="1xVPHs">
@@ -2017,7 +2017,7 @@
                                 <node concept="3clFbF" id="74u6qanTb4D" role="3cqZAp">
                                   <node concept="2OqwBi" id="74u6qanTb4E" role="3clFbG">
                                     <node concept="37vLTw" id="74u6qanTb4F" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817gS" />
+                                      <ref role="3cqZAo" node="4z0AnX817gS" resolve="res" />
                                     </node>
                                     <node concept="1P9Npp" id="74u6qanTb4G" role="2OqNvi">
                                       <node concept="2pJPEk" id="74u6qanTb4H" role="1P9ThW">
@@ -2056,7 +2056,7 @@
                         <node concept="2OqwBi" id="74u6qanTb4U" role="3clFbG">
                           <node concept="2OqwBi" id="74u6qanTb4V" role="2Oq$k0">
                             <node concept="37vLTw" id="74u6qanTb4W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817gW" />
+                              <ref role="3cqZAo" node="4z0AnX817gW" resolve="constraint" />
                             </node>
                             <node concept="2Rf3mk" id="74u6qanTb4X" role="2OqNvi">
                               <node concept="1xMEDy" id="74u6qanTb4Y" role="1xVPHs">
@@ -2077,7 +2077,7 @@
                                     <node concept="2OqwBi" id="74u6qanTb57" role="33vP2m">
                                       <node concept="2OqwBi" id="74u6qanTb58" role="2Oq$k0">
                                         <node concept="37vLTw" id="74u6qanTb59" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817gU" />
+                                          <ref role="3cqZAo" node="4z0AnX817gU" resolve="ref" />
                                         </node>
                                         <node concept="3TrEf2" id="74u6qanTb5a" role="2OqNvi">
                                           <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -2188,7 +2188,7 @@
                                 <node concept="3clFbF" id="74u6qanTb5e" role="3cqZAp">
                                   <node concept="2OqwBi" id="74u6qanTb5f" role="3clFbG">
                                     <node concept="37vLTw" id="74u6qanTb5g" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817gU" />
+                                      <ref role="3cqZAo" node="4z0AnX817gU" resolve="ref" />
                                     </node>
                                     <node concept="1P9Npp" id="74u6qanTb5h" role="2OqNvi">
                                       <node concept="37vLTw" id="74u6qaotX26" role="1P9ThW">
@@ -2284,7 +2284,7 @@
                             <node concept="BsUDl" id="74u6qanTwH8" role="3clFbG">
                               <ref role="37wK5l" to="pbu6:1xFBUnx0h1Q" resolve="extractValuesFromExpression" />
                               <node concept="37vLTw" id="74u6qanTwRh" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX817gY" />
+                                <ref role="3cqZAo" node="4z0AnX817gY" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -2414,7 +2414,7 @@
                             <node concept="3clFbF" id="74u6qapyDcG" role="3cqZAp">
                               <node concept="2OqwBi" id="74u6qapyDcH" role="3clFbG">
                                 <node concept="37vLTw" id="74u6qapyDcI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817h0" />
+                                  <ref role="3cqZAo" node="4z0AnX817h0" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="74u6qapyDcJ" role="2OqNvi">
                                   <node concept="chp4Y" id="74u6qapyDcK" role="cj9EA">
@@ -2437,7 +2437,7 @@
                           <node concept="3clFbF" id="74u6qapyDcQ" role="3cqZAp">
                             <node concept="2OqwBi" id="74u6qapyDcR" role="3clFbG">
                               <node concept="37vLTw" id="74u6qapyDcS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817h2" />
+                                <ref role="3cqZAo" node="4z0AnX817h2" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="74u6qapyDcT" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -2503,7 +2503,7 @@
                           </node>
                           <node concept="2OqwBi" id="74u6qapyDdk" role="33vP2m">
                             <node concept="37vLTw" id="74u6qapyDdl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817h4" />
+                              <ref role="3cqZAo" node="4z0AnX817h4" resolve="c" />
                             </node>
                             <node concept="1$rogu" id="74u6qapyDdm" role="2OqNvi" />
                           </node>
@@ -3203,7 +3203,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817h6" />
+                        <ref role="3cqZAo" node="4z0AnX817h6" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="2Fd5B1gxdCm" role="2OqNvi">
                         <ref role="3Tt5mk" to="yv47:ub9nkyG$WU" resolve="constant" />
@@ -3792,7 +3792,7 @@
                         <ref role="37wK5l" to="pbu6:lH$PujSMTa" resolve="DefaultConstraintAndError" />
                         <node concept="2OqwBi" id="78hTg1$sDNx" role="37wK5m">
                           <node concept="37vLTw" id="78hTg1$sDE5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817h8" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="78hTg1$sEds" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3800,19 +3800,19 @@
                         </node>
                         <node concept="2OqwBi" id="68JOYCcTzlz" role="37wK5m">
                           <node concept="37vLTw" id="68JOYCcTz3q" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817h8" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="68JOYCcTzQP" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:5F8uib8hsjE" resolve="err" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="6ItA_x_aJIs" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817h8" />
+                          <ref role="3cqZAo" node="4z0AnX817h8" resolve="it" />
                         </node>
                         <node concept="2OqwBi" id="78hTg1$sH78" role="37wK5m">
                           <node concept="2OqwBi" id="78hTg1$sGxO" role="2Oq$k0">
                             <node concept="37vLTw" id="78hTg1$sGlN" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817h8" />
+                              <ref role="3cqZAo" node="4z0AnX817h8" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="78hTg1$sGOj" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -3824,7 +3824,7 @@
                         </node>
                         <node concept="2OqwBi" id="lH$PujSIX6" role="37wK5m">
                           <node concept="37vLTw" id="lH$PujSIKz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817h8" />
+                            <ref role="3cqZAo" node="4z0AnX817h8" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="lH$PujSLcE" role="2OqNvi">
                             <ref role="3TsBF5" to="hm2y:3xthw2gJs74" resolve="warning" />
@@ -4088,7 +4088,7 @@
                     <node concept="3clFbF" id="6N7p0lWz3ZK" role="3cqZAp">
                       <node concept="2OqwBi" id="6N7p0lWz48M" role="3clFbG">
                         <node concept="37vLTw" id="6N7p0lWz3ZJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ha" />
+                          <ref role="3cqZAo" node="4z0AnX817ha" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6N7p0lWz4jA" role="2OqNvi">
                           <ref role="37wK5l" to="pq1l:6N7p0lWyLeD" resolve="PriorityLevel" />
@@ -4184,7 +4184,7 @@
                   <node concept="3clFbF" id="7D7uZV2j0Y2" role="3cqZAp">
                     <node concept="2OqwBi" id="7D7uZV2j13s" role="3clFbG">
                       <node concept="37vLTw" id="7D7uZV2j0Y1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817hc" />
+                        <ref role="3cqZAo" node="4z0AnX817hc" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="7D7uZV2j1cn" role="2OqNvi">
                         <node concept="chp4Y" id="7D7uZV2pxe2" role="cj9EA">
@@ -4799,7 +4799,7 @@
                             <node concept="3clFbF" id="5ipapt3nmee" role="3cqZAp">
                               <node concept="2OqwBi" id="5ipapt3nmef" role="3clFbG">
                                 <node concept="37vLTw" id="5ipapt3nmeg" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817he" />
+                                  <ref role="3cqZAo" node="4z0AnX817he" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5ipapt3nmeh" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -4997,7 +4997,7 @@
                         <ref role="3cqZAo" node="5ipapt3zhMK" resolve="expr" />
                       </node>
                       <node concept="37vLTw" id="5ipapt3zvv3" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817hg" />
+                        <ref role="3cqZAo" node="4z0AnX817hg" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -5034,7 +5034,7 @@
                     <node concept="2OqwBi" id="5ipapt3z_7x" role="3clFbG">
                       <node concept="2OqwBi" id="5ipapt3zy$6" role="2Oq$k0">
                         <node concept="37vLTw" id="5ipapt3zynQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hi" />
+                          <ref role="3cqZAo" node="4z0AnX817hi" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="5ipapt3zyGT" role="2OqNvi">
                           <node concept="1xMEDy" id="5ipapt3zyGV" role="1xVPHs">
@@ -5150,7 +5150,7 @@
                         <ref role="3cqZAo" node="5ipapt3DCea" resolve="expr" />
                       </node>
                       <node concept="37vLTw" id="5ipapt3DCdJ" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817hk" />
+                        <ref role="3cqZAo" node="4z0AnX817hk" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -5187,7 +5187,7 @@
                     <node concept="2OqwBi" id="5ipapt3DCdY" role="3clFbG">
                       <node concept="2OqwBi" id="5ipapt3DCdZ" role="2Oq$k0">
                         <node concept="37vLTw" id="5ipapt3DCe0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hm" />
+                          <ref role="3cqZAo" node="4z0AnX817hm" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="5ipapt3DCe1" role="2OqNvi">
                           <node concept="1xMEDy" id="5ipapt3DCe2" role="1xVPHs">
@@ -5546,7 +5546,7 @@
                           <ref role="37wK5l" to="pbu6:lH$PujSMTa" resolve="DefaultConstraintAndError" />
                           <node concept="2OqwBi" id="3aPPYyxBZm5" role="37wK5m">
                             <node concept="37vLTw" id="3aPPYyxBZm6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ho" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3aPPYyxBZm7" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -5554,19 +5554,19 @@
                           </node>
                           <node concept="2OqwBi" id="68JOYCcTAT1" role="37wK5m">
                             <node concept="37vLTw" id="68JOYCcTAvG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ho" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="68JOYCcTB$z" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:5F8uib8hsjE" resolve="err" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="3aPPYyxBZm8" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817ho" />
+                            <ref role="3cqZAo" node="4z0AnX817ho" resolve="it" />
                           </node>
                           <node concept="2OqwBi" id="3aPPYyxBZma" role="37wK5m">
                             <node concept="2OqwBi" id="3aPPYyxBZmb" role="2Oq$k0">
                               <node concept="37vLTw" id="3aPPYyxBZmc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817ho" />
+                                <ref role="3cqZAo" node="4z0AnX817ho" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3aPPYyxBZmd" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hm2y:KaZMgy4Ilu" resolve="expr" />
@@ -5578,7 +5578,7 @@
                           </node>
                           <node concept="2OqwBi" id="48O0oIkAOyO" role="37wK5m">
                             <node concept="37vLTw" id="48O0oIkAOi5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ho" />
+                              <ref role="3cqZAo" node="4z0AnX817ho" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="48O0oIkAQ$X" role="2OqNvi">
                               <ref role="3TsBF5" to="hm2y:3xthw2gJs74" resolve="warning" />
@@ -6282,7 +6282,7 @@
                     <node concept="3clFbF" id="7S4tmubDufQ" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDutv" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDufP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hq" />
+                          <ref role="3cqZAo" node="4z0AnX817hq" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDyP8" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubDuM6" resolve="renderReadable" />
@@ -6435,7 +6435,7 @@
                   <node concept="3clFbF" id="olugnm0XaB" role="3cqZAp">
                     <node concept="2OqwBi" id="olugnm0XAO" role="3clFbG">
                       <node concept="37vLTw" id="olugnm0XaA" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817hs" />
+                        <ref role="3cqZAo" node="4z0AnX817hs" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="olugnm10lK" role="2OqNvi">
                         <ref role="37wK5l" node="olugnm0Egc" resolve="effectiveLiterals" />
@@ -6890,7 +6890,7 @@
                     <node concept="3fqX7Q" id="58eyHuUh9bN" role="3clFbG">
                       <node concept="2OqwBi" id="58eyHuUh9uF" role="3fr31v">
                         <node concept="37vLTw" id="58eyHuUh9dR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hu" />
+                          <ref role="3cqZAo" node="4z0AnX817hu" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="58eyHuUh9Wm" role="2OqNvi">
                           <node concept="chp4Y" id="58eyHuUha9I" role="cj9EA">
@@ -7036,7 +7036,7 @@
                       <node concept="2OqwBi" id="6JZACDWH7OS" role="3clFbG">
                         <node concept="2OqwBi" id="6JZACDWH6va" role="2Oq$k0">
                           <node concept="37vLTw" id="6JZACDWH6b9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hw" />
+                            <ref role="3cqZAo" node="4z0AnX817hw" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4WLweXm4piJ" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4WLweXm3SW5" resolve="type" />
@@ -7068,7 +7068,7 @@
                         </node>
                         <node concept="2OqwBi" id="6JZACDWGX$E" role="1m5AlR">
                           <node concept="37vLTw" id="6JZACDWGX$F" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hy" />
+                            <ref role="3cqZAo" node="4z0AnX817hy" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4WLweXm4qig" role="2OqNvi">
                             <ref role="37wK5l" to="pbu6:4WLweXm3SW5" resolve="type" />
@@ -7414,7 +7414,7 @@
                         <ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
                         <ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
                         <node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817h$" />
+                          <ref role="3cqZAo" node="4z0AnX817h$" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -7842,7 +7842,7 @@
                           <ref role="2pIpSl" to="yv47:67Y8mp$DNs9" resolve="literal" />
                           <node concept="36biLy" id="_kNv2PYfKV" role="28nt2d">
                             <node concept="37vLTw" id="_kNv2PYqM4" role="36biLW">
-                              <ref role="3cqZAo" node="4z0AnX817hA" />
+                              <ref role="3cqZAo" node="4z0AnX817hA" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -8082,7 +8082,7 @@
                     <node concept="3clFbF" id="7S4tmubDlG$" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubDlVx" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubDlGz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hC" />
+                          <ref role="3cqZAo" node="4z0AnX817hC" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubDp$5" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubDmlH" resolve="renderReadable" />
@@ -8138,7 +8138,7 @@
                       <node concept="3clFbF" id="7cphKbLzN4t" role="3cqZAp">
                         <node concept="2OqwBi" id="7cphKbLzNlu" role="3clFbG">
                           <node concept="37vLTw" id="7cphKbLzN4s" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hE" />
+                            <ref role="3cqZAo" node="4z0AnX817hE" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="7cphKbLzNE0" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -8196,7 +8196,7 @@
                     <node concept="2OqwBi" id="1Ic1PAvP8J" role="3clFbG">
                       <node concept="2OqwBi" id="1Ic1PAvNpc" role="2Oq$k0">
                         <node concept="37vLTw" id="1Ic1PAvN93" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hG" />
+                          <ref role="3cqZAo" node="4z0AnX817hG" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="1Ic1PAvNG_" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8557,11 +8557,11 @@
                               <node concept="3clFbF" id="4ptnK4jbG2i" role="3cqZAp">
                                 <node concept="3clFbC" id="4ptnK4jbG2j" role="3clFbG">
                                   <node concept="37vLTw" id="4ptnK4jbPG1" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4z0AnX817hK" />
+                                    <ref role="3cqZAo" node="4z0AnX817hK" resolve="mand" />
                                   </node>
                                   <node concept="2OqwBi" id="4ptnK4jbG2l" role="3uHU7B">
                                     <node concept="37vLTw" id="4ptnK4jbG2m" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817hI" />
+                                      <ref role="3cqZAo" node="4z0AnX817hI" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4ptnK4jbG2n" role="2OqNvi">
                                       <ref role="3Tt5mk" to="yv47:4ptnK4jbqZQ" resolve="field" />
@@ -8645,7 +8645,7 @@
                               <ref role="cht4Q" to="hm2y:4WLweXm3SVw" resolve="ITypeable" />
                             </node>
                             <node concept="37vLTw" id="7oamhfs0PLq" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX817hM" />
+                              <ref role="3cqZAo" node="4z0AnX817hM" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="7oamhfs0V3t" role="2OqNvi">
@@ -8654,7 +8654,7 @@
                         </node>
                         <node concept="2OqwBi" id="7oamhfs0NiT" role="3K4Cdx">
                           <node concept="37vLTw" id="7oamhfs0MGe" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hM" />
+                            <ref role="3cqZAo" node="4z0AnX817hM" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="7oamhfs0OWt" role="2OqNvi">
                             <node concept="chp4Y" id="7oamhfs0P9k" role="cj9EA">
@@ -8664,7 +8664,7 @@
                         </node>
                         <node concept="2OqwBi" id="7oamhfs0MlF" role="3K4GZi">
                           <node concept="37vLTw" id="7oamhfs0MlG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hM" />
+                            <ref role="3cqZAo" node="4z0AnX817hM" resolve="it" />
                           </node>
                           <node concept="3JvlWi" id="7oamhfs0MlH" role="2OqNvi" />
                         </node>
@@ -8851,7 +8851,7 @@
                     <node concept="3clFbF" id="7S4tmubD4HZ" role="3cqZAp">
                       <node concept="2OqwBi" id="7S4tmubD4UY" role="3clFbG">
                         <node concept="37vLTw" id="7S4tmubD4HY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817hO" />
+                          <ref role="3cqZAo" node="4z0AnX817hO" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="7S4tmubD5al" role="2OqNvi">
                           <ref role="37wK5l" node="7S4tmubD2lA" resolve="renderReadable" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
index fcc01b871f..a64a536594 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/constraints.mps
@@ -398,7 +398,7 @@
                       <node concept="3clFbF" id="1F1F0IUZBpP" role="3cqZAp">
                         <node concept="2OqwBi" id="1F1F0IUZBpQ" role="3clFbG">
                           <node concept="37vLTw" id="1F1F0IUZBpR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817hQ" />
+                            <ref role="3cqZAo" node="4z0AnX817hQ" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1F1F0IUZBpS" role="2OqNvi">
                             <ref role="3TsBF5" to="zzzn:2uR5X5azvjH" resolve="ext" />
@@ -466,7 +466,7 @@
                                 <node concept="2OqwBi" id="1F1F0IUZB$P" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1F1F0IUZB$Q" role="2Oq$k0">
                                     <node concept="37vLTw" id="1F1F0IUZB$R" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817hS" />
+                                      <ref role="3cqZAo" node="4z0AnX817hS" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="1F1F0IUZB$S" role="2OqNvi">
                                       <ref role="3TtcxE" to="zzzn:49WTic8eSCZ" resolve="args" />
@@ -819,7 +819,7 @@
                             <ref role="3cqZAo" node="1F1F0IUZB1w" resolve="td" />
                           </node>
                           <node concept="37vLTw" id="1F1F0IUZB8q" role="3uHU7B">
-                            <ref role="3cqZAo" node="4z0AnX817hU" />
+                            <ref role="3cqZAo" node="4z0AnX817hU" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -1038,7 +1038,7 @@
                         <node concept="3fqX7Q" id="MIkgqljJgy" role="3clFbG">
                           <node concept="2OqwBi" id="MIkgqljJg$" role="3fr31v">
                             <node concept="37vLTw" id="MIkgqljJg_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817hW" />
+                              <ref role="3cqZAo" node="4z0AnX817hW" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="MIkgqljJgA" role="2OqNvi">
                               <ref role="37wK5l" to="nu60:MIkgqljGnG" resolve="hasItsOwnType" />
@@ -1371,7 +1371,7 @@
                           <node concept="3clFbF" id="4zsmO3KsRvU" role="3cqZAp">
                             <node concept="2OqwBi" id="4zsmO3KsRvV" role="3clFbG">
                               <node concept="37vLTw" id="4zsmO3KsRvW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817hY" />
+                                <ref role="3cqZAo" node="4z0AnX817hY" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="4zsmO3KsRvX" role="2OqNvi">
                                 <ref role="37wK5l" to="nu60:olugnm0Egc" resolve="effectiveLiterals" />
@@ -1424,7 +1424,7 @@
                                 <node concept="3fqX7Q" id="4zsmO3KsWES" role="3clFbG">
                                   <node concept="2OqwBi" id="4zsmO3KsWET" role="3fr31v">
                                     <node concept="37vLTw" id="4zsmO3KsWEU" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817i0" />
+                                      <ref role="3cqZAo" node="4z0AnX817i0" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="4zsmO3KsWEV" role="2OqNvi">
                                       <ref role="3TsBF5" to="yv47:67Y8mp$M9cx" resolve="qualified" />
@@ -1446,7 +1446,7 @@
                             <node concept="3clFbF" id="4zsmO3KsWF1" role="3cqZAp">
                               <node concept="2OqwBi" id="4zsmO3KsWF2" role="3clFbG">
                                 <node concept="37vLTw" id="4zsmO3KsWF3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817i2" />
+                                  <ref role="3cqZAo" node="4z0AnX817i2" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4zsmO3KsWF4" role="2OqNvi">
                                   <ref role="37wK5l" to="nu60:olugnm0Egc" resolve="effectiveLiterals" />
@@ -2040,7 +2040,7 @@
                       <node concept="3clFbF" id="4zsmO3KwfuR" role="3cqZAp">
                         <node concept="2OqwBi" id="4zsmO3KwfWp" role="3clFbG">
                           <node concept="37vLTw" id="4zsmO3KwfuQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817i4" />
+                            <ref role="3cqZAo" node="4z0AnX817i4" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4zsmO3Kwgv7" role="2OqNvi">
                             <ref role="3TsBF5" to="yv47:67Y8mp$M9cx" resolve="qualified" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
index 995a5c5120..89ab162663 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps
@@ -3237,7 +3237,7 @@
                       <node concept="17R0WA" id="4jf2Bbg3WnS" role="3uHU7w">
                         <node concept="2OqwBi" id="LBlPJUzjy0" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxgmtw8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817i6" />
+                            <ref role="3cqZAo" node="4z0AnX817i6" resolve="it" />
                           </node>
                           <node concept="2NL2c5" id="4jf2Bbg3VqC" role="2OqNvi" />
                         </node>
@@ -3252,7 +3252,7 @@
                         </node>
                         <node concept="2OqwBi" id="LBlPJUzjy4" role="3uHU7B">
                           <node concept="37vLTw" id="2BHiRxglFWd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817i6" />
+                            <ref role="3cqZAo" node="4z0AnX817i6" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="LBlPJUzjy6" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
index 28dcde0412..d9d7ba2269 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
@@ -490,7 +490,7 @@
                               <ref role="37wK5l" node="7_$HJtBvdxi" resolve="getValueByName" />
                               <node concept="2OqwBi" id="5F4AdUj4CuR" role="37wK5m">
                                 <node concept="37vLTw" id="5F4AdUj4CuS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817iq" />
+                                  <ref role="3cqZAo" node="4z0AnX817iq" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5F4AdUj4CuT" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1495,7 +1495,7 @@
                         <node concept="3clFbF" id="2nByCcxYwJH" role="3cqZAp">
                           <node concept="2OqwBi" id="2nByCcxYwJI" role="3clFbG">
                             <node concept="37vLTw" id="2nByCcxYwJJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817is" />
+                              <ref role="3cqZAo" node="4z0AnX817is" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2nByCcxYwJK" role="2OqNvi">
                               <ref role="37wK5l" to="nu60:2nByCcxXVT$" resolve="allArgsPure" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
index e341d41ce5..afae0bd1f6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/typesystem.mps
@@ -433,7 +433,7 @@
                     </node>
                     <node concept="2OqwBi" id="ub9nkyP0HI" role="3uHU7B">
                       <node concept="37vLTw" id="ub9nkyP0Dp" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817ia" />
+                        <ref role="3cqZAo" node="4z0AnX817ia" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="ub9nkyP0OT" role="2OqNvi">
                         <ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
@@ -601,7 +601,7 @@
                               </node>
                               <node concept="2OqwBi" id="1bwJEEfjwbm" role="3uHU7B">
                                 <node concept="37vLTw" id="1bwJEEfjwbn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ic" />
+                                  <ref role="3cqZAo" node="4z0AnX817ic" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1bwJEEfjwbo" role="2OqNvi">
                                   <ref role="3Tt5mk" to="zzzn:49WTic8ggq6" resolve="arg" />
@@ -1014,7 +1014,7 @@
                               <node concept="3clFbF" id="7D7uZV2og6Z" role="3cqZAp">
                                 <node concept="2OqwBi" id="7D7uZV2oge3" role="3clFbG">
                                   <node concept="37vLTw" id="7D7uZV2og6Y" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817ie" />
+                                    <ref role="3cqZAo" node="4z0AnX817ie" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="7D7uZV2ogpm" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1851,7 +1851,7 @@
                             <node concept="2OqwBi" id="TcaAhOKhZ3" role="3clFbG">
                               <node concept="2OqwBi" id="TcaAhOKhZ4" role="2Oq$k0">
                                 <node concept="37vLTw" id="TcaAhOKhZ5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ig" />
+                                  <ref role="3cqZAo" node="4z0AnX817ig" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="TcaAhOKhZ6" role="2OqNvi">
                                   <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -1875,7 +1875,7 @@
                           <node concept="2OqwBi" id="TcaAhOKhZe" role="3clFbG">
                             <node concept="2OqwBi" id="TcaAhOKhZf" role="2Oq$k0">
                               <node concept="37vLTw" id="TcaAhOKhZg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817ii" />
+                                <ref role="3cqZAo" node="4z0AnX817ii" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="TcaAhOKhZh" role="2OqNvi">
                                 <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -3895,7 +3895,7 @@
                           </node>
                           <node concept="2OqwBi" id="5YygIlc4ohm" role="3uHU7B">
                             <node concept="37vLTw" id="5YygIlc4sRW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ik" />
+                              <ref role="3cqZAo" node="4z0AnX817ik" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="5YygIlc4tqN" role="2OqNvi">
                               <ref role="3Tt5mk" to="yv47:SRvqsNmWci" resolve="member" />
@@ -3934,7 +3934,7 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="5YygIlc4vqf" role="1urrMF">
-                        <ref role="3cqZAo" node="4z0AnX817im" />
+                        <ref role="3cqZAo" node="4z0AnX817im" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -4203,7 +4203,7 @@
                   <ref role="JncvD" to="hm2y:7halHeUzscN" resolve="PrimitiveLiteral" />
                   <node concept="2OqwBi" id="Y$AzCx8nqC" role="JncvB">
                     <node concept="37vLTw" id="Y$AzCx8ndN" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4z0AnX817io" />
+                      <ref role="3cqZAo" node="4z0AnX817io" resolve="it" />
                     </node>
                     <node concept="3TrEf2" id="Y$AzCx8nH7" role="2OqNvi">
                       <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
@@ -4298,7 +4298,7 @@
                   <ref role="JncvD" to="yv47:67Y8mp$DNr5" resolve="EnumLiteralRef" />
                   <node concept="2OqwBi" id="Y$AzCx8zn5" role="JncvB">
                     <node concept="37vLTw" id="Y$AzCx8z89" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4z0AnX817io" />
+                      <ref role="3cqZAo" node="4z0AnX817io" resolve="it" />
                     </node>
                     <node concept="3TrEf2" id="Y$AzCx8zFa" role="2OqNvi">
                       <ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
index 09e6a0d4cd..2e427e556f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps
@@ -1776,7 +1776,7 @@
                           <node concept="2OqwBi" id="5U8d23QlPI5" role="3uHU7B">
                             <node concept="2JrnkZ" id="5U8d23QlPof" role="2Oq$k0">
                               <node concept="37vLTw" id="5U8d23QlO$8" role="2JrQYb">
-                                <ref role="3cqZAo" node="4z0AnX817iu" />
+                                <ref role="3cqZAo" node="4z0AnX817iu" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5U8d23QlQhh" role="2OqNvi">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
index b8c52a93fd..904b4d5cd2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/models/org/iets3/core/expr/typetags/lib/typesystem.mps
@@ -354,7 +354,7 @@
                             <node concept="2OqwBi" id="sflsE7pzXW" role="3clFbG">
                               <node concept="2OqwBi" id="sflsE7pzXX" role="2Oq$k0">
                                 <node concept="37vLTw" id="sflsE7pzXY" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ix" />
+                                  <ref role="3cqZAo" node="4z0AnX817ix" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="sflsE7pzXZ" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
index 5236f3c901..fabf449203 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/models/org.iets3.core.expr.typetags.units.quantity.behavior.mps
@@ -361,7 +361,7 @@
                                 <ref role="2pIpSl" to="a0oj:71Zj$i0ct2e" resolve="quantity" />
                                 <node concept="36biLy" id="76ZhK6XZ3Iq" role="28nt2d">
                                   <node concept="37vLTw" id="76ZhK6XZ3IR" role="36biLW">
-                                    <ref role="3cqZAo" node="4z0AnX817iz" />
+                                    <ref role="3cqZAo" node="4z0AnX817iz" resolve="it" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
index c24eb4f813..5cc772706a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps
@@ -1438,7 +1438,7 @@
                   <node concept="3clFbF" id="RIvadv2Ivk" role="3cqZAp">
                     <node concept="2OqwBi" id="RIvadv2IDr" role="3clFbG">
                       <node concept="37vLTw" id="RIvadv2Ivj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817iA" />
+                        <ref role="3cqZAo" node="4z0AnX817iA" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="2Fd5B1gxdCm" role="2OqNvi">
                         <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -1720,7 +1720,7 @@
                                 <ref role="2pIpSl" to="b0gq:7eOyx9r3qFW" resolve="unit" />
                                 <node concept="36biLy" id="76ZhK6XZ3Iq" role="28nt2d">
                                   <node concept="37vLTw" id="76ZhK6XZ3IR" role="36biLW">
-                                    <ref role="3cqZAo" node="4z0AnX817iC" />
+                                    <ref role="3cqZAo" node="4z0AnX817iC" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -2015,7 +2015,7 @@
                                           <node concept="2OqwBi" id="49jLf4T7o5E" role="3uHU7B">
                                             <node concept="2OqwBi" id="49jLf4T7ia7" role="2Oq$k0">
                                               <node concept="37vLTw" id="49jLf4T7hsJ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817iE" />
+                                                <ref role="3cqZAo" node="4z0AnX817iE" resolve="it" />
                                               </node>
                                               <node concept="2Rxl7S" id="49jLf4T7n0Z" role="2OqNvi" />
                                             </node>
@@ -2026,7 +2026,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="5sKgdctVOj_" role="3uHU7w">
                                           <node concept="37vLTw" id="5sKgdctVL$D" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817iE" />
+                                            <ref role="3cqZAo" node="4z0AnX817iE" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="5sKgdctVQyp" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2987,7 +2987,7 @@
                   <node concept="3clFbF" id="7UgeC20_Fvo" role="3cqZAp">
                     <node concept="2OqwBi" id="7UgeC20_Fvp" role="3clFbG">
                       <node concept="37vLTw" id="7UgeC20_Fvq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817iG" />
+                        <ref role="3cqZAo" node="4z0AnX817iG" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="7UgeC20_Fvr" role="2OqNvi">
                         <node concept="2OqwBi" id="7UgeC20_Fvs" role="1P9ThW">
@@ -5467,7 +5467,7 @@
                       <node concept="2OqwBi" id="4DRdDUoCUJf" role="3clFbG">
                         <node concept="2OqwBi" id="4DRdDUoCTgo" role="2Oq$k0">
                           <node concept="37vLTw" id="4DRdDUoCT8W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iI" />
+                            <ref role="3cqZAo" node="4z0AnX817iI" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4DRdDUoCU6$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -5589,7 +5589,7 @@
                             <ref role="3cqZAo" node="4DRdDUoCGZE" resolve="nounit" />
                           </node>
                           <node concept="37vLTw" id="2Ux6GHgYxsb" role="3uHU7B">
-                            <ref role="3cqZAo" node="4z0AnX817iK" />
+                            <ref role="3cqZAo" node="4z0AnX817iK" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -5931,7 +5931,7 @@
                         <node concept="1rXfSq" id="3M4aPu_2GB9" role="3clFbG">
                           <ref role="37wK5l" node="3M4aPu_2pcA" resolve="isIntegerType" />
                           <node concept="37vLTw" id="3M4aPu_2GQ9" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817iM" />
+                            <ref role="3cqZAo" node="4z0AnX817iM" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -8934,7 +8934,7 @@
                       <node concept="3clFbF" id="5sKgdctSk0y" role="3cqZAp">
                         <node concept="2OqwBi" id="5sKgdctSkC7" role="3clFbG">
                           <node concept="37vLTw" id="5sKgdctSk0x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iO" />
+                            <ref role="3cqZAo" node="4z0AnX817iO" resolve="it" />
                           </node>
                           <node concept="2OwXpG" id="5sKgdctSl$e" role="2OqNvi">
                             <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -8963,7 +8963,7 @@
                         <node concept="3clFbF" id="5sKgdctSZp4" role="3cqZAp">
                           <node concept="2OqwBi" id="5sKgdctT0oL" role="3clFbG">
                             <node concept="37vLTw" id="5sKgdctSZp3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817iQ" />
+                              <ref role="3cqZAo" node="4z0AnX817iQ" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="5sKgdctT4Gr" role="2OqNvi">
                               <ref role="2Oxat5" node="5dSoB2LOIpJ" resolve="unit" />
@@ -9070,7 +9070,7 @@
                       <node concept="2OqwBi" id="3htFKtcjhWD" role="37vLTx">
                         <node concept="2OqwBi" id="3htFKtcjhqW" role="2Oq$k0">
                           <node concept="37vLTw" id="3htFKtcjh8W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iS" />
+                            <ref role="3cqZAo" node="4z0AnX817iS" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="3htFKtcjhEi" role="2OqNvi" />
                         </node>
@@ -9081,7 +9081,7 @@
                       <node concept="3EllGN" id="3htFKtcjeJQ" role="37vLTJ">
                         <node concept="2OqwBi" id="3htFKtcjffF" role="3ElVtu">
                           <node concept="37vLTw" id="3htFKtcjeYq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iS" />
+                            <ref role="3cqZAo" node="4z0AnX817iS" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="3htFKtcjfp7" role="2OqNvi" />
                         </node>
@@ -9189,7 +9189,7 @@
                       <node concept="2OqwBi" id="6q$NxWeXxCB" role="37vLTx">
                         <node concept="2OqwBi" id="6q$NxWeXwHl" role="2Oq$k0">
                           <node concept="37vLTw" id="6q$NxWeXwbz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iU" />
+                            <ref role="3cqZAo" node="4z0AnX817iU" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="6q$NxWeXx6R" role="2OqNvi" />
                         </node>
@@ -9203,7 +9203,7 @@
                       <node concept="3EllGN" id="6q$NxWeXutC" role="37vLTJ">
                         <node concept="2OqwBi" id="6q$NxWeXvj4" role="3ElVtu">
                           <node concept="37vLTw" id="6q$NxWeXuIe" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817iU" />
+                            <ref role="3cqZAo" node="4z0AnX817iU" resolve="it" />
                           </node>
                           <node concept="3AY5_j" id="6q$NxWeXvG3" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
index e58581cf54..8b9e601409 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.migration.mps
@@ -2198,7 +2198,7 @@
                             <node concept="2OqwBi" id="3slXa_gMfyB" role="3clFbG">
                               <node concept="2OqwBi" id="3slXa_gMdFc" role="2Oq$k0">
                                 <node concept="37vLTw" id="3slXa_gMd5q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817jc" />
+                                  <ref role="3cqZAo" node="4z0AnX817jc" resolve="it" />
                                 </node>
                                 <node concept="2yIwOk" id="3slXa_gMeJR" role="2OqNvi" />
                               </node>
@@ -2268,7 +2268,7 @@
                             <node concept="2OqwBi" id="6Z6cUqSMRQ_" role="3uHU7w">
                               <node concept="2OqwBi" id="6Z6cUqSMQwj" role="2Oq$k0">
                                 <node concept="37vLTw" id="6Z6cUqSMQ3Q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817je" />
+                                  <ref role="3cqZAo" node="4z0AnX817je" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6Z6cUqSMRlx" role="2OqNvi">
                                   <ref role="3Tt5mk" to="b0gq:1KUmgSFpwWq" resolve="dimension" />
@@ -2279,7 +2279,7 @@
                             <node concept="2OqwBi" id="6Z6cUqSMOPl" role="3uHU7B">
                               <node concept="2OqwBi" id="6Z6cUqSMLWz" role="2Oq$k0">
                                 <node concept="37vLTw" id="6Z6cUqSMLss" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817je" />
+                                  <ref role="3cqZAo" node="4z0AnX817je" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6Z6cUqSMMJw" role="2OqNvi">
                                   <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2312,13 +2312,13 @@
                           <node concept="1Ls8ON" id="1KUmgSFqlsm" role="33vP2m">
                             <node concept="2OqwBi" id="1KUmgSFqlsn" role="1Lso8e">
                               <node concept="37vLTw" id="1KUmgSFqlso" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817jg" />
+                                <ref role="3cqZAo" node="4z0AnX817jg" resolve="it" />
                               </node>
                               <node concept="1mfA1w" id="1KUmgSFqlsp" role="2OqNvi" />
                             </node>
                             <node concept="2OqwBi" id="1KUmgSFqlsq" role="1Lso8e">
                               <node concept="37vLTw" id="1KUmgSFqlsr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817jg" />
+                                <ref role="3cqZAo" node="4z0AnX817jg" resolve="it" />
                               </node>
                               <node concept="2NL2c5" id="1KUmgSFqlss" role="2OqNvi" />
                             </node>
@@ -2371,7 +2371,7 @@
                           </node>
                           <node concept="TSZUe" id="1KUmgSFqzzD" role="2OqNvi">
                             <node concept="37vLTw" id="1KUmgSFqzN0" role="25WWJ7">
-                              <ref role="3cqZAo" node="4z0AnX817jg" />
+                              <ref role="3cqZAo" node="4z0AnX817jg" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -2421,7 +2421,7 @@
                         <node concept="2OqwBi" id="1KUmgSFqKE$" role="3clFbG">
                           <node concept="2OqwBi" id="1KUmgSFqFXA" role="2Oq$k0">
                             <node concept="37vLTw" id="1KUmgSFqFAk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817jo" />
+                              <ref role="3cqZAo" node="4z0AnX817jo" resolve="parentAndUnits" />
                             </node>
                             <node concept="3AV6Ez" id="1KUmgSFqGlQ" role="2OqNvi" />
                           </node>
@@ -2442,7 +2442,7 @@
                                         <node concept="3EllGN" id="1KUmgSFr0hz" role="37vLTJ">
                                           <node concept="2OqwBi" id="1KUmgSFr0h$" role="3ElVtu">
                                             <node concept="37vLTw" id="1KUmgSFr0h_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817ji" />
+                                              <ref role="3cqZAo" node="4z0AnX817ji" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="1KUmgSFr0hA" role="2OqNvi">
                                               <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2460,7 +2460,7 @@
                                     <node concept="3EllGN" id="1KUmgSFqQBi" role="3uHU7B">
                                       <node concept="2OqwBi" id="1KUmgSFqS_H" role="3ElVtu">
                                         <node concept="37vLTw" id="1KUmgSFqRv7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817ji" />
+                                          <ref role="3cqZAo" node="4z0AnX817ji" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="1KUmgSFqU8V" role="2OqNvi">
                                           <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2477,7 +2477,7 @@
                                     <node concept="3EllGN" id="1KUmgSFr59t" role="2Oq$k0">
                                       <node concept="2OqwBi" id="1KUmgSFr59u" role="3ElVtu">
                                         <node concept="37vLTw" id="1KUmgSFr59v" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817ji" />
+                                          <ref role="3cqZAo" node="4z0AnX817ji" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="1KUmgSFr59w" role="2OqNvi">
                                           <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2489,7 +2489,7 @@
                                     </node>
                                     <node concept="TSZUe" id="1KUmgSFrefL" role="2OqNvi">
                                       <node concept="37vLTw" id="1KUmgSFrezJ" role="25WWJ7">
-                                        <ref role="3cqZAo" node="4z0AnX817ji" />
+                                        <ref role="3cqZAo" node="4z0AnX817ji" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -2525,7 +2525,7 @@
                                           <node concept="WxPPo" id="1KUmgSFrlpn" role="28ntcv">
                                             <node concept="2OqwBi" id="1KUmgSFrlpo" role="WxPPp">
                                               <node concept="37vLTw" id="1KUmgSFrlpp" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817jm" />
+                                                <ref role="3cqZAo" node="4z0AnX817jm" resolve="it" />
                                               </node>
                                               <node concept="3AY5_j" id="1KUmgSFrlpq" role="2OqNvi" />
                                             </node>
@@ -2539,7 +2539,7 @@
                                   <node concept="2OqwBi" id="1KUmgSFrsEp" role="3clFbG">
                                     <node concept="2OqwBi" id="1KUmgSFro8I" role="2Oq$k0">
                                       <node concept="37vLTw" id="1KUmgSFrnH3" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817jm" />
+                                        <ref role="3cqZAo" node="4z0AnX817jm" resolve="it" />
                                       </node>
                                       <node concept="3AV6Ez" id="1KUmgSFroM8" role="2OqNvi" />
                                     </node>
@@ -2553,7 +2553,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="1KUmgSFryyy" role="37vLTJ">
                                                 <node concept="37vLTw" id="1KUmgSFrxOw" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX817jk" />
+                                                  <ref role="3cqZAo" node="4z0AnX817jk" resolve="it" />
                                                 </node>
                                                 <node concept="3TrEf2" id="1KUmgSFrzIL" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="b0gq:1KUmgSFpwWq" resolve="dimension" />
@@ -2580,7 +2580,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="1KUmgSFrDIM" role="1LFl5Q">
                                         <node concept="37vLTw" id="1KUmgSFrDIN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817jo" />
+                                          <ref role="3cqZAo" node="4z0AnX817jo" resolve="parentAndUnits" />
                                         </node>
                                         <node concept="3AY5_j" id="1KUmgSFrDIO" role="2OqNvi" />
                                       </node>
@@ -2596,7 +2596,7 @@
                                     <node concept="1LFfDK" id="1KUmgSFrHdZ" role="33vP2m">
                                       <node concept="2OqwBi" id="1KUmgSFrHe0" role="1LFl5Q">
                                         <node concept="37vLTw" id="1KUmgSFrHe1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817jo" />
+                                          <ref role="3cqZAo" node="4z0AnX817jo" resolve="parentAndUnits" />
                                         </node>
                                         <node concept="3AY5_j" id="1KUmgSFrHe2" role="2OqNvi" />
                                       </node>
@@ -2656,7 +2656,7 @@
                           <node concept="2OqwBi" id="6Z6cUqSN5Dy" role="3clFbG">
                             <node concept="2OqwBi" id="6Z6cUqSN4u8" role="2Oq$k0">
                               <node concept="37vLTw" id="6Z6cUqSN48h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817jq" />
+                                <ref role="3cqZAo" node="4z0AnX817jq" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6Z6cUqSN582" role="2OqNvi">
                                 <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
@@ -2681,7 +2681,7 @@
                           <node concept="10Nm6u" id="6Z6cUqSN8e$" role="37vLTx" />
                           <node concept="2OqwBi" id="6Z6cUqSN71A" role="37vLTJ">
                             <node concept="37vLTw" id="6Z6cUqSN6IG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817js" />
+                              <ref role="3cqZAo" node="4z0AnX817js" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6Z6cUqSN7I8" role="2OqNvi">
                               <ref role="3TsBF5" to="b0gq:7eOyx9r3jQ8" resolve="description" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
index 3b1731c42a..088decd4a2 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
@@ -366,7 +366,7 @@
                         <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                         <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                         <node concept="37vLTw" id="7WxTcH$fRMh" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817ju" />
+                          <ref role="3cqZAo" node="4z0AnX817ju" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -425,7 +425,7 @@
                           <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                           <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                           <node concept="37vLTw" id="7WxTcH$fVCh" role="37wK5m">
-                            <ref role="3cqZAo" node="4z0AnX817jw" />
+                            <ref role="3cqZAo" node="4z0AnX817jw" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -446,7 +446,7 @@
                           <ref role="cht4Q" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
                         </node>
                         <node concept="37vLTw" id="2rzAw9UW39H" role="1m5AlR">
-                          <ref role="3cqZAo" node="4z0AnX817jy" />
+                          <ref role="3cqZAo" node="4z0AnX817jy" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -687,7 +687,7 @@
                               <ref role="37wK5l" node="1JTgXSYRK0d" resolve="hasSingleUnitSpecificationTag" />
                               <ref role="1Pybhc" node="7WxTcH$fNQY" resolve="UnitTypeHelper" />
                               <node concept="37vLTw" id="66PK8Syl9ws" role="37wK5m">
-                                <ref role="3cqZAo" node="4z0AnX817j$" />
+                                <ref role="3cqZAo" node="4z0AnX817j$" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -994,7 +994,7 @@
                         <ref role="37wK5l" to="dntf:5pSqQr$AdB$" resolve="getUnitSpecification" />
                         <ref role="1Pybhc" to="dntf:4jkbLB5RJZL" resolve="UnitConversionUtil" />
                         <node concept="37vLTw" id="2rzAw9UY1SP" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817jA" />
+                          <ref role="3cqZAo" node="4z0AnX817jA" resolve="typeWithUnit" />
                         </node>
                       </node>
                     </node>
@@ -1028,7 +1028,7 @@
                           <ref role="3cqZAo" node="2rzAw9UY1SR" resolve="unitSpecInMap" />
                         </node>
                         <node concept="37vLTw" id="2rzAw9UY1T1" role="37wK5m">
-                          <ref role="3cqZAo" node="4z0AnX817jA" />
+                          <ref role="3cqZAo" node="4z0AnX817jA" resolve="typeWithUnit" />
                         </node>
                       </node>
                     </node>
@@ -1171,7 +1171,7 @@
                       <node concept="3clFbF" id="69hlyJ6g7p0" role="3cqZAp">
                         <node concept="2OqwBi" id="69hlyJ6g7p1" role="3clFbG">
                           <node concept="37vLTw" id="69hlyJ6g7p2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817jC" />
+                            <ref role="3cqZAo" node="4z0AnX817jC" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="69hlyJ6hZY8" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1467,7 +1467,7 @@
                       <node concept="3clFbF" id="4qv99IrBJ43" role="3cqZAp">
                         <node concept="2OqwBi" id="4qv99IrBJ44" role="3clFbG">
                           <node concept="37vLTw" id="4qv99IrBJ45" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817jE" />
+                            <ref role="3cqZAo" node="4z0AnX817jE" resolve="it" />
                           </node>
                           <node concept="liA8E" id="4qv99IrBJ46" role="2OqNvi">
                             <ref role="37wK5l" node="26cjRACVSeU" resolve="getPriorityLevel" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
index aface9d6d6..8457c5336a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/typesystem.mps
@@ -928,7 +928,7 @@
                     <property role="Xl_RC" value="The specifier's type is already covered" />
                   </node>
                   <node concept="37vLTw" id="1wGuEUwrs0w" role="1urrMF">
-                    <ref role="3cqZAo" node="4z0AnX817iW" />
+                    <ref role="3cqZAo" node="4z0AnX817iW" resolve="it" />
                   </node>
                 </node>
               </node>
@@ -1120,7 +1120,7 @@
                                   <node concept="3y3z36" id="6FK1Pb8udWl" role="3uHU7B">
                                     <node concept="2OqwBi" id="6FK1Pb8udWm" role="3uHU7B">
                                       <node concept="37vLTw" id="6FK1Pb8udWn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817iY" />
+                                        <ref role="3cqZAo" node="4z0AnX817iY" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="5Q6EZP5PnyX" role="2OqNvi">
                                         <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFY" resolve="exponent" />
@@ -1135,7 +1135,7 @@
                                     <node concept="2OqwBi" id="6FK1Pb8udWg" role="3uHU7B">
                                       <node concept="2OqwBi" id="6FK1Pb8udWh" role="2Oq$k0">
                                         <node concept="37vLTw" id="6FK1Pb8udWi" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817iY" />
+                                          <ref role="3cqZAo" node="4z0AnX817iY" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="5Q6EZP5PlXD" role="2OqNvi">
                                           <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFY" resolve="exponent" />
@@ -2785,7 +2785,7 @@
                         <node concept="3clFbF" id="77FPJvcTsNH" role="3cqZAp">
                           <node concept="2OqwBi" id="77FPJvcTv70" role="3clFbG">
                             <node concept="37vLTw" id="77FPJvcTsNG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817j0" />
+                              <ref role="3cqZAo" node="4z0AnX817j0" resolve="it" />
                             </node>
                             <node concept="1$rogu" id="77FPJvcTvAz" role="2OqNvi" />
                           </node>
@@ -4570,7 +4570,7 @@
                       <node concept="3clFbF" id="77FPJvcIdAw" role="3cqZAp">
                         <node concept="2OqwBi" id="77FPJvcIdAx" role="3clFbG">
                           <node concept="37vLTw" id="77FPJvcIdAy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817j2" />
+                            <ref role="3cqZAo" node="4z0AnX817j2" resolve="it" />
                           </node>
                           <node concept="1P9Npp" id="77FPJvcIdAz" role="2OqNvi">
                             <node concept="37vLTw" id="77FPJvcIdA$" role="1P9ThW">
@@ -4593,7 +4593,7 @@
                         <node concept="3clFbF" id="77FPJvcIdAN" role="3cqZAp">
                           <node concept="2OqwBi" id="77FPJvcIdAO" role="3clFbG">
                             <node concept="37vLTw" id="77FPJvcIdAP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817j2" />
+                              <ref role="3cqZAo" node="4z0AnX817j2" resolve="it" />
                             </node>
                             <node concept="1P9Npp" id="77FPJvcIdAQ" role="2OqNvi">
                               <node concept="2OqwBi" id="77FPJvcIdAR" role="1P9ThW">
@@ -4961,7 +4961,7 @@
                       <node concept="3clFbF" id="4CJErGj9uEg" role="3cqZAp">
                         <node concept="2OqwBi" id="4CJErGj9uEh" role="3clFbG">
                           <node concept="37vLTw" id="4CJErGj9uEi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817j4" />
+                            <ref role="3cqZAo" node="4z0AnX817j4" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4CJErGj9uEj" role="2OqNvi">
                             <node concept="chp4Y" id="4CJErGj9uEk" role="cj9EA">
@@ -4987,7 +4987,7 @@
                           <ref role="cht4Q" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
                         </node>
                         <node concept="37vLTw" id="4CJErGj9uEt" role="1m5AlR">
-                          <ref role="3cqZAo" node="4z0AnX817j6" />
+                          <ref role="3cqZAo" node="4z0AnX817j6" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -5037,7 +5037,7 @@
                     <node concept="2OqwBi" id="4CJErGj9uEL" role="3clFbG">
                       <node concept="2OqwBi" id="4CJErGj9uEM" role="2Oq$k0">
                         <node concept="37vLTw" id="4CJErGj9uEN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ja" />
+                          <ref role="3cqZAo" node="4z0AnX817ja" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="4CJErGj9uEO" role="2OqNvi">
                           <ref role="3TtcxE" to="b0gq:7eOyx9r3qG3" resolve="components" />
@@ -5054,7 +5054,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4CJErGj9uET" role="1m5AlR">
                                   <node concept="37vLTw" id="4CJErGj9uEU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817j8" />
+                                    <ref role="3cqZAo" node="4z0AnX817j8" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4CJErGj9uEV" role="2OqNvi">
                                     <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
index 38983fd2ec..315fb82e46 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/behavior.mps
@@ -752,7 +752,7 @@
                         <node concept="3clFbF" id="4HxogODR9T7" role="3cqZAp">
                           <node concept="2OqwBi" id="4HxogODR9Xl" role="3clFbG">
                             <node concept="37vLTw" id="4HxogODR9T6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817jG" />
+                              <ref role="3cqZAo" node="4z0AnX817jG" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="4HxogODRa6r" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
@@ -1961,7 +1961,7 @@
                         <node concept="3clFbF" id="2Ux6GHgZEJU" role="3cqZAp">
                           <node concept="2OqwBi" id="2Ux6GHgZEJV" role="3clFbG">
                             <node concept="37vLTw" id="2Ux6GHgZEJW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817jI" />
+                              <ref role="3cqZAo" node="4z0AnX817jI" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="2Ux6GHgZEJX" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
index 4b68e3b4c4..920ece14ad 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/editor.mps
@@ -856,7 +856,7 @@
                         <node concept="3clFbF" id="76ZhK6Y0I6v" role="3cqZAp">
                           <node concept="2OqwBi" id="76ZhK6Y0IqU" role="3clFbG">
                             <node concept="37vLTw" id="76ZhK6Y0I6u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817jK" />
+                              <ref role="3cqZAo" node="4z0AnX817jK" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="76ZhK6Y0J$O" role="2OqNvi">
                               <ref role="37wK5l" to="qlm2:2Ux6GHgZEiG" resolve="canTagExpression" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
index c05e4dcde8..f6d86639d5 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
@@ -496,7 +496,7 @@
                         </node>
                         <node concept="2OqwBi" id="6kR0qIbwYQB" role="3uHU7B">
                           <node concept="37vLTw" id="6kR0qIbwYMW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817jN" />
+                            <ref role="3cqZAo" node="4z0AnX817jN" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6kR0qIbwYYo" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -506,7 +506,7 @@
                       <node concept="3clFbC" id="6kR0qIbwYB$" role="3uHU7B">
                         <node concept="2OqwBi" id="6kR0qIbwYoL" role="3uHU7B">
                           <node concept="37vLTw" id="6kR0qIbwYlj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817jN" />
+                            <ref role="3cqZAo" node="4z0AnX817jN" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6kR0qIbwYuJ" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -744,7 +744,7 @@
                         <node concept="2OqwBi" id="29Y5P9UXY6D" role="3clFbG">
                           <node concept="2OqwBi" id="4bJfPIwJanO" role="2Oq$k0">
                             <node concept="37vLTw" id="4bJfPIwJanP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817jP" />
+                              <ref role="3cqZAo" node="4z0AnX817jP" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="29Y5P9UXUqa" role="2OqNvi">
                               <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -777,7 +777,7 @@
                     <node concept="2OqwBi" id="29Y5P9UXOGa" role="3clFbG">
                       <node concept="2OqwBi" id="4bJfPIwJ7B0" role="2Oq$k0">
                         <node concept="37vLTw" id="4bJfPIwJ7B1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817jR" />
+                          <ref role="3cqZAo" node="4z0AnX817jR" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="29Y5P9UXPSa" role="2OqNvi">
                           <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -2402,7 +2402,7 @@
                   <node concept="3clFbF" id="22hm_0$bc4v" role="3cqZAp">
                     <node concept="2OqwBi" id="22hm_0$bc7I" role="3clFbG">
                       <node concept="37vLTw" id="22hm_0$bc4u" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817jT" />
+                        <ref role="3cqZAo" node="4z0AnX817jT" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="22hm_0$bcc8" role="2OqNvi">
                         <ref role="37wK5l" node="22hm_0$b7pE" resolve="isLeaf" />
@@ -2942,7 +2942,7 @@
                   <node concept="3clFbF" id="4u1MGlrMpGh" role="3cqZAp">
                     <node concept="2OqwBi" id="4u1MGlrMq29" role="3clFbG">
                       <node concept="37vLTw" id="4u1MGlrMpLY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817jV" />
+                        <ref role="3cqZAo" node="4z0AnX817jV" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="4u1MGlrMqm6" role="2OqNvi">
                         <node concept="chp4Y" id="4u1MGlrMqxO" role="cj9EA">
@@ -3003,7 +3003,7 @@
                       </node>
                       <node concept="2OqwBi" id="38udS81rzW_" role="3uHU7B">
                         <node concept="37vLTw" id="38udS81rzIU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817jX" />
+                          <ref role="3cqZAo" node="4z0AnX817jX" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="38udS81r$fI" role="2OqNvi">
                           <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3051,7 +3051,7 @@
                   <node concept="3clFbF" id="38udS81rG63" role="3cqZAp">
                     <node concept="2OqwBi" id="38udS81rGmv" role="3clFbG">
                       <node concept="37vLTw" id="38udS81rG62" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817jZ" />
+                        <ref role="3cqZAo" node="4z0AnX817jZ" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="38udS81rG_a" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -3193,11 +3193,11 @@
                               <node concept="3clFbF" id="42T9ieTOAUy" role="3cqZAp">
                                 <node concept="3clFbC" id="42T9ieTOBIq" role="3clFbG">
                                   <node concept="37vLTw" id="42T9ieTOCJW" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4z0AnX817k3" />
+                                    <ref role="3cqZAo" node="4z0AnX817k3" resolve="res" />
                                   </node>
                                   <node concept="2OqwBi" id="42T9ieTOB9N" role="3uHU7B">
                                     <node concept="37vLTw" id="42T9ieTOAUx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817k1" />
+                                      <ref role="3cqZAo" node="4z0AnX817k1" resolve="content" />
                                     </node>
                                     <node concept="3TrEf2" id="42T9ieTOBsa" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3252,7 +3252,7 @@
                       <node concept="2OqwBi" id="8XWEteuTUL" role="2Oq$k0">
                         <node concept="2OqwBi" id="8XWEteuTUM" role="2Oq$k0">
                           <node concept="37vLTw" id="8XWEteuTUN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817k5" />
+                            <ref role="3cqZAo" node="4z0AnX817k5" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="8XWEteuTUO" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3300,7 +3300,7 @@
                     <node concept="3clFbF" id="2s2qa7R56uh" role="3cqZAp">
                       <node concept="2OqwBi" id="2s2qa7R56ui" role="3clFbG">
                         <node concept="37vLTw" id="2s2qa7R56uj" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817k7" />
+                          <ref role="3cqZAo" node="4z0AnX817k7" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2s2qa7R56uk" role="2OqNvi">
                           <ref role="37wK5l" node="LvU0bhwLPQ" resolve="createComparisonExpression" />
@@ -3340,7 +3340,7 @@
                       <node concept="2OqwBi" id="3V7UZBYHOo" role="3clFbG">
                         <node concept="2OqwBi" id="3V7UZBYFHq" role="2Oq$k0">
                           <node concept="37vLTw" id="3V7UZBYFxK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817k9" />
+                            <ref role="3cqZAo" node="4z0AnX817k9" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="3V7UZBYFRV" role="2OqNvi">
                             <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -3663,7 +3663,7 @@
                         <node concept="3fqX7Q" id="3V7UZBJ2W6" role="3clFbG">
                           <node concept="2OqwBi" id="3V7UZBJ2W7" role="3fr31v">
                             <node concept="37vLTw" id="3V7UZBJ2W8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817kb" />
+                              <ref role="3cqZAo" node="4z0AnX817kb" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="3V7UZBJ2W9" role="2OqNvi">
                               <node concept="chp4Y" id="3V7UZBJ2Wa" role="cj9EA">
@@ -3927,7 +3927,7 @@
                         <node concept="3fqX7Q" id="3V7UZBIXpd" role="3clFbG">
                           <node concept="2OqwBi" id="3V7UZBIYdQ" role="3fr31v">
                             <node concept="37vLTw" id="3V7UZBIXKW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817kd" />
+                              <ref role="3cqZAo" node="4z0AnX817kd" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="3V7UZBIYMy" role="2OqNvi">
                               <node concept="chp4Y" id="3V7UZBIZb5" role="cj9EA">
@@ -4613,7 +4613,7 @@
                         <node concept="2OqwBi" id="3xi1F8SDsq8" role="3clFbG">
                           <node concept="2OqwBi" id="3xi1F8SDoWx" role="2Oq$k0">
                             <node concept="37vLTw" id="3xi1F8SDofY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817kh" />
+                              <ref role="3cqZAo" node="4z0AnX817kh" resolve="it" />
                             </node>
                             <node concept="32TBzR" id="3xi1F8SDqNr" role="2OqNvi" />
                           </node>
@@ -4623,7 +4623,7 @@
                                 <node concept="Jncv_" id="3xi1F8SDxWY" role="3cqZAp">
                                   <ref role="JncvD" to="kfo3:8XWEtdYkhC" resolve="Content" />
                                   <node concept="37vLTw" id="3xi1F8SDzpl" role="JncvB">
-                                    <ref role="3cqZAo" node="4z0AnX817kf" />
+                                    <ref role="3cqZAo" node="4z0AnX817kf" resolve="it" />
                                   </node>
                                   <node concept="3clFbS" id="3xi1F8SDxX0" role="Jncv$">
                                     <node concept="3cpWs6" id="3xi1F8SDBGQ" role="3cqZAp">
@@ -4827,7 +4827,7 @@
                         <node concept="3clFbF" id="7lDeIdaBy3X" role="3cqZAp">
                           <node concept="2OqwBi" id="7lDeIdaByoR" role="3clFbG">
                             <node concept="37vLTw" id="7lDeIdaBy3W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817kj" />
+                              <ref role="3cqZAo" node="4z0AnX817kj" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="7lDeIdaBBxl" role="2OqNvi">
                               <ref role="37wK5l" node="7lDeIdaByVZ" resolve="renderReadable" />
@@ -5458,7 +5458,7 @@
                         </node>
                         <node concept="2OqwBi" id="Nuz63e$N8O" role="3uHU7B">
                           <node concept="37vLTw" id="Nuz63e$N8P" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817kl" />
+                            <ref role="3cqZAo" node="4z0AnX817kl" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="Nuz63e$N8Q" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
index d63959929f..cde73b41c7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps
@@ -825,7 +825,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3DYDRw0Kc2Y" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0KbYQ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kn" />
+                                      <ref role="3cqZAo" node="4z0AnX817kn" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0Ke$o" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -847,7 +847,7 @@
                             <node concept="3clFbF" id="3DYDRw0Kf6$" role="3cqZAp">
                               <node concept="2OqwBi" id="3DYDRw0KfbO" role="3clFbG">
                                 <node concept="37vLTw" id="3DYDRw0Kf6z" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817kp" />
+                                  <ref role="3cqZAo" node="4z0AnX817kp" resolve="it" />
                                 </node>
                                 <node concept="3YRAZt" id="3DYDRw0KfkK" role="2OqNvi" />
                               </node>
@@ -954,7 +954,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3DYDRw0Kg7G" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0Kg7H" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kr" />
+                                      <ref role="3cqZAo" node="4z0AnX817kr" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0KgRh" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -976,7 +976,7 @@
                             <node concept="3clFbF" id="3DYDRw0Kg7O" role="3cqZAp">
                               <node concept="2OqwBi" id="3DYDRw0Kg7P" role="3clFbG">
                                 <node concept="37vLTw" id="3DYDRw0Kg7Q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817kt" />
+                                  <ref role="3cqZAo" node="4z0AnX817kt" resolve="it" />
                                 </node>
                                 <node concept="3YRAZt" id="3DYDRw0Kg7R" role="2OqNvi" />
                               </node>
@@ -1094,7 +1094,7 @@
                                 <node concept="3clFbC" id="3DYDRw0KsTi" role="3uHU7w">
                                   <node concept="2OqwBi" id="3DYDRw0KsnG" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0KsfP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kv" />
+                                      <ref role="3cqZAo" node="4z0AnX817kv" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0Kswo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -1107,7 +1107,7 @@
                                 <node concept="3clFbC" id="3DYDRw0KrWr" role="3uHU7B">
                                   <node concept="2OqwBi" id="3DYDRw0KrCH" role="3uHU7B">
                                     <node concept="37vLTw" id="3DYDRw0Kryx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kv" />
+                                      <ref role="3cqZAo" node="4z0AnX817kv" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3DYDRw0KrM3" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -1199,7 +1199,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="5yPljRYe7LG" role="3uHU7B">
                                           <node concept="37vLTw" id="5yPljRYe7LH" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817kx" />
+                                            <ref role="3cqZAo" node="4z0AnX817kx" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="5yPljRYe7LI" role="2OqNvi">
                                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -1209,7 +1209,7 @@
                                       <node concept="17R0WA" id="5yPljRYe7LJ" role="3uHU7B">
                                         <node concept="2OqwBi" id="5yPljRYe7LK" role="3uHU7B">
                                           <node concept="37vLTw" id="5yPljRYe7LL" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817kx" />
+                                            <ref role="3cqZAo" node="4z0AnX817kx" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="5yPljRYe7LM" role="2OqNvi">
                                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -1748,7 +1748,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3IFXLmixUlA" role="3uHU7B">
                                     <node concept="37vLTw" id="3IFXLmixUgE" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kz" />
+                                      <ref role="3cqZAo" node="4z0AnX817kz" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="3IFXLmixUDu" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2399,7 +2399,7 @@
                             </node>
                             <node concept="2OqwBi" id="4_sn_QHl$rY" role="3uHU7B">
                               <node concept="37vLTw" id="4_sn_QHl$by" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817k_" />
+                                <ref role="3cqZAo" node="4z0AnX817k_" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4_sn_QHl$CV" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2503,7 +2503,7 @@
                                 <node concept="17R0WA" id="5yPljRY6LW_" role="3clFbG">
                                   <node concept="2OqwBi" id="5yPljRY6LWA" role="3uHU7B">
                                     <node concept="37vLTw" id="5yPljRY6LWB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817kB" />
+                                      <ref role="3cqZAo" node="4z0AnX817kB" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="5yPljRY6LWC" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2807,7 +2807,7 @@
                         <node concept="3clFbF" id="Nuz63fmUld" role="3cqZAp">
                           <node concept="2OqwBi" id="Nuz63fmUGc" role="3clFbG">
                             <node concept="37vLTw" id="Nuz63fmUlc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817kD" />
+                              <ref role="3cqZAo" node="4z0AnX817kD" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="Nuz63fmVrT" role="2OqNvi">
                               <node concept="chp4Y" id="Nuz63fn2xe" role="cj9EA">
@@ -3459,7 +3459,7 @@
                                   <node concept="2OqwBi" id="5hullqu1Knj" role="2Oq$k0">
                                     <node concept="2OqwBi" id="5hullqu1Knk" role="2Oq$k0">
                                       <node concept="37vLTw" id="5hullqu1Knl" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817kJ" />
+                                        <ref role="3cqZAo" node="4z0AnX817kJ" resolve="row" />
                                       </node>
                                       <node concept="3Tsc0h" id="5hullqu1Knm" role="2OqNvi">
                                         <ref role="3TtcxE" to="kfo3:8XWEtdYkjq" resolve="contents" />
@@ -3475,7 +3475,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="5hullqu1Knt" role="3uHU7B">
                                                 <node concept="37vLTw" id="5hullqu1Knu" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4z0AnX817kF" />
+                                                  <ref role="3cqZAo" node="4z0AnX817kF" resolve="c" />
                                                 </node>
                                                 <node concept="3TrEf2" id="5hullqu1Knv" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -3497,7 +3497,7 @@
                                         <node concept="3clFbF" id="5hullqu1Kn_" role="3cqZAp">
                                           <node concept="2OqwBi" id="5hullqu1KnA" role="3clFbG">
                                             <node concept="37vLTw" id="5hullqu1KnB" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817kH" />
+                                              <ref role="3cqZAo" node="4z0AnX817kH" resolve="c" />
                                             </node>
                                             <node concept="3YRAZt" id="5hullqu1KnC" role="2OqNvi" />
                                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
index 8ecb3368c3..f496f383ba 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps
@@ -662,7 +662,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLEcpc" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLEbvT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817kL" />
+                        <ref role="3cqZAo" node="4z0AnX817kL" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLEhU1" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -754,7 +754,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLETXB" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLETXC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817kN" />
+                        <ref role="3cqZAo" node="4z0AnX817kN" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLETXD" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -847,7 +847,7 @@
                     </node>
                     <node concept="2OqwBi" id="5crSXLEWz$" role="2GsD0m">
                       <node concept="37vLTw" id="5crSXLEWz_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817kP" />
+                        <ref role="3cqZAo" node="4z0AnX817kP" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="5crSXLEWzA" role="2OqNvi">
                         <ref role="3TtcxE" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
@@ -910,7 +910,7 @@
                                     <node concept="2OqwBi" id="7Oac05IjGq8" role="25WWJ7">
                                       <node concept="2OqwBi" id="7Oac05IjFYu" role="2Oq$k0">
                                         <node concept="37vLTw" id="7Oac05IjFPu" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817kP" />
+                                          <ref role="3cqZAo" node="4z0AnX817kP" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7Oac05IjGdE" role="2OqNvi">
                                           <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -938,7 +938,7 @@
                                     <node concept="2OqwBi" id="7Oac05IjKo5" role="25WWJ7">
                                       <node concept="2OqwBi" id="7Oac05IjKo6" role="2Oq$k0">
                                         <node concept="37vLTw" id="7Oac05IjKo7" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817kP" />
+                                          <ref role="3cqZAo" node="4z0AnX817kP" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7Oac05IjLgw" role="2OqNvi">
                                           <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -2045,7 +2045,7 @@
                             </node>
                             <node concept="2OqwBi" id="6vi7U_pxVL5" role="3uHU7B">
                               <node concept="37vLTw" id="6vi7U_pxV$E" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817kR" />
+                                <ref role="3cqZAo" node="4z0AnX817kR" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6vi7U_pxVVN" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kfo3:8XWEtdYkmU" resolve="col" />
@@ -2067,7 +2067,7 @@
                       <node concept="3clFbF" id="6vi7U_pycwt" role="3cqZAp">
                         <node concept="2OqwBi" id="6vi7U_pycD_" role="3clFbG">
                           <node concept="37vLTw" id="6vi7U_pycws" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817kT" />
+                            <ref role="3cqZAo" node="4z0AnX817kT" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="6vi7U_pycW8" role="2OqNvi" />
                         </node>
@@ -2282,7 +2282,7 @@
                         </node>
                         <node concept="2OqwBi" id="6vi7U_pwPFX" role="3uHU7B">
                           <node concept="37vLTw" id="6vi7U_pwPFY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817kV" />
+                            <ref role="3cqZAo" node="4z0AnX817kV" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6vi7U_pwRVM" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -2304,7 +2304,7 @@
                   <node concept="3clFbF" id="6vi7U_pwPG5" role="3cqZAp">
                     <node concept="2OqwBi" id="6vi7U_pwPG6" role="3clFbG">
                       <node concept="37vLTw" id="6vi7U_pwPG7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817kX" />
+                        <ref role="3cqZAo" node="4z0AnX817kX" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6vi7U_pwPG8" role="2OqNvi" />
                     </node>
@@ -2517,7 +2517,7 @@
                         </node>
                         <node concept="2OqwBi" id="6vi7U_pwzRg" role="3uHU7B">
                           <node concept="37vLTw" id="6vi7U_pwzCL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817kZ" />
+                            <ref role="3cqZAo" node="4z0AnX817kZ" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6vi7U_pw$9M" role="2OqNvi">
                             <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -2539,7 +2539,7 @@
                   <node concept="3clFbF" id="6vi7U_pwNB$" role="3cqZAp">
                     <node concept="2OqwBi" id="6vi7U_pwNOr" role="3clFbG">
                       <node concept="37vLTw" id="6vi7U_pwNBz" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817l1" />
+                        <ref role="3cqZAo" node="4z0AnX817l1" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6vi7U_pwOf9" role="2OqNvi" />
                     </node>
@@ -4180,7 +4180,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="1bYFVysIU$1" role="1m5AlR">
                                               <node concept="37vLTw" id="1bYFVysIU6E" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817l3" />
+                                                <ref role="3cqZAo" node="4z0AnX817l3" resolve="it" />
                                               </node>
                                               <node concept="3TrEf2" id="1bYFVysIVkF" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -4211,7 +4211,7 @@
                                       <node concept="36biLy" id="1bYFVysJ05h" role="36be1Z">
                                         <node concept="2OqwBi" id="1bYFVysJ0Y9" role="36biLW">
                                           <node concept="37vLTw" id="1bYFVysJ0vn" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817l3" />
+                                            <ref role="3cqZAo" node="4z0AnX817l3" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="1bYFVysJ1Jm" role="2OqNvi">
                                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpK" resolve="then" />
@@ -4276,7 +4276,7 @@
                     <node concept="3clFbF" id="1bYFVysHxOW" role="3cqZAp">
                       <node concept="2OqwBi" id="1bYFVysHxOX" role="3clFbG">
                         <node concept="37vLTw" id="1bYFVysHxOY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817l5" />
+                          <ref role="3cqZAo" node="4z0AnX817l5" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1bYFVysHxOZ" role="2OqNvi">
                           <node concept="chp4Y" id="1bYFVysHxP0" role="cj9EA">
@@ -4343,15 +4343,15 @@
                       <node concept="3clFbF" id="1bYFVysHV3B" role="3cqZAp">
                         <node concept="3K4zz7" id="1bYFVysHV3C" role="3clFbG">
                           <node concept="37vLTw" id="1bYFVysHV3D" role="3K4E3e">
-                            <ref role="3cqZAo" node="4z0AnX817l7" />
+                            <ref role="3cqZAo" node="4z0AnX817l7" resolve="a" />
                           </node>
                           <node concept="10Nm6u" id="1bYFVysHV3E" role="3K4GZi" />
                           <node concept="13dIca" id="1bYFVysHV3F" role="3K4Cdx">
                             <node concept="37vLTw" id="1bYFVysHV3G" role="3uHU7w">
-                              <ref role="3cqZAo" node="4z0AnX817l9" />
+                              <ref role="3cqZAo" node="4z0AnX817l9" resolve="b" />
                             </node>
                             <node concept="37vLTw" id="1bYFVysHV3H" role="3uHU7B">
-                              <ref role="3cqZAo" node="4z0AnX817l7" />
+                              <ref role="3cqZAo" node="4z0AnX817l7" resolve="a" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
index 2997cf24be..185dab9e48 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
@@ -585,7 +585,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="3DYDRw0NDNU" role="3uHU7B">
                                   <node concept="37vLTw" id="3DYDRw0NDHw" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817lb" />
+                                    <ref role="3cqZAo" node="4z0AnX817lb" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3DYDRw0NDUG" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -595,7 +595,7 @@
                               <node concept="3clFbC" id="3DYDRw0NDyp" role="3uHU7B">
                                 <node concept="2OqwBi" id="3DYDRw0NDhw" role="3uHU7B">
                                   <node concept="37vLTw" id="3DYDRw0NDdz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817lb" />
+                                    <ref role="3cqZAo" node="4z0AnX817lb" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3DYDRw0NDqX" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -1194,7 +1194,7 @@
                     <node concept="3clFbF" id="wW2kvILYjh" role="3cqZAp">
                       <node concept="2OqwBi" id="wW2kvILYnd" role="3clFbG">
                         <node concept="37vLTw" id="wW2kvILYjg" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817ld" />
+                          <ref role="3cqZAo" node="4z0AnX817ld" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="wW2kvILYt8" role="2OqNvi">
                           <ref role="37wK5l" to="wthy:22hm_0$b7pE" resolve="isLeaf" />
@@ -1363,7 +1363,7 @@
                 <node concept="3clFbF" id="8XWEtejDgz" role="3cqZAp">
                   <node concept="2OqwBi" id="8XWEtejDrJ" role="3clFbG">
                     <node concept="37vLTw" id="8XWEtejDgy" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4z0AnX817lf" />
+                      <ref role="3cqZAo" node="4z0AnX817lf" resolve="it" />
                     </node>
                     <node concept="1mIQ4w" id="8XWEtejDAq" role="2OqNvi">
                       <node concept="chp4Y" id="8XWEtejDHK" role="cj9EA">
@@ -1837,7 +1837,7 @@
                       <node concept="3clFbF" id="6OunYCf2NN$" role="3cqZAp">
                         <node concept="2OqwBi" id="6OunYCf2NXm" role="3clFbG">
                           <node concept="37vLTw" id="6OunYCf2NNz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817lh" />
+                            <ref role="3cqZAo" node="4z0AnX817lh" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="6OunYCf2Oc3" role="2OqNvi" />
                         </node>
@@ -1923,7 +1923,7 @@
                     <node concept="3clFbF" id="5aYM8itbLEg" role="3cqZAp">
                       <node concept="2OqwBi" id="5aYM8itbLSL" role="3clFbG">
                         <node concept="37vLTw" id="5aYM8itbLEf" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817lj" />
+                          <ref role="3cqZAo" node="4z0AnX817lj" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="5aYM8itbNfB" role="2OqNvi">
                           <ref role="37wK5l" to="wthy:3V7UZBYyZ4" resolve="isDefault" />
@@ -2139,7 +2139,7 @@
                                   <ref role="2pIpSl" to="kfo3:7EKPeISC$Mj" resolve="col" />
                                   <node concept="36biLy" id="7EKPeISCZcK" role="28nt2d">
                                     <node concept="37vLTw" id="7EKPeISCZcL" role="36biLW">
-                                      <ref role="3cqZAo" node="4z0AnX817ll" />
+                                      <ref role="3cqZAo" node="4z0AnX817ll" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
index 6b2b15543a..35def6374e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps
@@ -452,7 +452,7 @@
                     <node concept="3clFbF" id="6LfBX8Yg$Ya" role="3cqZAp">
                       <node concept="2OqwBi" id="6LfBX8Yg$Yb" role="3clFbG">
                         <node concept="37vLTw" id="6LfBX8Yg$Yc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817mg" />
+                          <ref role="3cqZAo" node="4z0AnX817mg" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6LfBX8Yg$Yd" role="2OqNvi">
                           <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
@@ -481,7 +481,7 @@
                     <node concept="2OqwBi" id="6LfBX8YgEuh" role="3clFbG">
                       <node concept="2OqwBi" id="6LfBX8YgAau" role="2Oq$k0">
                         <node concept="37vLTw" id="6LfBX8YgA7J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817mi" />
+                          <ref role="3cqZAo" node="4z0AnX817mi" resolve="it" />
                         </node>
                         <node concept="2RRcyG" id="6LfBX8YgAdn" role="2OqNvi">
                           <node concept="chp4Y" id="aofgSPMowO" role="3MHsoP">
@@ -855,7 +855,7 @@
                                   <node concept="1Wc70l" id="4bmM0avMJp7" role="3clFbG">
                                     <node concept="2OqwBi" id="4bmM0avMJCU" role="3uHU7w">
                                       <node concept="37vLTw" id="4bmM0avMJwc" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817mk" />
+                                        <ref role="3cqZAo" node="4z0AnX817mk" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="4bmM0avMJQa" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -863,7 +863,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="4bmM0avMJ3w" role="3uHU7B">
                                       <node concept="37vLTw" id="4bmM0avMIZE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817mk" />
+                                        <ref role="3cqZAo" node="4z0AnX817mk" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="4bmM0avMJeK" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
@@ -1113,7 +1113,7 @@
                                   <node concept="1Wc70l" id="3HmE5WaYaes" role="3clFbG">
                                     <node concept="2OqwBi" id="3HmE5WaYaet" role="3uHU7w">
                                       <node concept="37vLTw" id="3HmE5WaYaeu" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817mm" />
+                                        <ref role="3cqZAo" node="4z0AnX817mm" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="3HmE5WaYaev" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -1121,7 +1121,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="3HmE5WaYaew" role="3uHU7B">
                                       <node concept="37vLTw" id="3HmE5WaYaex" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817mm" />
+                                        <ref role="3cqZAo" node="4z0AnX817mm" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="3HmE5WaYaey" role="2OqNvi">
                                         <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
@@ -1398,7 +1398,7 @@
                     <node concept="1Wc70l" id="TuTPrvRwMB" role="3clFbG">
                       <node concept="2OqwBi" id="TuTPrvRxja" role="3uHU7w">
                         <node concept="37vLTw" id="TuTPrvRx4I" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817mo" />
+                          <ref role="3cqZAo" node="4z0AnX817mo" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="TuTPrvRxBV" role="2OqNvi">
                           <ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
@@ -1406,7 +1406,7 @@
                       </node>
                       <node concept="2OqwBi" id="TuTPrvRvHM" role="3uHU7B">
                         <node concept="37vLTw" id="TuTPrvRvus" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817mo" />
+                          <ref role="3cqZAo" node="4z0AnX817mo" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="TuTPrvRwjm" role="2OqNvi">
                           <ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
index 1e01c03705..2118ec6351 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/findUsages.mps
@@ -137,7 +137,7 @@
                     <node concept="2OqwBi" id="1Sur9ckR4jc" role="1O1k6O">
                       <node concept="2OqwBi" id="1Sur9ckQjUd" role="2Oq$k0">
                         <node concept="37vLTw" id="1Sur9ckP0Tr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817lo" />
+                          <ref role="3cqZAo" node="4z0AnX817lo" resolve="it" />
                         </node>
                         <node concept="2Xjw5R" id="1Sur9ckQk6t" role="2OqNvi">
                           <node concept="1xMEDy" id="1Sur9ckQk6v" role="1xVPHs">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
index 94c8b38d00..a575394e55 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/plugin.mps
@@ -250,7 +250,7 @@
                             <node concept="2OqwBi" id="1HLccB8zPT1" role="3uHU7B">
                               <node concept="2OqwBi" id="1HLccB8zPT2" role="2Oq$k0">
                                 <node concept="37vLTw" id="1HLccB8zPT3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817lq" />
+                                  <ref role="3cqZAo" node="4z0AnX817lq" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="1HLccB8zPT4" role="2OqNvi">
                                   <ref role="3Tt5mk" to="ci3w:1PzuxQOT_10" resolve="traceKind" />
@@ -319,7 +319,7 @@
                             <node concept="2OqwBi" id="mhbzaHmHlJ" role="2Oq$k0">
                               <node concept="2OqwBi" id="mhbzaHmHlK" role="2Oq$k0">
                                 <node concept="37vLTw" id="mhbzaHmHlL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ls" />
+                                  <ref role="3cqZAo" node="4z0AnX817ls" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="mhbzaHmHlM" role="2OqNvi">
                                   <ref role="37wK5l" to="fp62:7qN5a9Pfhlm" resolve="getTraceSource" />
@@ -380,7 +380,7 @@
                               <node concept="2OqwBi" id="1HLccB8zH07" role="2Oq$k0">
                                 <node concept="2OqwBi" id="1HLccB8zH08" role="2Oq$k0">
                                   <node concept="37vLTw" id="1HLccB8zH09" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817lw" />
+                                    <ref role="3cqZAo" node="4z0AnX817lw" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="1HLccB8zH0a" role="2OqNvi">
                                     <ref role="3TtcxE" to="ci3w:1PzuxQOT_1a" resolve="traceTarget" />
@@ -397,7 +397,7 @@
                                       <node concept="2OqwBi" id="mhbzaHmpxH" role="3clFbG">
                                         <node concept="2OqwBi" id="mhbzaHmpxI" role="2Oq$k0">
                                           <node concept="37vLTw" id="mhbzaHmpxJ" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817lu" />
+                                            <ref role="3cqZAo" node="4z0AnX817lu" resolve="it" />
                                           </node>
                                           <node concept="2yIwOk" id="mhbzaHmpxK" role="2OqNvi" />
                                         </node>
@@ -835,7 +835,7 @@
                       <node concept="3clFbF" id="1HLccB8vN07" role="3cqZAp">
                         <node concept="2OqwBi" id="1HLccB8vN08" role="3clFbG">
                           <node concept="37vLTw" id="1HLccB8vN09" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817ly" />
+                            <ref role="3cqZAo" node="4z0AnX817ly" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="1HLccB8vN0a" role="2OqNvi">
                             <node concept="chp4Y" id="1HLccB8vN0b" role="cj9EA">
@@ -983,7 +983,7 @@
                         <node concept="2OqwBi" id="6_Ift$_F4Yl" role="2Oq$k0">
                           <node concept="2OqwBi" id="6_Ift$_F48s" role="2Oq$k0">
                             <node concept="37vLTw" id="6_Ift$_F3XG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817l$" />
+                              <ref role="3cqZAo" node="4z0AnX817l$" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="6_Ift$_F4L7" role="2OqNvi" />
                           </node>
@@ -1016,7 +1016,7 @@
                       </node>
                       <node concept="zAVLd" id="6_Ift$_DjDF" role="33vP2m">
                         <node concept="37vLTw" id="6_Ift$_DjDG" role="2GiN3p">
-                          <ref role="3cqZAo" node="4z0AnX817lA" />
+                          <ref role="3cqZAo" node="4z0AnX817lA" resolve="it" />
                         </node>
                         <node concept="zAVLb" id="6_Ift$_DjDH" role="1C5ry4">
                           <ref role="2$JaeB" to="qo9z:1Sur9ckOV6J" resolve="FindTraces" />
@@ -1090,7 +1090,7 @@
                         <node concept="2OqwBi" id="6_Ift$_PDBW" role="3uHU7B">
                           <node concept="2OqwBi" id="6_Ift$_OnOS" role="2Oq$k0">
                             <node concept="37vLTw" id="6_Ift$_OnOT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817lC" />
+                              <ref role="3cqZAo" node="4z0AnX817lC" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6_Ift$_OnOU" role="2OqNvi">
                               <ref role="3Tt5mk" to="ci3w:1PzuxQOT_10" resolve="traceKind" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
index f6f80cee12..4a95a1ce5c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/typesystem.mps
@@ -223,7 +223,7 @@
                         <property role="Xl_RC" value="duplicate user name" />
                       </node>
                       <node concept="37vLTw" id="7mG7sQPpng9" role="1urrMF">
-                        <ref role="3cqZAo" node="4z0AnX817lE" />
+                        <ref role="3cqZAo" node="4z0AnX817lE" resolve="u" />
                       </node>
                     </node>
                   </node>
@@ -234,7 +234,7 @@
                     <node concept="3JPx81" id="7mG7sQPpmg7" role="2OqNvi">
                       <node concept="2OqwBi" id="7mG7sQPpmmQ" role="25WWJ7">
                         <node concept="37vLTw" id="7mG7sQPpmhZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817lE" />
+                          <ref role="3cqZAo" node="4z0AnX817lE" resolve="u" />
                         </node>
                         <node concept="3TrcHB" id="7mG7sQPpmto" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -251,7 +251,7 @@
                     <node concept="TSZUe" id="7mG7sQPpnMx" role="2OqNvi">
                       <node concept="2OqwBi" id="7mG7sQPpnZH" role="25WWJ7">
                         <node concept="37vLTw" id="7mG7sQPpnQF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817lE" />
+                          <ref role="3cqZAo" node="4z0AnX817lE" resolve="u" />
                         </node>
                         <node concept="3TrcHB" id="7mG7sQPpo9i" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
index c34e46e7ca..7aaa522410 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/typesystem.mps
@@ -336,7 +336,7 @@
                             </node>
                             <node concept="2OqwBi" id="6zaFu4oSicV" role="3uHU7B">
                               <node concept="37vLTw" id="6zaFu4oSi7w" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817lH" />
+                                <ref role="3cqZAo" node="4z0AnX817lH" resolve="it" />
                               </node>
                               <node concept="2yIwOk" id="6zaFu4oSipx" role="2OqNvi" />
                             </node>
@@ -344,7 +344,7 @@
                           <node concept="3clFbC" id="6zaFu4oSh4b" role="3uHU7B">
                             <node concept="2OqwBi" id="6zaFu4oSeRh" role="3uHU7B">
                               <node concept="37vLTw" id="6zaFu4oSeO8" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817lH" />
+                                <ref role="3cqZAo" node="4z0AnX817lH" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6zaFu4oSgVw" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tuf9:6zaFu4oS5HU" resolve="term" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
index d50689fcf0..2850749b2b 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/main@generator.mps
@@ -770,7 +770,7 @@
                                     <node concept="3clFbF" id="AbdozcquA7" role="3cqZAp">
                                       <node concept="2OqwBi" id="AbdozcquA8" role="3clFbG">
                                         <node concept="37vLTw" id="AbdozcquA9" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817lL" />
+                                          <ref role="3cqZAo" node="4z0AnX817lL" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="2dXqWF9F$gg" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -813,7 +813,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="AbdozcquAr" role="3uHU7B">
                                         <node concept="37vLTw" id="AbdozcquAs" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817lN" />
+                                          <ref role="3cqZAo" node="4z0AnX817lN" resolve="it" />
                                         </node>
                                         <node concept="2Xjw5R" id="AbdozcquAt" role="2OqNvi">
                                           <node concept="1xMEDy" id="AbdozcquAu" role="1xVPHs">
@@ -900,7 +900,7 @@
                                     <node concept="3clFbF" id="3vNUe1zefqr" role="3cqZAp">
                                       <node concept="2OqwBi" id="3vNUe1zefqs" role="3clFbG">
                                         <node concept="37vLTw" id="3vNUe1zefqt" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817lP" />
+                                          <ref role="3cqZAo" node="4z0AnX817lP" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="3vNUe1zefqu" role="2OqNvi">
                                           <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
@@ -946,7 +946,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="3vNUe1zekik" role="3uHU7B">
                                           <node concept="37vLTw" id="3vNUe1zejSX" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817lR" />
+                                            <ref role="3cqZAo" node="4z0AnX817lR" resolve="it" />
                                           </node>
                                           <node concept="2Xjw5R" id="3vNUe1zelhJ" role="2OqNvi">
                                             <node concept="1xMEDy" id="3vNUe1zelhL" role="1xVPHs">
@@ -1148,7 +1148,7 @@
                                             <ref role="37wK5l" to="7f1d:3X9rC2XzJij" resolve="getModules" />
                                           </node>
                                           <node concept="37vLTw" id="4hDF5Qkghpr" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817lT" />
+                                            <ref role="3cqZAo" node="4z0AnX817lT" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
@@ -1287,7 +1287,7 @@
                                             <ref role="2pJxcJ" to="kdzh:QkG2t1bKwB" resolve="path" />
                                             <node concept="WxPPo" id="uuJ7IpZtxf" role="28ntcv">
                                               <node concept="37vLTw" id="4hDF5Qkghq_" role="WxPPp">
-                                                <ref role="3cqZAo" node="4z0AnX817lV" />
+                                                <ref role="3cqZAo" node="4z0AnX817lV" resolve="it" />
                                               </node>
                                             </node>
                                           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
index 49213bb487..a65ceb87da 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps
@@ -2921,7 +2921,7 @@
                                     <node concept="2OqwBi" id="5Zn2KFQRMec" role="3fr31v">
                                       <node concept="2OqwBi" id="5Zn2KFQRMed" role="2Oq$k0">
                                         <node concept="37vLTw" id="5Zn2KFQRMee" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817lX" />
+                                          <ref role="3cqZAo" node="4z0AnX817lX" resolve="cc" />
                                         </node>
                                         <node concept="3n3YKJ" id="5Zn2KFQRMef" role="2OqNvi" />
                                       </node>
@@ -2931,7 +2931,7 @@
                                   <node concept="3fqX7Q" id="5Zn2KFQRMeh" role="3uHU7B">
                                     <node concept="2OqwBi" id="5Zn2KFQRMei" role="3fr31v">
                                       <node concept="37vLTw" id="5Zn2KFQRMej" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817lX" />
+                                        <ref role="3cqZAo" node="4z0AnX817lX" resolve="cc" />
                                       </node>
                                       <node concept="liA8E" id="5Zn2KFQRMek" role="2OqNvi">
                                         <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -3229,7 +3229,7 @@
                             <node concept="3fqX7Q" id="1T$QQLd4dsH" role="3clFbG">
                               <node concept="2OqwBi" id="1T$QQLd4dsI" role="3fr31v">
                                 <node concept="37vLTw" id="1T$QQLd4dsJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817lZ" />
+                                  <ref role="3cqZAo" node="4z0AnX817lZ" resolve="tag" />
                                 </node>
                                 <node concept="liA8E" id="1T$QQLd4dsK" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -3254,7 +3254,7 @@
                             <ref role="37wK5l" node="hzYhIjiQKh" resolve="checkTag" />
                             <node concept="7Obwk" id="73kHms33$2H" role="37wK5m" />
                             <node concept="37vLTw" id="1T$QQLd4kmr" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX817m1" />
+                              <ref role="3cqZAo" node="4z0AnX817m1" resolve="tag" />
                             </node>
                           </node>
                         </node>
@@ -3513,7 +3513,7 @@
                             <node concept="2OqwBi" id="5Zn2KFQQNO8" role="3fr31v">
                               <node concept="2OqwBi" id="5Zn2KFQQNO9" role="2Oq$k0">
                                 <node concept="37vLTw" id="5Zn2KFQQNOa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817m3" />
+                                  <ref role="3cqZAo" node="4z0AnX817m3" resolve="cc" />
                                 </node>
                                 <node concept="3n3YKJ" id="5Zn2KFQQNOb" role="2OqNvi" />
                               </node>
@@ -3523,7 +3523,7 @@
                           <node concept="3fqX7Q" id="5Zn2KFQQNOd" role="3uHU7B">
                             <node concept="2OqwBi" id="5Zn2KFQQNOe" role="3fr31v">
                               <node concept="37vLTw" id="5Zn2KFQQNOf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817m3" />
+                                <ref role="3cqZAo" node="4z0AnX817m3" resolve="cc" />
                               </node>
                               <node concept="liA8E" id="5Zn2KFQQNOg" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -3672,7 +3672,7 @@
                         </node>
                         <node concept="2OqwBi" id="1T$QQLd3_2S" role="3uHU7B">
                           <node concept="37vLTw" id="1T$QQLd3_2T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817m5" />
+                            <ref role="3cqZAo" node="4z0AnX817m5" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="1T$QQLd3_2U" role="2OqNvi" />
                         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
index b233937ab6..be6d52630f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
@@ -1147,7 +1147,7 @@
                             <node concept="2OqwBi" id="5Zn2KFQQNO8" role="3fr31v">
                               <node concept="2OqwBi" id="5Zn2KFQQNO9" role="2Oq$k0">
                                 <node concept="37vLTw" id="5Zn2KFQQNOa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817mq" />
+                                  <ref role="3cqZAo" node="4z0AnX817mq" resolve="cc" />
                                 </node>
                                 <node concept="3n3YKJ" id="5Zn2KFQQNOb" role="2OqNvi" />
                               </node>
@@ -1157,7 +1157,7 @@
                           <node concept="3fqX7Q" id="5Zn2KFQQNOd" role="3uHU7B">
                             <node concept="2OqwBi" id="5Zn2KFQQNOe" role="3fr31v">
                               <node concept="37vLTw" id="5Zn2KFQQNOf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817mq" />
+                                <ref role="3cqZAo" node="4z0AnX817mq" resolve="cc" />
                               </node>
                               <node concept="liA8E" id="5Zn2KFQQNOg" role="2OqNvi">
                                 <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1276,7 +1276,7 @@
                         <node concept="2OqwBi" id="5Zn2KFQRMec" role="3fr31v">
                           <node concept="2OqwBi" id="5Zn2KFQRMed" role="2Oq$k0">
                             <node concept="37vLTw" id="5Zn2KFQRMee" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817ms" />
+                              <ref role="3cqZAo" node="4z0AnX817ms" resolve="cc" />
                             </node>
                             <node concept="3n3YKJ" id="5Zn2KFQRMef" role="2OqNvi" />
                           </node>
@@ -1286,7 +1286,7 @@
                       <node concept="3fqX7Q" id="5Zn2KFQRMeh" role="3uHU7B">
                         <node concept="2OqwBi" id="5Zn2KFQRMei" role="3fr31v">
                           <node concept="37vLTw" id="5Zn2KFQRMej" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817ms" />
+                            <ref role="3cqZAo" node="4z0AnX817ms" resolve="cc" />
                           </node>
                           <node concept="liA8E" id="5Zn2KFQRMek" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1367,7 +1367,7 @@
                       <node concept="3fqX7Q" id="1T$QQLd4dsH" role="3clFbG">
                         <node concept="2OqwBi" id="1T$QQLd4dsI" role="3fr31v">
                           <node concept="37vLTw" id="1T$QQLd4dsJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817mu" />
+                            <ref role="3cqZAo" node="4z0AnX817mu" resolve="tag" />
                           </node>
                           <node concept="liA8E" id="1T$QQLd4dsK" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -1393,7 +1393,7 @@
                         <ref role="3cqZAo" node="34Lz1M9DCrr" resolve="ctx" />
                       </node>
                       <node concept="37vLTw" id="1T$QQLd4kmr" role="37wK5m">
-                        <ref role="3cqZAo" node="4z0AnX817mw" />
+                        <ref role="3cqZAo" node="4z0AnX817mw" resolve="tag" />
                       </node>
                     </node>
                   </node>
@@ -1509,7 +1509,7 @@
                         </node>
                         <node concept="2OqwBi" id="1T$QQLd3_2S" role="3uHU7B">
                           <node concept="37vLTw" id="1T$QQLd3_2T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817my" />
+                            <ref role="3cqZAo" node="4z0AnX817my" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="1T$QQLd3_2U" role="2OqNvi" />
                         </node>
@@ -1676,7 +1676,7 @@
                     <node concept="3fqX7Q" id="1MpR5BkUuFZ" role="3clFbG">
                       <node concept="2OqwBi" id="1MpR5BkUuG0" role="3fr31v">
                         <node concept="37vLTw" id="1MpR5BkUuG1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817m$" />
+                          <ref role="3cqZAo" node="4z0AnX817m$" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="1MpR5BkUuG2" role="2OqNvi">
                           <node concept="chp4Y" id="1MpR5BkUuG3" role="cj9EA">
@@ -1714,7 +1714,7 @@
                   <node concept="3fqX7Q" id="1MpR5BkUpof" role="3clFbG">
                     <node concept="2OqwBi" id="1MpR5BkUpsg" role="3fr31v">
                       <node concept="37vLTw" id="1MpR5BkUpom" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817mA" />
+                        <ref role="3cqZAo" node="4z0AnX817mA" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="1MpR5BkUpC3" role="2OqNvi">
                         <node concept="chp4Y" id="1MpR5BkUpGA" role="cj9EA">
@@ -1823,7 +1823,7 @@
                   <node concept="3clFbF" id="5Jew25TJ3VJ" role="3cqZAp">
                     <node concept="2OqwBi" id="5Jew25TJ42F" role="3clFbG">
                       <node concept="37vLTw" id="5Jew25TJ3VI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817mC" />
+                        <ref role="3cqZAo" node="4z0AnX817mC" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="5Jew25TJ4ho" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
diff --git a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
index fa5244da80..29a9f9fb0b 100644
--- a/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/test.iest3.component.attribute/models/editor.mps
@@ -125,7 +125,7 @@
                             <node concept="3clFbF" id="48ZWgAGrgZN" role="3cqZAp">
                               <node concept="2OqwBi" id="48ZWgAGrhiK" role="3clFbG">
                                 <node concept="37vLTw" id="48ZWgAGrgZM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817m8" />
+                                  <ref role="3cqZAo" node="4z0AnX817m8" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="48ZWgAGris4" role="2OqNvi">
                                   <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
index 064871049a..13e11a07bf 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
@@ -2461,7 +2461,7 @@
                         <node concept="3clFbF" id="6el_OoxbupW" role="3cqZAp">
                           <node concept="qpA2v" id="6el_OoxbupX" role="3clFbG">
                             <node concept="37vLTw" id="6el_OoxbupY" role="3SLO0q">
-                              <ref role="3cqZAo" node="4z0AnX817mE" />
+                              <ref role="3cqZAo" node="4z0AnX817mE" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -3562,7 +3562,7 @@
                         <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
                         <node concept="2OqwBi" id="30MddjY0uts" role="37wK5m">
                           <node concept="37vLTw" id="30MddjY0utt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817mG" />
+                            <ref role="3cqZAo" node="4z0AnX817mG" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="30MddjY0utu" role="2OqNvi">
                             <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
@@ -3605,7 +3605,7 @@
                           <ref role="37wK5l" to="xfg9:5ye9uPrx0ez" resolve="isOtherwiseLiteral" />
                           <node concept="2OqwBi" id="30MddjY0utI" role="37wK5m">
                             <node concept="37vLTw" id="30MddjY0utJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817mI" />
+                              <ref role="3cqZAo" node="4z0AnX817mI" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="30MddjY0utK" role="2OqNvi">
                               <ref role="3Tt5mk" to="hm2y:6UxFDrx4dpI" resolve="when" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
index 672116fdb0..212786e8b4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
@@ -376,7 +376,7 @@
                         <node concept="3clFbF" id="2Qbt$1tTUc0" role="3cqZAp">
                           <node concept="2OqwBi" id="2Qbt$1tTUc1" role="3clFbG">
                             <node concept="37vLTw" id="2Qbt$1tTUc2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817mK" />
+                              <ref role="3cqZAo" node="4z0AnX817mK" resolve="it" />
                             </node>
                             <node concept="liA8E" id="2Qbt$1tTUc3" role="2OqNvi">
                               <ref role="37wK5l" to="oq0c:2Qbt$1tSwXM" resolve="getPriorityLevel" />
@@ -2053,7 +2053,7 @@
                           <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                         </node>
                         <node concept="37vLTw" id="26cjRAD8YM1" role="2ZW6bz">
-                          <ref role="3cqZAo" node="4z0AnX817mM" />
+                          <ref role="3cqZAo" node="4z0AnX817mM" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -2089,7 +2089,7 @@
                         <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACFnDl" role="2ZW6bz">
-                        <ref role="3cqZAo" node="4z0AnX817mO" />
+                        <ref role="3cqZAo" node="4z0AnX817mO" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -2124,7 +2124,7 @@
                         <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRADa0ye" role="2ZW6bz">
-                        <ref role="3cqZAo" node="4z0AnX817mQ" />
+                        <ref role="3cqZAo" node="4z0AnX817mQ" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -2159,7 +2159,7 @@
                         <ref role="3uigEE" to="oq0c:UN2ftLWgA8" resolve="NoneValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACFqoi" role="2ZW6bz">
-                        <ref role="3cqZAo" node="4z0AnX817mS" />
+                        <ref role="3cqZAo" node="4z0AnX817mS" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -2194,7 +2194,7 @@
                         <ref role="3uigEE" to="oq0c:UN2ftLWgA8" resolve="NoneValue" />
                       </node>
                       <node concept="37vLTw" id="26cjRACKu_p" role="2ZW6bz">
-                        <ref role="3cqZAo" node="4z0AnX817mU" />
+                        <ref role="3cqZAo" node="4z0AnX817mU" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -3246,7 +3246,7 @@
                         <node concept="3clFbF" id="26cjRACVUHG" role="3cqZAp">
                           <node concept="2OqwBi" id="26cjRACVUHH" role="3clFbG">
                             <node concept="37vLTw" id="26cjRACVUHI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817mW" />
+                              <ref role="3cqZAo" node="4z0AnX817mW" resolve="it" />
                             </node>
                             <node concept="liA8E" id="26cjRACVUHJ" role="2OqNvi">
                               <ref role="37wK5l" to="oq0c:26cjRACVPUy" resolve="getPriorityLevel" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
index 640369fcf2..42be417945 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.collections.interpreter/models/plugin.mps
@@ -4180,12 +4180,12 @@
                                 <node concept="3clFbF" id="36hsHVfkcR7" role="3cqZAp">
                                   <node concept="2OqwBi" id="36hsHVfkd3J" role="3clFbG">
                                     <node concept="37vLTw" id="36hsHVfkcR6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817mY" />
+                                      <ref role="3cqZAo" node="4z0AnX817mY" resolve="a" />
                                     </node>
                                     <node concept="liA8E" id="36hsHVfkdwB" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Comparable.compareTo(java.lang.Object)" resolve="compareTo" />
                                       <node concept="37vLTw" id="36hsHVfke4a" role="37wK5m">
-                                        <ref role="3cqZAo" node="4z0AnX817n0" />
+                                        <ref role="3cqZAo" node="4z0AnX817n0" resolve="b" />
                                       </node>
                                     </node>
                                   </node>
@@ -4247,12 +4247,12 @@
                                   <node concept="3clFbF" id="36hsHVfke_N" role="3cqZAp">
                                     <node concept="2OqwBi" id="36hsHVfkeL2" role="3clFbG">
                                       <node concept="37vLTw" id="36hsHVfke_M" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817n2" />
+                                        <ref role="3cqZAo" node="4z0AnX817n2" resolve="a" />
                                       </node>
                                       <node concept="liA8E" id="36hsHVfkf4a" role="2OqNvi">
                                         <ref role="37wK5l" to="wyt6:~Comparable.compareTo(java.lang.Object)" resolve="compareTo" />
                                         <node concept="37vLTw" id="36hsHVfkfBS" role="37wK5m">
-                                          <ref role="3cqZAo" node="4z0AnX817n4" />
+                                          <ref role="3cqZAo" node="4z0AnX817n4" resolve="b" />
                                         </node>
                                       </node>
                                     </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
index 429f833c21..f64aceae94 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.data.interpreter/models/org.iets3.core.expr.data.interpreter.plugin.mps
@@ -281,7 +281,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="7MYpJaZ8UQy" role="3uHU7B">
                                     <node concept="37vLTw" id="7MYpJaZ8UQz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817n6" />
+                                      <ref role="3cqZAo" node="4z0AnX817n6" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7MYpJaZ8UQ$" role="2OqNvi">
                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -504,12 +504,12 @@
                                   <node concept="3clFbF" id="stdmzxqE62" role="3cqZAp">
                                     <node concept="1Ls8ON" id="stdmzxqE63" role="3clFbG">
                                       <node concept="37vLTw" id="stdmzxqE64" role="1Lso8e">
-                                        <ref role="3cqZAo" node="4z0AnX817na" />
+                                        <ref role="3cqZAo" node="4z0AnX817na" resolve="it" />
                                       </node>
                                       <node concept="2OqwBi" id="stdmzxqE65" role="1Lso8e">
                                         <node concept="2OqwBi" id="stdmzxqE66" role="2Oq$k0">
                                           <node concept="37vLTw" id="stdmzxqE67" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817na" />
+                                            <ref role="3cqZAo" node="4z0AnX817na" resolve="it" />
                                           </node>
                                           <node concept="3Tsc0h" id="stdmzxqE68" role="2OqNvi">
                                             <ref role="3TtcxE" to="e9k1:cPLa7FpcRm" resolve="cells" />
@@ -525,7 +525,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="stdmzxqE6h" role="3uHU7B">
                                                     <node concept="37vLTw" id="stdmzxqE6i" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4z0AnX817n8" />
+                                                      <ref role="3cqZAo" node="4z0AnX817n8" resolve="it" />
                                                     </node>
                                                     <node concept="3TrEf2" id="stdmzxqE6j" role="2OqNvi">
                                                       <ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
@@ -565,7 +565,7 @@
                                             <property role="3cmrfH" value="1" />
                                           </node>
                                           <node concept="37vLTw" id="5s2FNgbz1nn" role="1LFl5Q">
-                                            <ref role="3cqZAo" node="4z0AnX817nc" />
+                                            <ref role="3cqZAo" node="4z0AnX817nc" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="5s2FNgbz1no" role="2OqNvi">
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
index f6e60c8e6c..a31e170c0c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.dataflow.interpreter/models/plugin.mps
@@ -371,7 +371,7 @@
                                 <node concept="qpA2v" id="2vkvJYT7J3M" role="3clFbG">
                                   <node concept="2OqwBi" id="2vkvJYT7Jj7" role="3SLO0q">
                                     <node concept="37vLTw" id="2vkvJYT7J9E" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817ne" />
+                                      <ref role="3cqZAo" node="4z0AnX817ne" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="2vkvJYT7J$9" role="2OqNvi">
                                       <ref role="3Tt5mk" to="gx5r:2vkvJYT213x" resolve="value" />
@@ -830,7 +830,7 @@
                       <node concept="3clFbF" id="2vkvJYTf3Z9" role="3cqZAp">
                         <node concept="2OqwBi" id="2vkvJYTf3Za" role="3clFbG">
                           <node concept="37vLTw" id="2vkvJYTf3Zb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817ng" />
+                            <ref role="3cqZAo" node="4z0AnX817ng" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="2vkvJYTf3Zc" role="2OqNvi">
                             <ref role="37wK5l" to="b4m9:5Q9FzcI4YUK" resolve="connectsToOutsidePort" />
@@ -991,7 +991,7 @@
                             <node concept="3clFbF" id="2vkvJYTf_OK" role="3cqZAp">
                               <node concept="2OqwBi" id="2vkvJYTf_OL" role="3clFbG">
                                 <node concept="37vLTw" id="2vkvJYTf_OM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ni" />
+                                  <ref role="3cqZAo" node="4z0AnX817ni" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="2vkvJYTf_ON" role="2OqNvi">
                                   <ref role="37wK5l" to="b4m9:5Q9FzcI6bZ6" resolve="connectsToInsideInPort" />
@@ -1094,7 +1094,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="PkV_vHz5MT" role="3uHU7B">
                                   <node concept="37vLTw" id="PkV_vHz5MU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817nk" />
+                                    <ref role="3cqZAo" node="4z0AnX817nk" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="PkV_vHz5MV" role="2OqNvi">
                                     <ref role="3Tt5mk" to="gx5r:2vkvJYSQEwb" resolve="param" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
index 191021d027..6106ac2ba9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps
@@ -3334,7 +3334,7 @@
                     <node concept="3clFbF" id="64dkh69VXjd" role="3cqZAp">
                       <node concept="qpA2v" id="64dkh69VXjb" role="3clFbG">
                         <node concept="37vLTw" id="64dkh69VXji" role="3SLO0q">
-                          <ref role="3cqZAo" node="4z0AnX817nm" />
+                          <ref role="3cqZAo" node="4z0AnX817nm" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -3371,7 +3371,7 @@
                     <node concept="3clFbF" id="64dkh69WfI7" role="3cqZAp">
                       <node concept="qpA2v" id="64dkh69WfI8" role="3clFbG">
                         <node concept="37vLTw" id="64dkh69WfI9" role="3SLO0q">
-                          <ref role="3cqZAo" node="4z0AnX817no" />
+                          <ref role="3cqZAo" node="4z0AnX817no" resolve="it" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
index 35993fa239..5fe42b1a1d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.doc.plugin/models/plugin.mps
@@ -221,7 +221,7 @@
                   <node concept="3fqX7Q" id="4vZ65iK0oId" role="3clFbG">
                     <node concept="2OqwBi" id="4vZ65iK0oIf" role="3fr31v">
                       <node concept="37vLTw" id="4vZ65iK0oIg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4z0AnX817nq" />
+                        <ref role="3cqZAo" node="4z0AnX817nq" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4vZ65iK0oIh" role="2OqNvi">
                         <ref role="37wK5l" to="srqo:2m0pXWMLk6" resolve="hideBookmark" />
@@ -244,14 +244,14 @@
                 <node concept="1Ls8ON" id="4vZ65iK1mzm" role="3clFbG">
                   <node concept="2OqwBi" id="4vZ65iK1kT7" role="1Lso8e">
                     <node concept="37vLTw" id="4vZ65iK1kGF" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4z0AnX817ns" />
+                      <ref role="3cqZAo" node="4z0AnX817ns" resolve="it" />
                     </node>
                     <node concept="2qgKlT" id="4vZ65iK1loQ" role="2OqNvi">
                       <ref role="37wK5l" to="srqo:4vZ65iK1hOY" resolve="getBookmarkedNode" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="4vZ65iK1mKY" role="1Lso8e">
-                    <ref role="3cqZAo" node="4z0AnX817ns" />
+                    <ref role="3cqZAo" node="4z0AnX817ns" resolve="it" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
index c4acb53785..d8174b18f3 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.genjava.temporal.rt/models/runtime.mps
@@ -467,7 +467,7 @@
                 <node concept="3clFbS" id="3nGzaxUtfSw" role="1bW5cS">
                   <node concept="3clFbF" id="3nGzaxUtfSx" role="3cqZAp">
                     <node concept="37vLTw" id="3nGzaxUtfSy" role="3clFbG">
-                      <ref role="3cqZAo" node="4z0AnX817nu" />
+                      <ref role="3cqZAo" node="4z0AnX817nu" resolve="it" />
                     </node>
                   </node>
                 </node>
@@ -798,7 +798,7 @@
                 <node concept="3clFbS" id="4eVSC65wKJe" role="1bW5cS">
                   <node concept="3clFbF" id="4eVSC65wKJf" role="3cqZAp">
                     <node concept="37vLTw" id="4eVSC65wKJg" role="3clFbG">
-                      <ref role="3cqZAo" node="4z0AnX817nw" />
+                      <ref role="3cqZAo" node="4z0AnX817nw" resolve="it" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
index 98cdfb24cb..08f618c550 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lambda.interpreter/models/plugin.mps
@@ -1258,7 +1258,7 @@
                           <node concept="liA8E" id="3TIaSh_f2Uo" role="2OqNvi">
                             <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                             <node concept="37vLTw" id="Om1N8Vect_" role="37wK5m">
-                              <ref role="3cqZAo" node="4z0AnX817ny" />
+                              <ref role="3cqZAo" node="4z0AnX817ny" resolve="it" />
                             </node>
                             <node concept="10Nm6u" id="3TIaSh_f3vR" role="37wK5m" />
                           </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
index 2ec824e984..098c3b9e26 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.lookup.interpreter/models/plugin.mps
@@ -383,7 +383,7 @@
                                         <node concept="3clFbC" id="4bt45uNvmcE" role="3uHU7w">
                                           <node concept="2OqwBi" id="4bt45uNvmcF" role="3uHU7B">
                                             <node concept="37vLTw" id="4bt45uNvmcG" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817n$" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcH" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -391,7 +391,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="4bt45uNvmcI" role="3uHU7w">
                                             <node concept="37vLTw" id="4bt45uNvmcJ" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817n$" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcK" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbs" resolve="col" />
@@ -401,7 +401,7 @@
                                         <node concept="3clFbC" id="4bt45uNvmcL" role="3uHU7B">
                                           <node concept="2OqwBi" id="4bt45uNvmcM" role="3uHU7B">
                                             <node concept="37vLTw" id="4bt45uNvmcN" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817n$" />
+                                              <ref role="3cqZAo" node="4z0AnX817n$" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="4bt45uNvmcO" role="2OqNvi">
                                               <ref role="3Tt5mk" to="8qwc:55lPkJGINbj" resolve="row" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
index 0714c51ce8..6c549d35ca 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
@@ -719,7 +719,7 @@
                               <node concept="2OqwBi" id="Z4fkwz7eS2" role="3clFbG">
                                 <node concept="2OqwBi" id="Z4fkwz7eS3" role="2Oq$k0">
                                   <node concept="37vLTw" id="Z4fkwz7eS4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817nA" />
+                                    <ref role="3cqZAo" node="4z0AnX817nA" resolve="it" />
                                   </node>
                                   <node concept="2OwXpG" id="Z4fkwz7eS5" role="2OqNvi">
                                     <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
@@ -922,7 +922,7 @@
                               <node concept="2OqwBi" id="Z4fkwz7bCB" role="3clFbG">
                                 <node concept="2OqwBi" id="Z4fkwz7bCC" role="2Oq$k0">
                                   <node concept="37vLTw" id="Z4fkwz7bCD" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817nC" />
+                                    <ref role="3cqZAo" node="4z0AnX817nC" resolve="it" />
                                   </node>
                                   <node concept="2OwXpG" id="Z4fkwz7bCE" role="2OqNvi">
                                     <ref role="2Oxat5" to="n9sl:5y3VELftA2d" resolve="name" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
index afb703ae26..85dcafed53 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
@@ -3052,7 +3052,7 @@
                       <node concept="3clFbF" id="6l5633bp3R9" role="3cqZAp">
                         <node concept="2OqwBi" id="6l5633bp3WB" role="3clFbG">
                           <node concept="37vLTw" id="6l5633bp3R8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817nE" />
+                            <ref role="3cqZAo" node="4z0AnX817nE" resolve="it" />
                           </node>
                           <node concept="1Bd96e" id="6l5633bp414" role="2OqNvi" />
                         </node>
@@ -6262,7 +6262,7 @@
                         <node concept="10Nm6u" id="2ufoZQISyNC" role="3uHU7w" />
                         <node concept="2OqwBi" id="2ufoZQISyND" role="3uHU7B">
                           <node concept="37vLTw" id="2ufoZQISyNE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817nG" />
+                            <ref role="3cqZAo" node="4z0AnX817nG" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="2ufoZQISyNF" role="2OqNvi">
                             <node concept="3CFYIy" id="2ufoZQISyNG" role="3CFYIz">
@@ -6287,7 +6287,7 @@
                     <node concept="2OqwBi" id="2ufoZQISyNN" role="3clFbG">
                       <node concept="2OqwBi" id="2ufoZQISyNO" role="2Oq$k0">
                         <node concept="37vLTw" id="2ufoZQISyNP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817nI" />
+                          <ref role="3cqZAo" node="4z0AnX817nI" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="2ufoZQISyNQ" role="2OqNvi">
                           <node concept="3CFYIy" id="2ufoZQISyNR" role="3CFYIz">
@@ -6432,7 +6432,7 @@
                         <node concept="10Nm6u" id="2ufoZQISvSj" role="3uHU7w" />
                         <node concept="2OqwBi" id="2ufoZQISvbs" role="3uHU7B">
                           <node concept="37vLTw" id="2ufoZQISurh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817nK" />
+                            <ref role="3cqZAo" node="4z0AnX817nK" resolve="it" />
                           </node>
                           <node concept="3CFZ6_" id="2ufoZQISvnu" role="2OqNvi">
                             <node concept="3CFYIy" id="2ufoZQISvwo" role="3CFYIz">
@@ -6457,7 +6457,7 @@
                     <node concept="2OqwBi" id="2ufoZQISx$9" role="3clFbG">
                       <node concept="2OqwBi" id="2ufoZQISwXH" role="2Oq$k0">
                         <node concept="37vLTw" id="2ufoZQISwO1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817nM" />
+                          <ref role="3cqZAo" node="4z0AnX817nM" resolve="it" />
                         </node>
                         <node concept="3CFZ6_" id="2ufoZQISxdN" role="2OqNvi">
                           <node concept="3CFYIy" id="2ufoZQISxjY" role="3CFYIz">
@@ -7274,7 +7274,7 @@
                   <node concept="3clFbF" id="3TIaSh$QwGh" role="3cqZAp">
                     <node concept="17R0WA" id="3TIaSh$QxnK" role="3clFbG">
                       <node concept="37vLTw" id="3TIaSh$QwGg" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817nO" />
+                        <ref role="3cqZAo" node="4z0AnX817nO" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="3TIaSh$Qxwr" role="3uHU7w">
                         <ref role="3cqZAo" node="3TIaSh$Qxwp" resolve="cvg" />
@@ -7439,7 +7439,7 @@
                   <node concept="3clFbF" id="1m$qA_Y_gGw" role="3cqZAp">
                     <node concept="17R0WA" id="1m$qA_Y_gGx" role="3clFbG">
                       <node concept="37vLTw" id="1m$qA_Y_gGy" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817nQ" />
+                        <ref role="3cqZAo" node="4z0AnX817nQ" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="1m$qA_Y_gGz" role="3uHU7w">
                         <ref role="3cqZAo" node="1m$qA_Y_hIW" resolve="cvg" />
@@ -8609,7 +8609,7 @@
                       <node concept="1Wc70l" id="kZqQ80hiGK" role="3uHU7B">
                         <node concept="2OqwBi" id="kZqQ80hiGQ" role="3uHU7B">
                           <node concept="37vLTw" id="kZqQ80hiGR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817nS" />
+                            <ref role="3cqZAo" node="4z0AnX817nS" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="kZqQ80hiGS" role="2OqNvi">
                             <node concept="chp4Y" id="kZqQ80hiGT" role="cj9EA">
@@ -8623,7 +8623,7 @@
                               <ref role="cht4Q" to="hm2y:7obiejCh8R2" resolve="ITraceRoot" />
                             </node>
                             <node concept="37vLTw" id="kZqQ80hiGO" role="1m5AlR">
-                              <ref role="3cqZAo" node="4z0AnX817nS" />
+                              <ref role="3cqZAo" node="4z0AnX817nS" resolve="it" />
                             </node>
                           </node>
                           <node concept="2qgKlT" id="kZqQ80hiGP" role="2OqNvi">
@@ -8639,7 +8639,7 @@
                                 <ref role="cht4Q" to="hm2y:XblfskIwr9" resolve="IMultiTraceRoot" />
                               </node>
                               <node concept="37vLTw" id="4_BA2XOIPvt" role="1m5AlR">
-                                <ref role="3cqZAo" node="4z0AnX817nS" />
+                                <ref role="3cqZAo" node="4z0AnX817nS" resolve="it" />
                               </node>
                             </node>
                             <node concept="2qgKlT" id="4_BA2XOIPvu" role="2OqNvi">
@@ -8650,7 +8650,7 @@
                         </node>
                         <node concept="2OqwBi" id="4_BA2XOIPvw" role="3uHU7B">
                           <node concept="37vLTw" id="4_BA2XOIPvx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4z0AnX817nS" />
+                            <ref role="3cqZAo" node="4z0AnX817nS" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4_BA2XOIPvy" role="2OqNvi">
                             <node concept="chp4Y" id="4_BA2XOIPvz" role="cj9EA">
@@ -9831,7 +9831,7 @@
                           <node concept="3clFbF" id="3ApArNFCjJI" role="3cqZAp">
                             <node concept="2OqwBi" id="3ApArNFCjJJ" role="3clFbG">
                               <node concept="37vLTw" id="3ApArNFCjJK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817nU" />
+                                <ref role="3cqZAo" node="4z0AnX817nU" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3ApArNFCjJL" role="2OqNvi">
                                 <ref role="37wK5l" node="3ApArNFAK9d" resolve="getPriority" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
index 2637807bdf..f3a72fa257 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.interpreter/models/plugin.mps
@@ -343,7 +343,7 @@
                                 <node concept="10Nm6u" id="3_Nra3Ea5Wu" role="3uHU7w" />
                                 <node concept="2OqwBi" id="3_Nra3Ea5cb" role="3uHU7B">
                                   <node concept="37vLTw" id="3_Nra3Ea51Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817nW" />
+                                    <ref role="3cqZAo" node="4z0AnX817nW" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="3_Nra3Ea5tW" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
index 00ef1e208e..20e3cab5fa 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.repl.plugin/models/org/iets3/core/expr/repl/plugin/plugin.mps
@@ -1279,7 +1279,7 @@
                         <node concept="2OqwBi" id="1mFXz_G2Tdq" role="3clFbG">
                           <node concept="2OqwBi" id="1mFXz_G2SDg" role="2Oq$k0">
                             <node concept="37vLTw" id="1mFXz_G2SuZ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817nY" />
+                              <ref role="3cqZAo" node="4z0AnX817nY" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="1mFXz_G2SS2" role="2OqNvi">
                               <ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
@@ -1335,7 +1335,7 @@
                               </node>
                               <node concept="2OqwBi" id="1mFXz_G34hU" role="3uHU7B">
                                 <node concept="37vLTw" id="1mFXz_G3465" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817o0" />
+                                  <ref role="3cqZAo" node="4z0AnX817o0" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1mFXz_G34yw" role="2OqNvi">
                                   <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
index 5eb2f56530..8be14f91d4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.interpreter/models/org.iets3.core.expr.stringvalidation.interpreter.plugin.mps
@@ -229,7 +229,7 @@
                               <node concept="3clFbF" id="5wF$o0BESlN" role="3cqZAp">
                                 <node concept="2OqwBi" id="5wF$o0BESlO" role="3clFbG">
                                   <node concept="37vLTw" id="5wF$o0BESlP" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817o2" />
+                                    <ref role="3cqZAo" node="4z0AnX817o2" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="5wF$o0BESlQ" role="2OqNvi">
                                     <ref role="37wK5l" to="lxua:5wF$o0BEPkN" resolve="makeX" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps
index d2054ca472..1e916628f6 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps
@@ -2005,7 +2005,7 @@
                           <node concept="3clFbF" id="2LaXqmVKYpf" role="3cqZAp">
                             <node concept="2OqwBi" id="2LaXqmVKYpg" role="3clFbG">
                               <node concept="37vLTw" id="2LaXqmVKYph" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817o4" />
+                                <ref role="3cqZAo" node="4z0AnX817o4" resolve="it" />
                               </node>
                               <node concept="2OwXpG" id="2LaXqmVKYpi" role="2OqNvi">
                                 <ref role="2Oxat5" node="4lCUG7OtVap" resolve="whatWasFound" />
@@ -2230,7 +2230,7 @@
                         <ref role="3cqZAo" node="2LaXqmXpWen" resolve="c" />
                       </node>
                       <node concept="37vLTw" id="2LaXqmXpZtf" role="3uHU7B">
-                        <ref role="3cqZAo" node="4z0AnX817o6" />
+                        <ref role="3cqZAo" node="4z0AnX817o6" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -2958,7 +2958,7 @@
                               <ref role="1Pybhc" node="4lCUG7OtWrX" resolve="Runtime" />
                               <node concept="2OqwBi" id="2LaXqmXq4Ra" role="37wK5m">
                                 <node concept="37vLTw" id="2LaXqmXq4KA" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817o8" />
+                                  <ref role="3cqZAo" node="4z0AnX817o8" resolve="it" />
                                 </node>
                                 <node concept="2OwXpG" id="2LaXqmXq54J" role="2OqNvi">
                                   <ref role="2Oxat5" node="4lCUG7OtVap" resolve="whatWasFound" />
@@ -6186,7 +6186,7 @@
                                     <ref role="3uigEE" node="5wF$o0BPZ8y" resolve="XMaxCountCheck" />
                                   </node>
                                   <node concept="37vLTw" id="5wF$o0BTX9H" role="2ZW6bz">
-                                    <ref role="3cqZAo" node="4z0AnX817oa" />
+                                    <ref role="3cqZAo" node="4z0AnX817oa" resolve="it" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
index 3d4c20a0b8..4bd8ac3921 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.toplevel.interpreter/models/plugin.mps
@@ -2765,7 +2765,7 @@
                               <node concept="liA8E" id="3FGeL_$Ge17" role="2OqNvi">
                                 <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                 <node concept="37vLTw" id="3FGeL_$Ge9c" role="37wK5m">
-                                  <ref role="3cqZAo" node="4z0AnX817oc" />
+                                  <ref role="3cqZAo" node="4z0AnX817oc" resolve="it" />
                                 </node>
                                 <node concept="10Nm6u" id="3FGeL_$J3CX" role="37wK5m" />
                               </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
index f08767b214..692adc1cb2 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.util.interpreter/models/plugin.mps
@@ -673,7 +673,7 @@
                                   <node concept="2OqwBi" id="7FuUjk_r6Mq" role="3clFbG">
                                     <node concept="qpA2v" id="7FuUjk_r6Mr" role="2Oq$k0">
                                       <node concept="37vLTw" id="7FuUjk_r6Ms" role="3SLO0q">
-                                        <ref role="3cqZAo" node="4z0AnX817oe" />
+                                        <ref role="3cqZAo" node="4z0AnX817oe" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="7FuUjk_r6Mt" role="2OqNvi">
@@ -778,7 +778,7 @@
                                           <node concept="2OqwBi" id="7FuUjk_r6Nc" role="3SLO0q">
                                             <node concept="2OqwBi" id="7FuUjk_r6Nd" role="2Oq$k0">
                                               <node concept="37vLTw" id="7FuUjk_r6Ne" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="4z0AnX817og" />
+                                                <ref role="3cqZAo" node="4z0AnX817og" resolve="it" />
                                               </node>
                                               <node concept="3Tsc0h" id="7FuUjk_r6Nf" role="2OqNvi">
                                                 <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
@@ -1000,7 +1000,7 @@
                               <node concept="1Ls8ON" id="7EKPeISQ4_O" role="3clFbG">
                                 <node concept="2OqwBi" id="7EKPeISQ4_P" role="1Lso8e">
                                   <node concept="37vLTw" id="7EKPeISQ4_Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4z0AnX817oi" />
+                                    <ref role="3cqZAo" node="4z0AnX817oi" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="7EKPeISQ4_R" role="2OqNvi">
                                     <ref role="3Tt5mk" to="kfo3:7FuUjk_mXBR" resolve="col" />
@@ -1009,7 +1009,7 @@
                                 <node concept="qpA2v" id="7EKPeISQ4_S" role="1Lso8e">
                                   <node concept="2OqwBi" id="7EKPeISQ4_T" role="3SLO0q">
                                     <node concept="37vLTw" id="7EKPeISQ4_U" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4z0AnX817oi" />
+                                      <ref role="3cqZAo" node="4z0AnX817oi" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7EKPeISQ4_V" role="2OqNvi">
                                       <ref role="3Tt5mk" to="kfo3:7FuUjk_mXBU" resolve="value" />
@@ -1230,7 +1230,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="7EKPeISPBEu" role="1LFl5Q">
-                            <ref role="3cqZAo" node="4z0AnX817ok" />
+                            <ref role="3cqZAo" node="4z0AnX817ok" resolve="it" />
                           </node>
                         </node>
                         <node concept="2bSWHS" id="7EKPeISPBEv" role="2OqNvi" />
@@ -1932,7 +1932,7 @@
                                   <node concept="liA8E" id="AfAutuJGc1" role="2OqNvi">
                                     <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                     <node concept="37vLTw" id="AfAutuJGc2" role="37wK5m">
-                                      <ref role="3cqZAo" node="4z0AnX817om" />
+                                      <ref role="3cqZAo" node="4z0AnX817om" resolve="n" />
                                     </node>
                                     <node concept="10Nm6u" id="AfAutuJGc3" role="37wK5m" />
                                   </node>
@@ -2278,7 +2278,7 @@
                                           <node concept="liA8E" id="AfAutuJGdD" role="2OqNvi">
                                             <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                             <node concept="37vLTw" id="AfAutuJGdE" role="37wK5m">
-                                              <ref role="3cqZAo" node="4z0AnX817oo" />
+                                              <ref role="3cqZAo" node="4z0AnX817oo" resolve="n" />
                                             </node>
                                             <node concept="10Nm6u" id="AfAutuJGdF" role="37wK5m" />
                                           </node>
@@ -2516,7 +2516,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="AfAutuJGeP" role="3uHU7B">
                                             <node concept="37vLTw" id="AfAutuJGeQ" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817oq" />
+                                              <ref role="3cqZAo" node="4z0AnX817oq" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="AfAutuJGeR" role="2OqNvi">
                                               <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cT" resolve="row" />
@@ -2526,7 +2526,7 @@
                                         <node concept="3clFbC" id="AfAutuJGeS" role="3uHU7B">
                                           <node concept="2OqwBi" id="AfAutuJGeT" role="3uHU7B">
                                             <node concept="37vLTw" id="AfAutuJGeU" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817oq" />
+                                              <ref role="3cqZAo" node="4z0AnX817oq" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="AfAutuJGeV" role="2OqNvi">
                                               <ref role="3Tt5mk" to="kfo3:3DYDRw0K4cW" resolve="col" />
@@ -3296,7 +3296,7 @@
                                   <node concept="2OqwBi" id="Om1N8TzGwU" role="3clFbG">
                                     <node concept="2OqwBi" id="Om1N8TzAyo" role="2Oq$k0">
                                       <node concept="37vLTw" id="Om1N8TzAfI" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817ou" />
+                                        <ref role="3cqZAo" node="4z0AnX817ou" resolve="it" />
                                       </node>
                                       <node concept="2Rf3mk" id="Om1N8TzB7w" role="2OqNvi">
                                         <node concept="1xIGOp" id="Om1N8TzEKL" role="1xVPHs" />
@@ -3313,7 +3313,7 @@
                                               <node concept="liA8E" id="Om1N8V9h9v" role="2OqNvi">
                                                 <ref role="37wK5l" to="2ahs:RaqQlV4lZg" resolve="coverValue" />
                                                 <node concept="37vLTw" id="Om1N8V9h9y" role="37wK5m">
-                                                  <ref role="3cqZAo" node="4z0AnX817os" />
+                                                  <ref role="3cqZAo" node="4z0AnX817os" resolve="n" />
                                                 </node>
                                                 <node concept="10Nm6u" id="Om1N8V9hAh" role="37wK5m" />
                                               </node>
@@ -3341,7 +3341,7 @@
                                             <ref role="cht4Q" to="kfo3:6OunYCfi$ob" resolve="RangeValueExpr" />
                                           </node>
                                           <node concept="37vLTw" id="6OunYCflTUH" role="1m5AlR">
-                                            <ref role="3cqZAo" node="4z0AnX817ou" />
+                                            <ref role="3cqZAo" node="4z0AnX817ou" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="6OunYCflTUI" role="2OqNvi">
@@ -3391,7 +3391,7 @@
                               </node>
                               <node concept="2OqwBi" id="6OunYCfl5TB" role="3clFbw">
                                 <node concept="37vLTw" id="6OunYCfkUGr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4z0AnX817ou" />
+                                  <ref role="3cqZAo" node="4z0AnX817ou" resolve="it" />
                                 </node>
                                 <node concept="1mIQ4w" id="6OunYCfl6iJ" role="2OqNvi">
                                   <node concept="chp4Y" id="6OunYCfl6pU" role="cj9EA">
@@ -3406,7 +3406,7 @@
                                       <node concept="1rXfSq" id="4rjLou3wq_C" role="2Oq$k0">
                                         <ref role="37wK5l" node="4rjLou3w8Cv" resolve="exec" />
                                         <node concept="37vLTw" id="4rjLou3wqVT" role="37wK5m">
-                                          <ref role="3cqZAo" node="4z0AnX817ou" />
+                                          <ref role="3cqZAo" node="4z0AnX817ou" resolve="it" />
                                         </node>
                                         <node concept="37vLTw" id="4rjLou3wrxP" role="37wK5m">
                                           <ref role="3cqZAo" node="5sWTAJ3pqdU" resolve="rowTrace" />
@@ -3626,7 +3626,7 @@
                           <node concept="3clFbF" id="6OunYCf7RWR" role="3cqZAp">
                             <node concept="2OqwBi" id="6OunYCf7RWS" role="3clFbG">
                               <node concept="37vLTw" id="6OunYCf7RWT" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4z0AnX817ow" />
+                                <ref role="3cqZAo" node="4z0AnX817ow" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6OunYCf7RWU" role="2OqNvi">
                                 <node concept="chp4Y" id="6OunYCf7RWV" role="cj9EA">
@@ -3744,7 +3744,7 @@
                                         <node concept="2OqwBi" id="MOCoK$zSTw" role="37wK5m">
                                           <node concept="2OqwBi" id="MOCoK$zSTx" role="2Oq$k0">
                                             <node concept="37vLTw" id="MOCoK$zSTy" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4z0AnX817oy" />
+                                              <ref role="3cqZAo" node="4z0AnX817oy" resolve="it" />
                                             </node>
                                             <node concept="3Tsc0h" id="MOCoK$zSTz" role="2OqNvi">
                                               <ref role="3TtcxE" to="kfo3:8XWEtdYkjo" resolve="exprs" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
index 231e4d01cc..4d3a538c52 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps
@@ -635,7 +635,7 @@
                                       <node concept="3clFbF" id="6wumyRU9QhV" role="3cqZAp">
                                         <node concept="2OqwBi" id="6wumyRU9Qq_" role="3clFbG">
                                           <node concept="37vLTw" id="6wumyRU9QhU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4z0AnX817o$" />
+                                            <ref role="3cqZAo" node="4z0AnX817o$" resolve="it" />
                                           </node>
                                           <node concept="liA8E" id="6wumyRU9QDF" role="2OqNvi">
                                             <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -660,7 +660,7 @@
                                       <node concept="3y3z36" id="6wumyRU9Sfd" role="3clFbG">
                                         <node concept="10Nm6u" id="6wumyRU9SsW" role="3uHU7w" />
                                         <node concept="37vLTw" id="6wumyRU9S78" role="3uHU7B">
-                                          <ref role="3cqZAo" node="4z0AnX817oA" />
+                                          <ref role="3cqZAo" node="4z0AnX817oA" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -678,7 +678,7 @@
                                   <node concept="3clFbF" id="6lwqIIdXhJ7" role="3cqZAp">
                                     <node concept="2OqwBi" id="6lwqIIdXhVl" role="3clFbG">
                                       <node concept="37vLTw" id="6lwqIIdXhJ6" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4z0AnX817oC" />
+                                        <ref role="3cqZAo" node="4z0AnX817oC" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="6lwqIIdXobt" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
@@ -945,7 +945,7 @@
                                     <node concept="3clFbF" id="6lwqIIdYoD0" role="3cqZAp">
                                       <node concept="2OqwBi" id="6lwqIIdYoIj" role="3clFbG">
                                         <node concept="37vLTw" id="6lwqIIdYoCZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817oE" />
+                                          <ref role="3cqZAo" node="4z0AnX817oE" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="6lwqIIdYpkX" role="2OqNvi">
                                           <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
@@ -978,12 +978,12 @@
                                     <node concept="3clFbF" id="6lwqIIdYqmp" role="3cqZAp">
                                       <node concept="2OqwBi" id="6lwqIIdYqLn" role="3clFbG">
                                         <node concept="37vLTw" id="6lwqIIdYqmo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4z0AnX817oG" />
+                                          <ref role="3cqZAo" node="4z0AnX817oG" resolve="a" />
                                         </node>
                                         <node concept="liA8E" id="6lwqIIdYrF6" role="2OqNvi">
                                           <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                                           <node concept="37vLTw" id="6lwqIIdYrR0" role="37wK5m">
-                                            <ref role="3cqZAo" node="4z0AnX817oG" />
+                                            <ref role="3cqZAo" node="4z0AnX817oG" resolve="a" />
                                           </node>
                                         </node>
                                       </node>
@@ -1127,7 +1127,7 @@
                     <node concept="3clFbF" id="6lwqIIdZ5Bo" role="3cqZAp">
                       <node concept="2OqwBi" id="6lwqIIdZ6XX" role="3clFbG">
                         <node concept="37vLTw" id="6lwqIIdZ5Bn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817oK" />
+                          <ref role="3cqZAo" node="4z0AnX817oK" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="6lwqIIdZ9mB" role="2OqNvi">
                           <ref role="2Oxat5" to="zn9m:~Pair.first" resolve="first" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
index f9b1e12f2d..29cc874787 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
@@ -26,6 +26,7 @@
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="0" />
   </languageVersions>
diff --git a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
index 3f0d9fa140..ed2b92709e 100644
--- a/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.iets3.core.assessment/models/test/iets3/core/tracequery/tracequery@tests.mps
@@ -273,7 +273,7 @@
                     <node concept="3clFbF" id="mhbzaHpB8$" role="3cqZAp">
                       <node concept="2OqwBi" id="mhbzaHpBkD" role="3clFbG">
                         <node concept="37vLTw" id="mhbzaHpB8z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4z0AnX817oM" />
+                          <ref role="3cqZAo" node="4z0AnX817oM" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="mhbzaHpBEa" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
index c2c13e3895..7648190cb7 100644
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/unitsonly@tests.mps
@@ -2518,7 +2518,7 @@
                         <node concept="2OqwBi" id="6q$NxWg9syf" role="3clFbG">
                           <node concept="2OqwBi" id="6q$NxWg9syg" role="2Oq$k0">
                             <node concept="37vLTw" id="6q$NxWg9syh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817oO" />
+                              <ref role="3cqZAo" node="4z0AnX817oO" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6q$NxWg9syi" role="2OqNvi">
                               <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
@@ -2564,7 +2564,7 @@
                         <node concept="2OqwBi" id="6q$NxWg9yyB" role="3clFbG">
                           <node concept="2OqwBi" id="6q$NxWg9yyC" role="2Oq$k0">
                             <node concept="37vLTw" id="6q$NxWg9yyD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4z0AnX817oQ" />
+                              <ref role="3cqZAo" node="4z0AnX817oQ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6q$NxWg9yyE" role="2OqNvi">
                               <ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />

From 91a23fb23db4c41e0394e2a30d5857e993bbd427 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 1 Feb 2024 09:58:42 +0100
Subject: [PATCH 19/19] Add missing ancestor node to CanBeAncestorContext

---
 .../models/intentions.mps                      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
index aed74d79bb..2892cf290a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/intentions.mps
@@ -1884,7 +1884,7 @@
                     <node concept="2ShNRf" id="1PoRi1pB9Yy" role="2Oq$k0">
                       <node concept="1pGfFk" id="1PoRi1pBbWD" role="2ShVmc">
                         <property role="373rjd" value="true" />
-                        <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="ContainmentContext.Builder" />
+                        <ref role="37wK5l" to="pdwk:~ContainmentContext$Builder.&lt;init&gt;()" resolve="Builder" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1PoRi1pBcfZ" role="2OqNvi">
@@ -1930,10 +1930,18 @@
               <node concept="2OqwBi" id="1PoRi1pBle6" role="2Oq$k0">
                 <node concept="2OqwBi" id="1PoRi1pBkFK" role="2Oq$k0">
                   <node concept="2OqwBi" id="1PoRi1pBjGB" role="2Oq$k0">
-                    <node concept="2ShNRf" id="1PoRi1pBj92" role="2Oq$k0">
-                      <node concept="1pGfFk" id="1PoRi1pBjx3" role="2ShVmc">
-                        <property role="373rjd" value="true" />
-                        <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
+                    <node concept="2OqwBi" id="2fVeByIvNwB" role="2Oq$k0">
+                      <node concept="2ShNRf" id="1PoRi1pBj92" role="2Oq$k0">
+                        <node concept="1pGfFk" id="1PoRi1pBjx3" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="Builder" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="2fVeByIvNMZ" role="2OqNvi">
+                        <ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.ancestorNode(org.jetbrains.mps.openapi.model.SNode)" resolve="ancestorNode" />
+                        <node concept="37vLTw" id="2fVeByIvPCd" role="37wK5m">
+                          <ref role="3cqZAo" node="4FREEt6vhH9" resolve="node" />
+                        </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="1PoRi1pBjTR" role="2OqNvi">