diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 947f0b59c..792e20a08 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ name: FASTEN_CI
 on: [push, pull_request]
 
 env:
-  MPS_VER: "2022.3"
+  MPS_VER: "2023.2"
   GITHUB_ACTOR: ${{ github.actor }}
   GITHUB_TOKEN: ${{ secrets.FASTEN_GITHUB_PKG_REGISTRY }}
 
@@ -104,8 +104,8 @@ jobs:
     - name: Archive distribution
       uses: actions/upload-artifact@v2
       with:
-        name: fasten-distribution-win-2022.3-${{ steps.time.outputs.time }}
-        path: build/distributions/fasten-2022.3-SNAPSHOT-Win-2022.3-SNAPSHOT.zip
+        name: fasten-distribution-win-2023.2-${{ steps.time.outputs.time }}
+        path: build/distributions/fasten-2023.2-SNAPSHOT-Win-2023.2-SNAPSHOT.zip
 
 
   build_fasten_assurance_package:
diff --git a/README.md b/README.md
index 1a8ec9cb9..ce5f94935 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ and build the languages.
    * copy the *gradle.properties.example* as *gradle.properties* and replace "<...>" with your paths, github-username and a token with rights to access github-packages
      - in *Windows* please note that the paths should use *slash* instead of *back-slash*, and they must NOT contain any *space* character (' ') - e.g.
        ```properties
-       mpsHomeDir=C:/work/MPS_2022.3.x
+       mpsHomeDir=C:/work/MPS_2023.2
        mbeddr.formal.home=C:/work/mbeddr.formal
        gpr.user=<a github user name>
        gpr.token=<token for package access>
@@ -31,7 +31,7 @@ and build the languages.
 
 ## Building (from MPS)
 
-1. [download](https://www.jetbrains.com/mps/download/previous.html) and install MPS 2022.3.x
+1. [download](https://www.jetbrains.com/mps/download/previous.html) and install MPS 2023.2
 2. run `gradlew.bat setup`. You can skip this step if you have built the project with Gradle already. 
 3. start MPS
 4. in 'Settings->Appearance & Behavior->Path Variables', set the path variable `mbeddr.formal.home`  to point to the directory which contains the cloned 'mbeddr.formal' repository.
diff --git a/build.gradle.kts b/build.gradle.kts
index 1e603d723..8ec2d0deb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,11 +11,11 @@ plugins {
     id("co.riiid.gradle") version "0.4.2"
 
     // Version must match buildscript mps-gradle-plugin dependency above
-    id("download-jbr") version "1.17.+"
-    id("de.itemis.mps.gradle.common") version "1.20.+"
+    id("download-jbr") version "1.22.+"
+    id("de.itemis.mps.gradle.common") version "1.22.+"
 }
 
-val jbrVers = "17.0.6-b653.34"
+val jbrVers = "17.0.8.1-b1000.32"
 
 downloadJbr {
     jbrVersion = jbrVers
@@ -35,9 +35,9 @@ if (nexusUsername == null) {
 logger.info("Repository username: {}", nexusUsername)
 
 // Project versions
-val major = "2022"
-val minor = "3"
-val bugfix = "1"
+val major = "2023"
+val minor = "2"
+val bugfix = ""
 
 fun appendOpt(str:String, pre:String) = if(!str.isEmpty()) "${pre}${str}" else ""
 
@@ -150,6 +150,8 @@ val defaultScriptArgs = mapOf(
         "jdk.util.zip.disableZip64ExtraFieldValidation" to true
 )
 
+fun scriptFile(relativePath: String):File = File("$rootDir/build/scripts/patched/$relativePath")
+
 tasks {
     val configureJava by registering {
         val downloadJbr = named("downloadJbr", DownloadJbrForPlatform::class)
@@ -180,24 +182,45 @@ tasks {
         description = "Set up MPS project libraries. Libraries are read in from projectlibraries.properties file."
     }
 
-    val build_allScripts by registering(BuildLanguages::class) {
+    val build_allScripts_unpatched by registering(BuildLanguages::class) {
         dependsOn(resolveMps, resolveLanguageLibs)
         script = "$buildDir/scripts/build_all_scripts.xml"
     }
 
+    // Patch JNA path in generated build scripts until https://github.com/JetBrains/MPS/pull/71 is fixed
+    val patch_allScripts by registering(Copy::class) {
+        dependsOn(build_allScripts_unpatched)
+        from("build/scripts")
+        exclude("patched")
+        exclude("build")
+        into("build/scripts/patched")
+
+        val isAarch64 = System.getProperty("os.arch") == "aarch64"
+        val jnaArch = if (isAarch64) "aarch64" else "amd64"
+
+        filter { line: String ->
+            line.replace("\"-Djna.boot.library.path=${'$'}{artifacts.mps}/lib/jna\"",
+                    "\"-Djna.boot.library.path=${'$'}{artifacts.mps}/lib/jna/" + jnaArch + "\"")
+        }
+    }
+
+    val build_allScripts by registering {
+        dependsOn(patch_allScripts, resolveLanguageLibs)
+    }
+
     val build_formal_languages by registering(BuildLanguages::class) {
         dependsOn(build_allScripts)
-        script = "$buildDir/scripts/build-formal-languages.xml"
+        script = scriptFile("build-formal-languages.xml")
     }
 
     val build_fasten_safety_distribution by registering(BuildLanguages::class) {
         dependsOn(build_formal_languages)
-        script = "$buildDir/scripts/build-fasten-safe-distribution.xml"
+        script = scriptFile("build-fasten-safe-distribution.xml")
     }
 
     val run_smv_tests by registering(TestLanguages::class) {
         description = "Will execute all tests from command line"
-        script = "$buildDir/scripts/build-nusmv-tests.xml"
+        script = scriptFile("build-nusmv-tests.xml")
         doLast {
             ant.withGroovyBuilder {
                 "taskdef"("name" to "junitreport",
@@ -214,7 +237,7 @@ tasks {
 
     val run_safety_tests by registering(TestLanguages::class) {
         description = "Will execute all tests from command line"
-        script = "$buildDir/scripts/build-safety-tests.xml"
+        script = scriptFile("build-safety-tests.xml")
         doLast {
             ant.withGroovyBuilder {
                 "taskdef"("name" to "junitreport",
@@ -232,7 +255,7 @@ tasks {
     val run_all_tests by registering(TestLanguages::class) {
         dependsOn(configureJava)
         description = "Will execute all tests from command line"
-        script = "$buildDir/scripts/build-all-tests.xml"
+        script = scriptFile("build-all-tests.xml")
         doLast {
             ant.withGroovyBuilder {
                 "taskdef"("name" to "junitreport",
@@ -260,7 +283,7 @@ tasks {
 
     val build_assurance_languages by registering(BuildLanguages::class) {
         dependsOn(build_allScripts)
-        script = "$buildDir/scripts/build-assurance-languages.xml"
+        script = scriptFile("build-assurance-languages.xml")
     }
 
     val package_assurance by registering(Zip::class) {
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 67fd808cf..bba3cd076 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -38,7 +38,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>
   
@@ -92,7 +92,6 @@
     <echoxml file="${build.tmp}/default/com.fasten.assurance.build.jar/META-INF/module.xml">
       <module namespace="com.fasten.assurance.build" type="solution" uuid="7301161d-854c-45d9-b0d7-121b4fb52625">
         <dependencies>
-          <module ref="b4bbc0a5-248e-4db2-9ddc-4901a463c66c(com.mbeddr.formal.safety.build)" kind="cl" />
           <module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
           <module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
           <module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
@@ -229,6 +228,7 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
+      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.constraints.rules.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
@@ -282,7 +282,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.com.fasten.assurance.build" depends="java.compile.com.mbeddr.formal.safety.build">
+  <target name="java.compile.com.fasten.assurance.build">
     <mkdir dir="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/source_gen" />
     <mkdir dir="${build.tmp}/java/out/com.fasten.assurance.build" />
     <javac destdir="${build.tmp}/java/out/com.fasten.assurance.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -291,7 +291,6 @@
         <path location="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/source_gen" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.formal.safety.build" />
         <fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
       </classpath>
diff --git a/code/languages/com.fasten.symo/.mps/migration.xml b/code/languages/com.fasten.symo/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.fasten.symo/.mps/migration.xml
+++ b/code/languages/com.fasten.symo/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
index bf1e13ce3..fe66ef0e3 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
index b516a4c4a..a1c9098fd 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
@@ -42,7 +42,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -94,7 +94,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,7 +105,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" />
@@ -134,11 +134,11 @@
         <child id="8637411062076630380" name="connectionTypes" index="1xLlFP" />
         <child id="1981294357059564524" name="paletteSources" index="1RuSHk" />
       </concept>
-      <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>
-      <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="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
@@ -187,7 +187,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.structure.mps b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.structure.mps
index 14df16a07..5a4ad050b 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.structure.mps
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.structure.mps
@@ -33,7 +33,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
index 0c31a7c13..80b9f3c7a 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.constraints.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.constraints.mps
index e8f235811..e7892abd1 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.constraints.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.constraints.mps
@@ -59,7 +59,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps
index 4e663cff2..93aafa9be 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.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" />
@@ -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">
@@ -117,7 +117,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -196,7 +196,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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="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">
@@ -257,7 +257,7 @@
         <child id="6554619383001456819" name="targetId" index="23hSWE" />
       </concept>
       <concept id="1110129820007229393" name="de.itemis.mps.editor.diagram.structure.CellModel_Diagram" flags="ng" index="27vDVx" />
-      <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>
@@ -265,7 +265,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="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
@@ -329,7 +329,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.intentions.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.intentions.mps
index e0bf60fb1..32d319772 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.intentions.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.intentions.mps
@@ -54,7 +54,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.structure.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.structure.mps
index 53f9fb9ef..5ac932f8a 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.structure.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.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/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
index 79396d8d8..19dbe4a91 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
@@ -52,7 +52,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -66,6 +66,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -125,7 +126,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -137,7 +138,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -256,7 +256,7 @@
                       <ref role="37wK5l" to="3o3z:~Multimap.put(java.lang.Object,java.lang.Object)" resolve="put" />
                       <node concept="2OqwBi" id="6eYU0xi7I8j" role="37wK5m">
                         <node concept="37vLTw" id="6eYU0xi7HUX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6eYU0xi7pgw" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36G5YKW" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6eYU0xi7In5" role="2OqNvi">
                           <ref role="3Tt5mk" to="4hyq:4PDUeYRxeq$" resolve="instance" />
@@ -264,7 +264,7 @@
                       </node>
                       <node concept="2OqwBi" id="6eYU0xi7IBZ" role="37wK5m">
                         <node concept="37vLTw" id="6eYU0xi7Iz$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6eYU0xi7pgw" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36G5YKW" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6eYU0xi7IKS" role="2OqNvi">
                           <ref role="3Tt5mk" to="4hyq:4PDUeYRxeqF" resolve="componentPort" />
@@ -274,9 +274,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6eYU0xi7pgw" role="1bW2Oz">
+              <node concept="gl6BB" id="2hED36G5YKW" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="6eYU0xi7pgx" role="1tU5fm" />
+                <node concept="2jxLKc" id="2hED36G5YKX" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -297,7 +297,7 @@
                       <node concept="2OqwBi" id="6eYU0xi7CjE" role="2Oq$k0">
                         <node concept="2OqwBi" id="6eYU0xi7CjF" role="2Oq$k0">
                           <node concept="37vLTw" id="6eYU0xi7CjG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6eYU0xi7CjK" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36G5YKY" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6eYU0xi7CjH" role="2OqNvi">
                             <ref role="3Tt5mk" to="4hyq:4PDUeYRx7XD" resolve="block" />
@@ -311,9 +311,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6eYU0xi7CjK" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36G5YKY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6eYU0xi7CjL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36G5YKZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -329,12 +329,12 @@
                     <node concept="liA8E" id="6eYU0xi7Juf" role="2OqNvi">
                       <ref role="37wK5l" to="3o3z:~Multimap.containsKey(java.lang.Object)" resolve="containsKey" />
                       <node concept="37vLTw" id="6eYU0xi7JCq" role="37wK5m">
-                        <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                       </node>
                     </node>
                   </node>
                   <node concept="37vLTw" id="6eYU0xi7$ie" role="1urrMF">
-                    <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                    <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                   </node>
                   <node concept="2YIFZM" id="6eYU0xi7$75" role="2MkJ7o">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
@@ -355,7 +355,7 @@
                         <node concept="2OqwBi" id="6eYU0xi7NWH" role="33vP2m">
                           <node concept="2OqwBi" id="6eYU0xi7NWI" role="2Oq$k0">
                             <node concept="37vLTw" id="6eYU0xi7NWJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                              <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                             </node>
                             <node concept="3TrEf2" id="6eYU0xi7NWK" role="2OqNvi">
                               <ref role="3Tt5mk" to="4hyq:4PDUeYRx7XD" resolve="block" />
@@ -383,7 +383,7 @@
                           <node concept="liA8E" id="6eYU0xi7Kz$" role="2OqNvi">
                             <ref role="37wK5l" to="3o3z:~Multimap.get(java.lang.Object)" resolve="get" />
                             <node concept="37vLTw" id="6eYU0xi7Kz_" role="37wK5m">
-                              <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                              <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                             </node>
                           </node>
                         </node>
@@ -405,12 +405,12 @@
                                   <node concept="liA8E" id="6eYU0xi836z" role="2OqNvi">
                                     <ref role="37wK5l" to="33ny:~Collection.contains(java.lang.Object)" resolve="contains" />
                                     <node concept="37vLTw" id="6eYU0xi83oy" role="37wK5m">
-                                      <ref role="3cqZAo" node="6eYU0xi805S" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36G5YL0" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="6eYU0xi8ej8" role="1urrMF">
-                                  <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                                  <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                                 </node>
                                 <node concept="3cpWs3" id="6eYU0xi8G6k" role="2MkJ7o">
                                   <node concept="Xl_RD" id="6eYU0xi8Gjc" role="3uHU7w">
@@ -424,7 +424,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="6eYU0xi8pl5" role="3uHU7w">
                                           <node concept="37vLTw" id="6eYU0xi8oW9" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6eYU0xi805S" resolve="it" />
+                                            <ref role="3cqZAo" node="2hED36G5YL0" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="6eYU0xi8pHU" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -437,7 +437,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="6eYU0xi8Fra" role="3uHU7w">
                                       <node concept="37vLTw" id="6eYU0xi8F3N" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                                       </node>
                                       <node concept="3TrcHB" id="6eYU0xi8FSt" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -447,9 +447,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6eYU0xi805S" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36G5YL0" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6eYU0xi805T" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36G5YL1" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -463,15 +463,15 @@
                     <node concept="liA8E" id="6eYU0xi7JPr" role="2OqNvi">
                       <ref role="37wK5l" to="3o3z:~Multimap.containsKey(java.lang.Object)" resolve="containsKey" />
                       <node concept="37vLTw" id="6eYU0xi7JPs" role="37wK5m">
-                        <ref role="3cqZAo" node="6eYU0xi7pFQ" resolve="compInstance" />
+                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="6eYU0xi7pFQ" role="1bW2Oz">
+              <node concept="gl6BB" id="2hED36G5YL2" role="1bW2Oz">
                 <property role="TrG5h" value="compInstance" />
-                <node concept="2jxLKc" id="6eYU0xi7pFR" role="1tU5fm" />
+                <node concept="2jxLKc" id="2hED36G5YL3" role="1tU5fm" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/com.fasten.symo.hw.sandbox.msd b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/com.fasten.symo.hw.sandbox.msd
index e8fa9ccca..ad9e7094c 100644
--- a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/com.fasten.symo.hw.sandbox.msd
+++ b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/com.fasten.symo.hw.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.symo.hw.sandbox" uuid="e25ecbb2-5cd5-4911-a32a-5959299b7a00" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.symo.hw.sandbox" uuid="e25ecbb2-5cd5-4911-a32a-5959299b7a00" moduleVersion="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:c2f3ae03-6a71-4e2a-88c9-c9e6eb4e20fa:com.fasten.symo.hw" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
index ba5c068d9..ed283add6 100644
--- a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
+++ b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -14,7 +14,7 @@
         <child id="2601369717537236697" name="elements" index="2jmwOw" />
         <child id="2601369717537276289" name="connections" index="2jnmDS" />
       </concept>
-      <concept id="2601369717537276292" name="com.fasten.symo.hw.structure.IPlatformArchitectureConnection" flags="ng" index="2jnmDX">
+      <concept id="2601369717537276292" name="com.fasten.symo.hw.structure.IPlatformArchitectureConnection" flags="ngI" index="2jnmDX">
         <reference id="2601369717537277059" name="source" index="2jnmXU" />
         <reference id="2601369717537277061" name="target" index="2jnmXW" />
       </concept>
@@ -24,7 +24,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/com.symo.sysml.ibd.sandbox.msd b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/com.symo.sysml.ibd.sandbox.msd
index 2788605da..1b8bf5470 100644
--- a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/com.symo.sysml.ibd.sandbox.msd
+++ b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/com.symo.sysml.ibd.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.symo.sysml.ibd.sandbox" uuid="c367dc96-8497-4243-b227-f85d1f756db1" moduleVersion="0" compileInMPS="true">
+<solution name="com.symo.sysml.ibd.sandbox" uuid="c367dc96-8497-4243-b227-f85d1f756db1" moduleVersion="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:d7ce0776-e180-44b6-8b3f-a274ad438311:com.symo.sysml.ibd" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
index b4994c205..458b4e9fa 100644
--- a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
+++ b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml b/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
index 2b014dabe..8cebed285 100644
--- a/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
@@ -4,7 +4,9 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="project.baseline.version" value="213" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
index 5a886589b..271f2246e 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.cbmc.rt" uuid="a4ccc729-3047-4071-a701-68af3ae908a8" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.cbmc.rt" uuid="a4ccc729-3047-4071-a701-68af3ae908a8" moduleVersion="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">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.mps b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.mps
index 28d40c6c1..6b564556a 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.mps
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.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" />
   </languages>
   <imports>
     <import index="2avh" ref="r:d71bd9ec-2dae-496f-9887-8fb9facf61b7(com.mbeddr.formal.base.tooling.tools)" />
@@ -29,7 +29,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -83,7 +83,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">
@@ -133,7 +133,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -155,7 +155,7 @@
         <child id="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">
@@ -174,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>
diff --git a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps
index 07b1c4362..13690080f 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps
@@ -2,7 +2,7 @@
 <model ref="r:8b80372b-1323-4e0d-a71e-6dec5192cdad(com.mbeddr.formal.cbmc.rt.testing)">
   <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -33,7 +33,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">
@@ -59,7 +59,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -70,13 +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="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/models/test.com.mbeddr.formal.cbmc._010_cbmc_smoke@tests.mps b/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/models/test.com.mbeddr.formal.cbmc._010_cbmc_smoke@tests.mps
index d0368bf22..a504cda65 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/models/test.com.mbeddr.formal.cbmc._010_cbmc_smoke@tests.mps
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/models/test.com.mbeddr.formal.cbmc._010_cbmc_smoke@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
@@ -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">
@@ -101,7 +101,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -116,7 +116,7 @@
         <child id="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" />
@@ -142,7 +142,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>
@@ -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/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd b/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd
index a22745688..b86f23783 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.cbmc" uuid="7b6ad548-ec7c-4cf6-b9a4-763e6a01e601" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.cbmc" uuid="7b6ad548-ec7c-4cf6-b9a4-763e6a01e601" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
index 1710be715..a2e96ad57 100644
--- a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
@@ -10,6 +10,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl
index 88ce2e9b1..3b8aea8c8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.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" />
@@ -79,7 +79,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="true">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
@@ -91,7 +90,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/generator/templates/main@generator.mps
index b19098369..ded54839a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
index 99c123092..b391a00ef 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
@@ -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" />
@@ -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="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
@@ -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>
@@ -177,7 +177,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" />
@@ -210,7 +210,7 @@
       <concept id="3155126767689025629" name="de.itemis.mps.editor.diagram.structure.Content_Childs" flags="ng" index="aDKH9">
         <reference id="3155126767689025691" name="linkDeclaration" index="aDKIf" />
       </concept>
-      <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="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
         <child id="8587703283523592242" name="endpointTo" index="1PN8qh" />
@@ -231,7 +231,7 @@
       <concept id="500099795019625460" name="de.itemis.mps.editor.diagram.structure.CellModel_Shape" flags="ng" index="G$OnD">
         <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="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
@@ -292,7 +292,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.structure.mps
index 543f33368..0b7e56907 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.structure.mps
@@ -60,7 +60,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/com.fasten.base.arch.msc.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/com.fasten.base.arch.msc.mpl
index 171a076eb..020c5a861 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/com.fasten.base.arch.msc.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/com.fasten.base.arch.msc.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" />
@@ -56,7 +56,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)</dependency>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
@@ -69,7 +68,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/generator/templates/main@generator.mps
index 8059e63df..1c805755d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.behavior.mps
index 4076bbce2..56980b0af 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.behavior.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>
@@ -73,12 +73,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -98,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>
@@ -109,7 +110,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
@@ -156,7 +156,7 @@
                         <node concept="2OqwBi" id="3QO5pQQMBxf" role="3uHU7w">
                           <node concept="2OqwBi" id="3QO5pQQMBxg" role="2Oq$k0">
                             <node concept="37vLTw" id="3QO5pQQMBxh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3QO5pQQMBxr" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dqs" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3QO5pQQMBxi" role="2OqNvi">
                               <ref role="3Tt5mk" to="kn8g:3QO5pQQLpt9" resolve="messageValue" />
@@ -170,7 +170,7 @@
                           <node concept="2OqwBi" id="3QO5pQQMBxl" role="3uHU7B">
                             <node concept="2OqwBi" id="3QO5pQQMBxm" role="2Oq$k0">
                               <node concept="37vLTw" id="3QO5pQQMBxn" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3QO5pQQMBxr" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dqs" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3QO5pQQMBxo" role="2OqNvi">
                                 <ref role="3Tt5mk" to="kn8g:3QO5pQQLprz" resolve="port" />
@@ -187,9 +187,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3QO5pQQMBxr" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dqs" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3QO5pQQMBxs" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dqt" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.constraints.mps
index c5fd1e890..85b9494bb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.constraints.mps
@@ -70,7 +70,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -169,7 +169,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.editor.mps
index 0e684f0ef..9dc2188db 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.editor.mps
@@ -50,7 +50,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -73,7 +73,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.structure.mps
index 732278905..b43241287 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.structure.mps
@@ -36,7 +36,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.typesystem.mps
index 076e39217..87e5c0823 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/models/com.fasten.base.arch.msc.typesystem.mps
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
index a1e8e2ee9..a5a1bcc7c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -44,7 +43,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
index 046bdd108..1f37d5825 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
@@ -68,20 +68,20 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.editor.mps
index e9304f0a8..385d7f946 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.editor.mps
@@ -29,7 +29,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -57,7 +57,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.plugin.mps
index 25e352a84..09d560775 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -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="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -104,7 +104,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,7 +120,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -133,7 +133,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>
@@ -151,7 +151,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.structure.mps
index 9fe1f7c0a..51bae6bb5 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.util.mps
index 540e87cb5..034d3c26d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.util.mps
@@ -83,7 +83,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -99,7 +99,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/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
index 36e42f5eb..0163126d8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,7 +54,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -67,7 +66,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/generator/templates/main@generator.mps
index 3944f8a8a..1abade2d5 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.constraints.mps
index d1bc8b345..3bf2968c0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.constraints.mps
@@ -35,7 +35,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
index 01e1e9659..3d3fe7d6c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
@@ -61,12 +61,12 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <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="1233823429331" name="jetbrains.mps.lang.editor.structure.HorizontalGapStyleClassItem" flags="ln" index="15ARfc" />
@@ -102,7 +102,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 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -152,7 +152,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_" />
@@ -250,7 +250,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>
@@ -267,7 +267,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">
@@ -296,6 +296,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" />
@@ -374,7 +375,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">
@@ -405,7 +406,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="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
@@ -1499,14 +1499,14 @@
                   <node concept="3clFbF" id="g4WxncIS6z" role="3cqZAp">
                     <node concept="3K4zz7" id="g4WxncIUGp" role="3clFbG">
                       <node concept="37vLTw" id="g4WxncIV55" role="3K4E3e">
-                        <ref role="3cqZAo" node="g4WxncIQ$7" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dqv" resolve="it" />
                       </node>
                       <node concept="37vLTw" id="g4WxncIVto" role="3K4GZi">
                         <ref role="3cqZAo" node="g4WxncIQ$5" resolve="s" />
                       </node>
                       <node concept="3eOVzh" id="g4WxncITtN" role="3K4Cdx">
                         <node concept="37vLTw" id="g4WxncITPI" role="3uHU7w">
-                          <ref role="3cqZAo" node="g4WxncIQ$7" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dqv" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="g4WxncIS6y" role="3uHU7B">
                           <ref role="3cqZAo" node="g4WxncIQ$5" resolve="s" />
@@ -1519,9 +1519,9 @@
                   <property role="TrG5h" value="s" />
                   <node concept="10Oyi0" id="g4WxncIRzW" role="1tU5fm" />
                 </node>
-                <node concept="Rh6nW" id="g4WxncIQ$7" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dqv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="g4WxncIQ$8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dqw" role="1tU5fm" />
                 </node>
               </node>
               <node concept="3cmrfG" id="g4WxncIQWZ" role="1MDeny">
@@ -5051,7 +5051,7 @@
                         <node concept="3clFbF" id="3KyNayB$Xjg" role="3cqZAp">
                           <node concept="2OqwBi" id="3KyNayB$Y6Q" role="3clFbG">
                             <node concept="37vLTw" id="3KyNayB$Xjf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3KyNayB$WSB" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dqx" resolve="it" />
                             </node>
                             <node concept="liA8E" id="3KyNayB$YWy" role="2OqNvi">
                               <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
@@ -5062,9 +5062,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3KyNayB$WSB" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dqx" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3KyNayB$WSC" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dqy" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.structure.mps
index 4b0b4860f..4e3b76ae2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.structure.mps
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/com.mbeddr.formal.base.analyses.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/com.mbeddr.formal.base.analyses.mpl
index 0bbe0d5c3..3d06d5ad4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/com.mbeddr.formal.base.analyses.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/com.mbeddr.formal.base.analyses.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</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" />
@@ -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:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/editor.mps
index 2d1881197..88c6a81a0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/editor.mps
@@ -29,7 +29,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>
@@ -41,7 +41,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
@@ -79,7 +79,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/plugin.mps
index 081a8c08d..1ebddb338 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/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="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/structure.mps
index 9fa45bc63..cec908d10 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/models/structure.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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
index a92258a11..7ed18c8c0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</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: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" />
@@ -52,7 +51,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/behavior.mps
index ebf7d2f5c..d6c8599c8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/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" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -86,14 +86,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -154,7 +154,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.actions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.actions.mps
index e117a1e1b..8df7fee80 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.actions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.actions.mps
@@ -69,7 +69,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.migration.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.migration.mps
index 3cbe53623..b5cb99880 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.migration.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/com.mbeddr.formal.base.arch.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>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/constraints.mps
index d35c10b99..3672fe349 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/constraints.mps
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -133,7 +133,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
index 072a3f017..c1054a08f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.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="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -85,7 +85,7 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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>
@@ -98,7 +98,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -121,7 +121,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -149,7 +149,7 @@
       <concept id="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_" />
@@ -252,7 +252,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -273,7 +273,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" />
@@ -287,6 +287,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -356,7 +357,7 @@
       </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="5725606875425248008" name="delete" index="1ide8m" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -366,7 +367,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">
@@ -469,7 +470,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -500,7 +501,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <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="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" />
@@ -2485,7 +2485,7 @@
                                   <node concept="2OqwBi" id="43FRfGJOAXp" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJOAXq" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJOAXr" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJOAXv" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Dq$" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJOAXs" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2500,9 +2500,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJOAXv" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Dq$" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJOAXw" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Dq_" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2816,7 +2816,7 @@
                                   <node concept="2OqwBi" id="43FRfGJPDVP" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJPDVQ" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJPDVR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJPDVV" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DqA" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJPDVS" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2831,9 +2831,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJPDVV" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DqA" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJPDVW" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DqB" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3349,7 +3349,7 @@
                                   <node concept="2OqwBi" id="43FRfGJSlSz" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJSl9$" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJSkUl" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJSkGJ" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DqC" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJSlwO" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3364,9 +3364,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJSkGJ" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DqC" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJSkGK" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DqD" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3432,7 +3432,7 @@
                                   <node concept="2OqwBi" id="43FRfGJS37m" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJS37n" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJS37o" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJS37s" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DqE" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJS37p" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3447,9 +3447,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJS37s" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DqE" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJS37t" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DqF" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3638,7 +3638,7 @@
                           <node concept="2OqwBi" id="70QLBAKqB5n" role="3fr31v">
                             <node concept="2OqwBi" id="70QLBAKqB5o" role="2Oq$k0">
                               <node concept="37vLTw" id="70QLBAKqB5p" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70QLBAKqyKS" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DqG" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70QLBAKqB5q" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3whv:7RhjhI7$lh0" resolve="target" />
@@ -3655,7 +3655,7 @@
                           <node concept="2OqwBi" id="70QLBAKq$EM" role="3fr31v">
                             <node concept="2OqwBi" id="70QLBAKq$EN" role="2Oq$k0">
                               <node concept="37vLTw" id="70QLBAKq$EO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70QLBAKqyKS" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DqG" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70QLBAKq$EP" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3whv:7RhjhI7$lgX" resolve="source" />
@@ -3671,9 +3671,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70QLBAKqyKS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70QLBAKqyKT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DqH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3727,7 +3727,7 @@
                           <node concept="2OqwBi" id="70QLBAKqBmj" role="3fr31v">
                             <node concept="2OqwBi" id="70QLBAKqBmk" role="2Oq$k0">
                               <node concept="37vLTw" id="70QLBAKqBml" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70QLBAKqBmw" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DqI" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70QLBAKqBmm" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3whv:7RhjhI7$lh0" resolve="target" />
@@ -3743,7 +3743,7 @@
                         <node concept="2OqwBi" id="70QLBAKqBmq" role="3uHU7B">
                           <node concept="2OqwBi" id="70QLBAKqBmr" role="2Oq$k0">
                             <node concept="37vLTw" id="70QLBAKqBms" role="2Oq$k0">
-                              <ref role="3cqZAo" node="70QLBAKqBmw" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DqI" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="70QLBAKqBmt" role="2OqNvi">
                               <ref role="3Tt5mk" to="3whv:7RhjhI7$lgX" resolve="source" />
@@ -3758,9 +3758,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70QLBAKqBmw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70QLBAKqBmx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DqJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3813,7 +3813,7 @@
                         <node concept="2OqwBi" id="70QLBAKqCdC" role="3uHU7w">
                           <node concept="2OqwBi" id="70QLBAKqCdD" role="2Oq$k0">
                             <node concept="37vLTw" id="70QLBAKqCdE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="70QLBAKqCdO" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DqK" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="70QLBAKqCdF" role="2OqNvi">
                               <ref role="3Tt5mk" to="3whv:7RhjhI7$lh0" resolve="target" />
@@ -3829,7 +3829,7 @@
                           <node concept="2OqwBi" id="70QLBAKqEa7" role="3fr31v">
                             <node concept="2OqwBi" id="70QLBAKqEa8" role="2Oq$k0">
                               <node concept="37vLTw" id="70QLBAKqEa9" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70QLBAKqCdO" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DqK" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70QLBAKqEaa" role="2OqNvi">
                                 <ref role="3Tt5mk" to="3whv:7RhjhI7$lgX" resolve="source" />
@@ -3845,9 +3845,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70QLBAKqCdO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70QLBAKqCdP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DqL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3900,7 +3900,7 @@
                         <node concept="2OqwBi" id="70QLBAKqEjb" role="3uHU7w">
                           <node concept="2OqwBi" id="70QLBAKqEjc" role="2Oq$k0">
                             <node concept="37vLTw" id="70QLBAKqEjd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="70QLBAKqEjo" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DqM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="70QLBAKqEje" role="2OqNvi">
                               <ref role="3Tt5mk" to="3whv:7RhjhI7$lh0" resolve="target" />
@@ -3915,7 +3915,7 @@
                         <node concept="2OqwBi" id="70QLBAKqEji" role="3uHU7B">
                           <node concept="2OqwBi" id="70QLBAKqEjj" role="2Oq$k0">
                             <node concept="37vLTw" id="70QLBAKqEjk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="70QLBAKqEjo" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DqM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="70QLBAKqEjl" role="2OqNvi">
                               <ref role="3Tt5mk" to="3whv:7RhjhI7$lgX" resolve="source" />
@@ -3930,9 +3930,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="70QLBAKqEjo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="70QLBAKqEjp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DqN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/structure.mps
index 24500a8b6..81ab7c93a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/structure.mps
@@ -45,7 +45,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/typesystem.mps
index 3bfd13ff1..856f24ca0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/typesystem.mps
@@ -71,7 +71,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
index af080cc6b..e3c96376b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/behavior.mps
index d820abffa..a65b5fed7 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/behavior.mps
@@ -122,7 +122,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -134,7 +134,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -178,7 +178,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/constraints.mps
index 7bfb63f24..e1401ae56 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/constraints.mps
@@ -63,7 +63,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -108,7 +108,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +146,7 @@
         <property id="1174558315290" name="start" index="1T8p8b" />
         <property id="1174558317822" name="end" index="1T8pRJ" />
       </concept>
-      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
         <child id="1174653387388" name="regexp" index="1YN4dH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
index f0d7f1abe..7cf7352eb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
@@ -55,7 +55,7 @@
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
       <concept id="1186414949600" name="jetbrains.mps.lang.editor.structure.AutoDeletableStyleClassItem" flags="ln" index="VPRnO" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -63,7 +63,7 @@
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="280151408461567367" name="jetbrains.mps.lang.editor.structure.AppendTextOperation" flags="nn" index="33jxAZ" />
       <concept id="280151408461909164" name="jetbrains.mps.lang.editor.structure.SetBoldOperation" flags="nn" index="33ks2k" />
-      <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">
@@ -87,7 +87,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" />
@@ -150,7 +150,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>
@@ -162,6 +162,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -234,7 +235,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -250,7 +251,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>
@@ -731,7 +731,7 @@
                       <node concept="2OqwBi" id="5bMrXoEBCKe" role="3clFbG">
                         <node concept="2OqwBi" id="5bMrXoEBCKf" role="2Oq$k0">
                           <node concept="37vLTw" id="5bMrXoEBCKg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5bMrXoEBCKk" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DqO" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="5bMrXoEBCKh" role="2OqNvi" />
                         </node>
@@ -743,9 +743,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5bMrXoEBCKk" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5bMrXoEBCKl" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DqP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps
index 0ad97465c..628a40ec8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps
@@ -67,7 +67,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/typesystem.mps
index cb3481416..7a0ad1a68 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/typesystem.mps
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
index 0f705891d..037dd870a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/behavior.mps
index a2f69620f..a5e1b21a7 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/behavior.mps
@@ -98,7 +98,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>
@@ -117,7 +117,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1225892208569" name="jetbrains.mps.baseLanguage.structure.ShiftLeftExpression" flags="nn" index="1GRDU$" />
@@ -163,7 +163,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
index 91c6dcb39..81c93907e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
@@ -78,7 +78,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" />
@@ -111,7 +111,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -221,7 +221,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>
@@ -244,7 +244,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">
@@ -306,7 +306,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/intentions.mps
index ebc995262..fe70d4644 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/intentions.mps
@@ -46,7 +46,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -103,7 +103,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/structure.mps
index 6a0033d28..e51754632 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/structure.mps
@@ -50,7 +50,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/com.mbeddr.formal.base.tabular.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/com.mbeddr.formal.base.tabular.mpl
index 9b1dd3309..b3afeeb16 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/com.mbeddr.formal.base.tabular.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/com.mbeddr.formal.base.tabular.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">b3b9fe18-f0c4-4cea-83c5-45faa74e0911(com.mbeddr.formal.base.tabular)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.behavior.mps
index 0206a68dd..1b84524b3 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.behavior.mps
@@ -101,7 +101,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="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>
@@ -110,7 +110,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">
@@ -175,7 +175,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
index 6966198d3..4db3e0788 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
@@ -51,7 +51,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>
@@ -76,13 +76,13 @@
       </concept>
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn" />
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="7985135009827365938" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Placeholder" flags="ng" index="1IAO7e" />
       <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_">
@@ -197,7 +197,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -217,7 +217,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">
@@ -235,6 +235,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 @@
         <reference id="1397920687864997201" name="linkDeclaration" index="2reCK$" />
         <child id="8843513109887109873" name="factory" index="3NVFaw" />
       </concept>
-      <concept id="1397920687864865353" name="de.slisson.mps.tables.structure.ITableNode" flags="ng" index="2rf8GW">
+      <concept id="1397920687864865353" name="de.slisson.mps.tables.structure.ITableNode" flags="ngI" index="2rf8GW">
         <child id="8843513109888016181" name="condition" index="3NQet$" />
       </concept>
       <concept id="1397920687864683158" name="de.slisson.mps.tables.structure.Table" flags="ng" index="2rfBfz">
@@ -359,7 +360,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -378,7 +379,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -1374,7 +1374,7 @@
                     <node concept="2OqwBi" id="l_5LCC_xBP" role="3clFbG">
                       <node concept="2OqwBi" id="l_5LCC_xBQ" role="2Oq$k0">
                         <node concept="37vLTw" id="l_5LCC_xBR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="l_5LCC_xBU" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1DqS" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="l_5LCC_xBS" role="2OqNvi">
                           <ref role="3TtcxE" to="vlrt:l_5LCCuMp3" resolve="conditionValues" />
@@ -1384,9 +1384,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="l_5LCC_xBU" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DqS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="l_5LCC_xBV" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DqT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2446,7 +2446,7 @@
                     <node concept="2OqwBi" id="5$Mxnm$sH$m" role="3clFbG">
                       <node concept="2OqwBi" id="5$Mxnm$sH$n" role="2Oq$k0">
                         <node concept="37vLTw" id="5$Mxnm$sH$o" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5$Mxnm$sH$r" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1DqU" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="5$Mxnm$sVv5" role="2OqNvi">
                           <ref role="3TtcxE" to="vlrt:5$Mxnm$qGSS" resolve="output" />
@@ -2456,9 +2456,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5$Mxnm$sH$r" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DqU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5$Mxnm$sH$s" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DqV" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.structure.mps
index 225c889c1..4590a9058 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
@@ -73,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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
index e94ec7b10..140cdf8ce 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</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" />
@@ -107,7 +106,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/behavior.mps
index fb24a9e4e..c8ff9aa93 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/behavior.mps
@@ -95,7 +95,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="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="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">
@@ -115,6 +115,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -201,7 +202,7 @@
         <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>
@@ -217,7 +218,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="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" />
@@ -500,14 +500,14 @@
                           <node concept="BsUDl" id="3cGyC6fDpE4" role="3clFbG">
                             <ref role="37wK5l" node="3cGyC6fDhR_" resolve="isMyAttribute" />
                             <node concept="37vLTw" id="3cGyC6fDpJe" role="37wK5m">
-                              <ref role="3cqZAo" node="3cGyC6fCPdq" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DqX" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3cGyC6fCPdq" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DqX" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3cGyC6fCPdr" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DqY" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -609,13 +609,13 @@
                   <node concept="3clFbS" id="3cGyC6fHh6F" role="1bW5cS">
                     <node concept="3clFbF" id="3cGyC6fHh6G" role="3cqZAp">
                       <node concept="37vLTw" id="3cGyC6fHh6H" role="3clFbG">
-                        <ref role="3cqZAo" node="3cGyC6fHh6I" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1DqZ" resolve="it" />
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3cGyC6fHh6I" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DqZ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3cGyC6fHh6J" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dr0" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -666,15 +666,15 @@
                         <node concept="3clFbF" id="3cGyC6fDnsT" role="3cqZAp">
                           <node concept="2OqwBi" id="3cGyC6fDnDX" role="3clFbG">
                             <node concept="37vLTw" id="3cGyC6fDnsS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3cGyC6fDkVL" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dr1" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="3cGyC6fDnWQ" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3cGyC6fDkVL" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dr1" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3cGyC6fDkVM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dr2" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -686,14 +686,14 @@
                         <node concept="BsUDl" id="3cGyC6fDmJC" role="3clFbG">
                           <ref role="37wK5l" node="3cGyC6fDhR_" resolve="isMyAttribute" />
                           <node concept="37vLTw" id="3cGyC6fDo6A" role="37wK5m">
-                            <ref role="3cqZAo" node="3cGyC6fDmDz" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dr3" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3cGyC6fDmDz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dr3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3cGyC6fDmD$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dr4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -744,16 +744,16 @@
                         <ref role="37wK5l" node="3cGyC6fDhR_" resolve="isMyAttribute" />
                         <node concept="2OqwBi" id="3cGyC6fDvaD" role="37wK5m">
                           <node concept="37vLTw" id="3cGyC6fDuUt" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3cGyC6fDuFS" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dr5" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="3cGyC6fDvzj" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3cGyC6fDuFS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dr5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3cGyC6fDuFT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dr6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.diagram_utils.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.diagram_utils.mps
index 7ad338c9a..3297754ac 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.diagram_utils.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.diagram_utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -129,7 +129,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>
@@ -145,7 +145,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">
@@ -157,6 +157,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -260,7 +261,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -288,7 +289,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -366,7 +366,7 @@
                       <node concept="2OqwBi" id="5pJnDA9d7mT" role="3clFbG">
                         <node concept="2OqwBi" id="5pJnDA9d7mU" role="2Oq$k0">
                           <node concept="37vLTw" id="5pJnDA9d7mV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5pJnDA9d7n4" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dr7" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5pJnDA9d7mW" role="2OqNvi">
                             <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -393,9 +393,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5pJnDA9d7n4" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dr7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5pJnDA9d7n5" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dr8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -507,7 +507,7 @@
                       <node concept="2OqwBi" id="5pJnDA9hrMF" role="3clFbG">
                         <node concept="2OqwBi" id="5pJnDA9hrMG" role="2Oq$k0">
                           <node concept="37vLTw" id="5pJnDA9hrMH" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5pJnDA9hrMQ" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dr9" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5pJnDA9hrMI" role="2OqNvi">
                             <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -522,9 +522,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5pJnDA9hrMQ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dr9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5pJnDA9hrMR" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dra" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -765,7 +765,7 @@
                       <node concept="2OqwBi" id="2hB9zGIx7lf" role="3clFbG">
                         <node concept="2OqwBi" id="2hB9zGIx7lg" role="2Oq$k0">
                           <node concept="37vLTw" id="2hB9zGIx7lh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hB9zGIx7ll" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Drb" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2hB9zGIx7li" role="2OqNvi">
                             <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -780,9 +780,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2hB9zGIx7ll" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Drb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2hB9zGIx7lm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Drc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1253,7 +1253,7 @@
                       <node concept="2OqwBi" id="6csJveEAMff" role="3clFbG">
                         <node concept="2OqwBi" id="6csJveEAMfg" role="2Oq$k0">
                           <node concept="37vLTw" id="6csJveEAMfh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6csJveEAMfl" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Drd" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6csJveEAMfi" role="2OqNvi">
                             <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -1268,9 +1268,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6csJveEAMfl" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Drd" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6csJveEAMfm" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dre" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1953,7 +1953,7 @@
                                           <property role="3cmrfH" value="0" />
                                         </node>
                                         <node concept="37vLTw" id="64FnLWQCJFA" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="64FnLWQCJFE" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36D1Drf" resolve="it" />
                                         </node>
                                       </node>
                                       <node concept="1LFfDK" id="64FnLWQCJFB" role="1Lso8e">
@@ -1961,15 +1961,15 @@
                                           <property role="3cmrfH" value="1" />
                                         </node>
                                         <node concept="37vLTw" id="64FnLWQCJFD" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="64FnLWQCJFE" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36D1Drf" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="64FnLWQCJFE" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1Drf" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="64FnLWQCJFF" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1Drg" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.enumMigration.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.enumMigration.mps
index 43d5bd7ed..dfaffeb79 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.enumMigration.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.enumMigration.mps
@@ -43,7 +43,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.prefixed_names_utils.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.prefixed_names_utils.mps
index 639dbe405..2ea6de53a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.prefixed_names_utils.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.prefixed_names_utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -73,7 +73,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,12 +86,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -116,7 +117,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="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="312cEu" id="33rrvp3Cvkb">
@@ -282,14 +282,14 @@
                             <ref role="3cqZAo" node="33rrvp3CyH4" resolve="containerOfNodesWithPrefixedNames" />
                           </node>
                           <node concept="37vLTw" id="33rrvp3CF1L" role="37wK5m">
-                            <ref role="3cqZAo" node="33rrvp3CEEM" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Drv" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="33rrvp3CEEM" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Drv" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="33rrvp3CEEN" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Drw" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.styles.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.styles.mps
index ef21b7399..b8a92e8f5 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.styles.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/com.mbeddr.formal.base.styles.mps
@@ -66,7 +66,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">
@@ -113,7 +113,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>
@@ -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="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -153,7 +153,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/constraints.mps
index d4ad25d18..55a8db02a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/constraints.mps
@@ -44,7 +44,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,7 +78,7 @@
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
index 305e50af8..51978a187 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
@@ -138,7 +138,7 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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>
@@ -173,7 +173,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -184,7 +184,7 @@
         <child id="1165420413720" name="parametersFunction" index="1ou48n" />
       </concept>
       <concept id="1165420626554" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Group_Handler" flags="in" index="1ouSdP" />
-      <concept id="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ng" index="1rj3mw">
+      <concept id="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ngI" index="1rj3mw">
         <property id="7228435049763093186" name="family" index="1rj3mz" />
       </concept>
       <concept id="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
@@ -210,7 +210,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">
@@ -227,7 +227,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -269,7 +269,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">
@@ -324,7 +324,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" />
@@ -381,7 +381,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>
@@ -403,7 +403,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">
@@ -439,6 +439,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -517,7 +518,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -527,7 +528,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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -2261,7 +2261,7 @@
                                   <node concept="3clFbF" id="3fsZMFLMVmp" role="3cqZAp">
                                     <node concept="2OqwBi" id="3fsZMFLMVmq" role="3clFbG">
                                       <node concept="37vLTw" id="3fsZMFLMVmr" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3fsZMFLMVmu" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Drh" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="3fsZMFLMVms" role="2OqNvi">
                                         <ref role="37wK5l" to="mc3u:3fsZMFLMFZc" resolve="canSimulateNode" />
@@ -2272,9 +2272,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3fsZMFLMVmu" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1Drh" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3fsZMFLMVmv" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1Dri" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2413,7 +2413,7 @@
                                   <node concept="3clFbF" id="3fsZMFLN0nc" role="3cqZAp">
                                     <node concept="2OqwBi" id="3fsZMFLN0nd" role="3clFbG">
                                       <node concept="37vLTw" id="3fsZMFLN0ne" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3fsZMFLN0nh" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Drj" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="3fsZMFLN0nf" role="2OqNvi">
                                         <ref role="37wK5l" to="mc3u:3fsZMFLMFZc" resolve="canSimulateNode" />
@@ -2424,9 +2424,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3fsZMFLN0nh" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1Drj" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3fsZMFLN0ni" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1Drk" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2565,7 +2565,7 @@
                                   <node concept="3clFbF" id="3fsZMFLN1dl" role="3cqZAp">
                                     <node concept="2OqwBi" id="3fsZMFLN1dm" role="3clFbG">
                                       <node concept="37vLTw" id="3fsZMFLN1dn" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3fsZMFLN1dq" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Drl" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="3fsZMFLN1do" role="2OqNvi">
                                         <ref role="37wK5l" to="mc3u:3fsZMFLMFZc" resolve="canSimulateNode" />
@@ -2576,9 +2576,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="3fsZMFLN1dq" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1Drl" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3fsZMFLN1dr" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1Drm" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -2945,7 +2945,7 @@
                     <node concept="3clFbF" id="6adXBxxSmmF" role="3cqZAp">
                       <node concept="2OqwBi" id="6adXBxxSmmG" role="3clFbG">
                         <node concept="37vLTw" id="6adXBxxSmmH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6adXBxxSmmK" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Drn" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6adXBxxSmmI" role="2OqNvi">
                           <ref role="37wK5l" to="mc3u:3fsZMFLMFZc" resolve="canSimulateNode" />
@@ -2956,9 +2956,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6adXBxxSmmK" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Drn" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6adXBxxSmmL" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dro" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4124,7 +4124,7 @@
                       <node concept="3clFbF" id="3cGyC6fDDQa" role="3cqZAp">
                         <node concept="2OqwBi" id="3cGyC6fDDQb" role="3clFbG">
                           <node concept="37vLTw" id="3cGyC6fDDQc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3cGyC6fDDQf" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Drp" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="3cGyC6fDDQd" role="2OqNvi">
                             <ref role="37wK5l" to="w873:3cGyC6fAcgg" resolve="getAnnotation" />
@@ -4133,9 +4133,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3cGyC6fDDQf" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Drp" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3cGyC6fDDQg" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Drq" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -4171,7 +4171,7 @@
                     <node concept="3clFbF" id="3cGyC6fAbhQ" role="3cqZAp">
                       <node concept="2OqwBi" id="3cGyC6fAbxV" role="3clFbG">
                         <node concept="37vLTw" id="3cGyC6fAbhP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3cGyC6fAbdT" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Drr" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="3cGyC6fAbWW" role="2OqNvi">
                           <ref role="37wK5l" to="w873:3cGyC6fAbE$" resolve="nodeHasAnnotationProvider" />
@@ -4180,9 +4180,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3cGyC6fAbdT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Drr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3cGyC6fAbdU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Drs" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/intentions.mps
index 6992fc9ec..fd641bf2f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/intentions.mps
@@ -36,6 +36,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" />
@@ -66,7 +67,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>
@@ -75,7 +76,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -113,15 +113,15 @@
                   <node concept="3clFbF" id="4Jpgh6IFXDd" role="3cqZAp">
                     <node concept="2OqwBi" id="4Jpgh6IFXOa" role="3clFbG">
                       <node concept="37vLTw" id="4Jpgh6IFXDc" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4Jpgh6IFXzx" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Drt" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="4Jpgh6IFZQQ" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4Jpgh6IFXzx" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Drt" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4Jpgh6IFXzy" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dru" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/plugin.mps
index 5fa40c9b9..856e1a6e9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/plugin.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/structure.mps
index c49c16e7a..4b8a362f3 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/structure.mps
@@ -81,7 +81,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
index 01f365a54..f62202807 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
   <imports>
@@ -38,7 +38,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -110,7 +110,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -129,7 +129,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">
@@ -211,7 +211,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
index 4b3dec0e0..f3ece6b85 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
@@ -32,7 +32,7 @@
         <language slang="l:450c81f1-1811-41ac-a9c8-8fda59f778ca:com.mbeddr.formal.nusmv.tabular" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -69,7 +69,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -95,7 +94,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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" />
@@ -121,7 +120,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" />
@@ -169,7 +168,6 @@
     <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="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/generator/template/main@generator.mps
index 77deac62a..252b5d376 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/generator/template/main@generator.mps
@@ -81,7 +81,7 @@
       <concept id="6427346358527586462" name="com.mbeddr.formal.nusmv.tabular.structure.FunctionTableTable" flags="ng" index="3XnnnF" />
     </language>
     <language id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv">
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="7842584090743386548" name="com.mbeddr.formal.nusmv.structure.VariableDeclaration" flags="ng" index="2Hdskp">
@@ -150,7 +150,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/behavior.mps
index 2c27684d8..29dc7cd95 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/behavior.mps
@@ -54,10 +54,10 @@
       <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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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" />
@@ -88,7 +88,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/constraints.mps
index 08f80a4fc..b29d447ba 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/constraints.mps
@@ -71,7 +71,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -147,7 +147,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
index b6b1e8c8a..e9b16753e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
@@ -8,7 +8,7 @@
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" 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="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -91,10 +91,10 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -110,7 +110,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" />
@@ -132,7 +132,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 @@
       <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">
@@ -173,7 +173,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -277,7 +277,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -297,7 +297,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="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -324,6 +324,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -403,7 +404,7 @@
       </concept>
       <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="5725606875425248008" name="delete" index="1ide8m" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -422,7 +423,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">
@@ -539,7 +540,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -577,7 +578,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -917,7 +917,7 @@
                       <node concept="2OqwBi" id="5sbrvaMgmaV" role="3clFbG">
                         <node concept="2OqwBi" id="5sbrvaMgmaW" role="2Oq$k0">
                           <node concept="37vLTw" id="5sbrvaMgmaX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5sbrvaMgmb1" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dry" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5sbrvaMgmaY" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -931,9 +931,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5sbrvaMgmb1" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dry" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5sbrvaMgmb2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Drz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1006,7 +1006,7 @@
                       <node concept="3clFbF" id="7Je984P0pXf" role="3cqZAp">
                         <node concept="2OqwBi" id="7Je984P0pXg" role="3clFbG">
                           <node concept="37vLTw" id="7Je984P0pXh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0pXj" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dr$" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7Je984P0pXi" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1014,9 +1014,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Je984P0pXj" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dr$" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Je984P0pXk" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dr_" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1042,7 +1042,7 @@
                       <node concept="2OqwBi" id="2zzTeYigYiJ" role="3clFbG">
                         <node concept="2OqwBi" id="2zzTeYigW7t" role="2Oq$k0">
                           <node concept="37vLTw" id="2zzTeYigVPy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zzTeYigVGI" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrA" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="2zzTeYigWwa" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1056,9 +1056,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2zzTeYigVGI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DrA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2zzTeYigVGJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DrB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1116,7 +1116,7 @@
                       <node concept="3clFbF" id="7Je984P0r4c" role="3cqZAp">
                         <node concept="2OqwBi" id="7Je984P0r4d" role="3clFbG">
                           <node concept="37vLTw" id="7Je984P0r4e" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0r4g" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrC" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7Je984P0r4f" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1124,9 +1124,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Je984P0r4g" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Je984P0r4h" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1152,7 +1152,7 @@
                       <node concept="2OqwBi" id="7Je984P0r4s" role="3clFbG">
                         <node concept="2OqwBi" id="7Je984P0r4t" role="2Oq$k0">
                           <node concept="37vLTw" id="7Je984P0r4u" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0r4y" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrE" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="7Je984P0r4v" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1166,9 +1166,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Je984P0r4y" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DrE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Je984P0r4z" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DrF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1226,7 +1226,7 @@
                       <node concept="3clFbF" id="7Je984P0r$6" role="3cqZAp">
                         <node concept="2OqwBi" id="7Je984P0r$7" role="3clFbG">
                           <node concept="37vLTw" id="7Je984P0r$8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0r$a" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrG" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7Je984P0r$9" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1234,9 +1234,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Je984P0r$a" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrG" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Je984P0r$b" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrH" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1262,7 +1262,7 @@
                       <node concept="2OqwBi" id="7Je984P0r$m" role="3clFbG">
                         <node concept="2OqwBi" id="7Je984P0r$n" role="2Oq$k0">
                           <node concept="37vLTw" id="7Je984P0r$o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0r$s" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrI" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="7Je984P0r$p" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1276,9 +1276,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7Je984P0r$s" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DrI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7Je984P0r$t" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DrJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1590,7 +1590,7 @@
                       <node concept="3clFbF" id="2zzTeYipBMC" role="3cqZAp">
                         <node concept="2OqwBi" id="2zzTeYipBMD" role="3clFbG">
                           <node concept="37vLTw" id="2zzTeYipBME" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zzTeYipBMG" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrK" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2zzTeYipBMF" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1598,9 +1598,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2zzTeYipBMG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2zzTeYipBMH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1629,7 +1629,7 @@
                       <node concept="3clFbF" id="5sbrvaLa8yE" role="3cqZAp">
                         <node concept="2OqwBi" id="5sbrvaLa8yF" role="3clFbG">
                           <node concept="37vLTw" id="5sbrvaLa8yG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5sbrvaLa8yI" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrM" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5sbrvaLa8yH" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1637,9 +1637,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5sbrvaLa8yI" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5sbrvaLa8yJ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1703,7 +1703,7 @@
                       <node concept="3clFbF" id="7Je984P0xjY" role="3cqZAp">
                         <node concept="2OqwBi" id="7Je984P0xjZ" role="3clFbG">
                           <node concept="37vLTw" id="7Je984P0xk0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0xk2" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrO" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7Je984P0xk1" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1711,9 +1711,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Je984P0xk2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrO" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Je984P0xk3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrP" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1739,7 +1739,7 @@
                       <node concept="3clFbF" id="2zzTeYikwIC" role="3cqZAp">
                         <node concept="2OqwBi" id="2zzTeYikwID" role="3clFbG">
                           <node concept="37vLTw" id="2zzTeYikwIE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zzTeYikwIG" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrQ" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="2zzTeYikwIF" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1747,9 +1747,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2zzTeYikwIG" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrQ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2zzTeYikwIH" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrR" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1813,7 +1813,7 @@
                       <node concept="3clFbF" id="7Je984P0yoW" role="3cqZAp">
                         <node concept="2OqwBi" id="7Je984P0yoX" role="3clFbG">
                           <node concept="37vLTw" id="7Je984P0yoY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7Je984P0yp0" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrS" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7Je984P0yoZ" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -1821,9 +1821,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7Je984P0yp0" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7Je984P0yp1" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1849,7 +1849,7 @@
                       <node concept="3clFbF" id="2zzTeYj415_" role="3cqZAp">
                         <node concept="2OqwBi" id="2zzTeYj415A" role="3clFbG">
                           <node concept="37vLTw" id="2zzTeYj415B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zzTeYj415D" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DrU" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="2zzTeYj415C" role="2OqNvi">
                             <ref role="3TtcxE" to="gioj:7mSH3WmWrI1" resolve="actuals" />
@@ -1857,9 +1857,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2zzTeYj415D" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DrU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2zzTeYj415E" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DrV" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3986,7 +3986,7 @@
                                   <node concept="2OqwBi" id="43FRfGJOAXp" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJOAXq" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJOAXr" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJOAXv" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DrW" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJOAXs" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4001,9 +4001,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJOAXv" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DrW" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJOAXw" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DrX" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4286,7 +4286,7 @@
                                   <node concept="2OqwBi" id="43FRfGJPDVP" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJPDVQ" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJPDVR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJPDVV" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DrY" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJPDVS" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4301,9 +4301,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJPDVV" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DrY" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJPDVW" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DrZ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4639,7 +4639,7 @@
                                   <node concept="2OqwBi" id="43FRfGJSlSz" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJSl9$" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJSkUl" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJSkGJ" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Ds0" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJSlwO" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4654,9 +4654,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJSkGJ" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Ds0" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJSkGK" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Ds1" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4716,7 +4716,7 @@
                                   <node concept="2OqwBi" id="43FRfGJS37m" role="3clFbG">
                                     <node concept="2OqwBi" id="43FRfGJS37n" role="2Oq$k0">
                                       <node concept="37vLTw" id="43FRfGJS37o" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="43FRfGJS37s" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Ds2" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="43FRfGJS37p" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4731,9 +4731,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="43FRfGJS37s" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Ds2" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="43FRfGJS37t" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Ds3" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/intentions.mps
index 03a7a0bc1..a1106d8fe 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/intentions.mps
@@ -58,6 +58,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -128,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -147,7 +148,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>
@@ -193,7 +193,7 @@
                       <node concept="3clFbC" id="5HwHP1Og0Ha" role="3clFbG">
                         <node concept="2OqwBi" id="5HwHP1OfXAC" role="3uHU7B">
                           <node concept="37vLTw" id="5HwHP1OfXAD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5HwHP1OfXAF" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Ds4" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5HwHP1OfXAE" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:7mSH3WmXrCC" resolve="definition" />
@@ -203,9 +203,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5HwHP1OfXAF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Ds4" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5HwHP1OfXAG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Ds5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -239,7 +239,7 @@
                       <node concept="3clFbC" id="5HwHP1Og28_" role="3clFbG">
                         <node concept="2OqwBi" id="5HwHP1Og28A" role="3uHU7B">
                           <node concept="37vLTw" id="5HwHP1Og28B" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5HwHP1Og28E" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Ds6" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5HwHP1Og3MV" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:43FRfGJVcU3" resolve="def" />
@@ -249,9 +249,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5HwHP1Og28E" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Ds6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5HwHP1Og28F" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Ds7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -422,7 +422,7 @@
                       <node concept="3clFbC" id="5HwHP1Og7b0" role="3clFbG">
                         <node concept="2OqwBi" id="5HwHP1Og7b1" role="3uHU7B">
                           <node concept="37vLTw" id="5HwHP1Og7b2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5HwHP1Og7b5" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Ds8" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5HwHP1Og8$5" role="2OqNvi">
                             <ref role="3Tt5mk" to="rvcq:5HwHP1OeZy5" resolve="output" />
@@ -432,9 +432,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5HwHP1Og7b5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Ds8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5HwHP1Og7b6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Ds9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -563,7 +563,7 @@
                       <node concept="3clFbC" id="4H8XLSF5fTo" role="3clFbG">
                         <node concept="2OqwBi" id="4H8XLSF5fTp" role="3uHU7B">
                           <node concept="37vLTw" id="4H8XLSF5fTq" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4H8XLSF5fTt" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dsa" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4H8XLSF5iHK" role="2OqNvi">
                             <ref role="3Tt5mk" to="jx4r:2mjHtwTIKk$" resolve="functionValueContent" />
@@ -573,9 +573,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4H8XLSF5fTt" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dsa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4H8XLSF5fTu" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dsb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -710,7 +710,7 @@
                       <node concept="3clFbC" id="4H8XLSF5LDu" role="3clFbG">
                         <node concept="2OqwBi" id="4H8XLSF5LDv" role="3uHU7B">
                           <node concept="37vLTw" id="4H8XLSF5LDw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4H8XLSF5LDz" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dsc" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4H8XLSF5Q_D" role="2OqNvi">
                             <ref role="3Tt5mk" to="rvcq:4H8XLSF4jUE" resolve="output" />
@@ -720,9 +720,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4H8XLSF5LDz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dsc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4H8XLSF5LD$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dsd" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/plugin.mps
index acd8443ec..c38d73bdd 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/structure.mps
index 4cbdd6cc4..2acb55fcf 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/typesystem.mps
index 5b6a8224d..6205fe119 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/typesystem.mps
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
index a8fccbf9f..c2e008ce5 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.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" />
@@ -97,7 +97,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</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: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" />
@@ -148,7 +147,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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps
index 2448df391..d8c2fd5ea 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.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>
@@ -374,7 +374,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/behavior.mps
index 80cdc36a4..48fdb8f08 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/behavior.mps
@@ -47,7 +47,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -64,7 +64,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/com.mbeddr.formal.nusmv.cbd.migration.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/com.mbeddr.formal.nusmv.cbd.migration.mps
index 503809414..e2029dc24 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/com.mbeddr.formal.nusmv.cbd.migration.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/com.mbeddr.formal.nusmv.cbd.migration.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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/constraints.mps
index 34c83921e..ccb0e71be 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/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>
@@ -93,7 +93,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
index ff66b77ed..80e31a98c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
@@ -92,10 +92,10 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -109,7 +109,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" />
@@ -131,7 +131,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="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">
@@ -208,7 +208,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>
@@ -280,7 +280,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
index 329f476ec..3ce15b67f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
@@ -108,7 +108,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>
@@ -123,7 +123,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">
@@ -145,6 +145,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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>
@@ -268,7 +269,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -1660,14 +1660,14 @@
                                     <ref role="3cqZAo" node="1EKbsQR2eJM" resolve="newPath" />
                                   </node>
                                   <node concept="37vLTw" id="1NcemxUMbdE" role="37wK5m">
-                                    <ref role="3cqZAo" node="1NcemxUMbd9" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dse" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1NcemxUMbd9" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36D1Dse" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1NcemxUMbdm" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36D1Dsf" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1888,7 +1888,7 @@
                                       <node concept="36biLy" id="59K1I7nN1o$" role="28nt2d">
                                         <node concept="2OqwBi" id="1NcemxUMbdA" role="36biLW">
                                           <node concept="37vLTw" id="1NcemxUMbdF" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1NcemxUMbcA" resolve="it" />
+                                            <ref role="3cqZAo" node="2hED36D1Dsg" resolve="it" />
                                           </node>
                                           <node concept="1$rogu" id="1NcemxUMbdG" role="2OqNvi" />
                                         </node>
@@ -1900,9 +1900,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1NcemxUMbcA" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dsg" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1NcemxUMbcT" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dsh" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2312,14 +2312,14 @@
                                 <ref role="3cqZAo" node="1EKbsQR30$n" resolve="newPath" />
                               </node>
                               <node concept="37vLTw" id="1NcemxUMbds" role="37wK5m">
-                                <ref role="3cqZAo" node="1NcemxUMbcF" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dsi" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1NcemxUMbcF" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dsi" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1NcemxUMbcX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dsj" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2436,7 +2436,7 @@
                                   <node concept="36biLy" id="59K1I7nN1Nm" role="28nt2d">
                                     <node concept="2OqwBi" id="59K1I7nN1Nn" role="36biLW">
                                       <node concept="37vLTw" id="59K1I7nN22G" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1NcemxUMbbT" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1Dsk" resolve="it" />
                                       </node>
                                       <node concept="1$rogu" id="59K1I7nN1Np" role="2OqNvi" />
                                     </node>
@@ -2448,9 +2448,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1NcemxUMbbT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dsk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1NcemxUMbcl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dsl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2720,14 +2720,14 @@
                                     <ref role="3cqZAo" node="6xNJt7l_C1I" resolve="newPath" />
                                   </node>
                                   <node concept="37vLTw" id="6Ut9yCDFtEt" role="37wK5m">
-                                    <ref role="3cqZAo" node="6Ut9yCDFsui" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dsm" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6Ut9yCDFsui" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36D1Dsm" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6Ut9yCDFsuj" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36D1Dsn" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3068,7 +3068,7 @@
                     <node concept="3clFbF" id="1NcemxUMbeX" role="3cqZAp">
                       <node concept="2OqwBi" id="1NcemxUMbf4" role="3clFbG">
                         <node concept="37vLTw" id="1NcemxUMbf7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1NcemxUMbeO" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dso" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1NcemxUMbf8" role="2OqNvi">
                           <ref role="3Tt5mk" to="gioj:7mSH3Wn9yWw" resolve="expr" />
@@ -3076,9 +3076,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1NcemxUMbeO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dso" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1NcemxUMbeY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dsp" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3129,7 +3129,7 @@
                     <node concept="3clFbF" id="1NcemxVtMtV" role="3cqZAp">
                       <node concept="2OqwBi" id="1NcemxVtMtW" role="3clFbG">
                         <node concept="37vLTw" id="1NcemxVtMtX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1NcemxVtMtZ" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dsq" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1NcemxVtMtY" role="2OqNvi">
                           <ref role="3Tt5mk" to="gioj:7mSH3Wn9yWw" resolve="expr" />
@@ -3137,9 +3137,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1NcemxVtMtZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dsq" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1NcemxVtMu0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dsr" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/intentions.mps
index dbd53c69c..cde6486d7 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/intentions.mps
@@ -76,7 +76,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
index d94695107..b4d360b68 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -37,7 +37,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" />
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/refinement.util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/refinement.util.mps
index e29e87fbe..6b2f1e953 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/refinement.util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/refinement.util.mps
@@ -72,7 +72,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,13 +87,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -158,7 +159,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,7 +172,6 @@
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -300,7 +300,7 @@
                         <node concept="2OqwBi" id="2l5A0OF8vai" role="3clFbG">
                           <node concept="2OqwBi" id="2l5A0OF8xMU" role="2Oq$k0">
                             <node concept="37vLTw" id="2l5A0OF8uWo" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2l5A0OF8uKV" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dss" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2l5A0OF8yk6" role="2OqNvi">
                               <ref role="3Tt5mk" to="gioj:7mSH3Wn9yWw" resolve="expr" />
@@ -310,9 +310,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2l5A0OF8uKV" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dss" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2l5A0OF8uKW" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dst" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -425,22 +425,22 @@
                   <node concept="3clFbF" id="2l5A0OF93s3" role="3cqZAp">
                     <node concept="2OqwBi" id="2l5A0OF93Bh" role="3clFbG">
                       <node concept="37vLTw" id="2l5A0OF93s2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2l5A0OF93lY" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dsu" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="2l5A0OF93X8" role="2OqNvi">
                         <node concept="1rXfSq" id="2l5A0OF975l" role="1P9ThW">
                           <ref role="37wK5l" node="2l5A0OF94jZ" resolve="replacementForPortRef" />
                           <node concept="37vLTw" id="2l5A0OF97bk" role="37wK5m">
-                            <ref role="3cqZAo" node="2l5A0OF93lY" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dsu" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2l5A0OF93lY" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dsu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2l5A0OF93lZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dsv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -466,7 +466,7 @@
                   <node concept="3clFbF" id="1wencriEsQp" role="3cqZAp">
                     <node concept="2OqwBi" id="1wencriEsQq" role="3clFbG">
                       <node concept="37vLTw" id="1wencriEsQr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1wencriEsQv" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dsw" resolve="it" />
                       </node>
                       <node concept="1P9Npp" id="1wencriEsQs" role="2OqNvi">
                         <node concept="2pJPEk" id="1wencriEtwr" role="1P9ThW">
@@ -478,7 +478,7 @@
                                 <node concept="2OqwBi" id="1wencriEuJq" role="WxPPp">
                                   <node concept="2OqwBi" id="1wencriEu4m" role="2Oq$k0">
                                     <node concept="37vLTw" id="1wencriEtON" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1wencriEsQv" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Dsw" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="1wencriEus4" role="2OqNvi">
                                       <ref role="3Tt5mk" to="gioj:6NmtaR1VD8p" resolve="enumMember" />
@@ -496,9 +496,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1wencriEsQv" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dsw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1wencriEsQw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dsx" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/structure.mps
index d3f6ca6d0..7b968271b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/structure.mps
@@ -56,7 +56,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/typesystem.mps
index 843f46bf9..930fd62ef 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/typesystem.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -60,6 +60,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" />
@@ -119,7 +120,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -134,7 +135,6 @@
       <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="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" />
@@ -176,7 +176,7 @@
                   <node concept="3clFbF" id="4jVGnaqoMd7" role="3cqZAp">
                     <node concept="2OqwBi" id="4jVGnaqoMd8" role="3clFbG">
                       <node concept="37vLTw" id="4jVGnaqoMd9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4jVGnaqoMdb" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dsy" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="4jVGnaqoMda" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -184,9 +184,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4jVGnaqoMdb" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dsy" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4jVGnaqoMdc" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dsz" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -224,7 +224,7 @@
                   <node concept="3clFbF" id="4jVGnaqp1Ht" role="3cqZAp">
                     <node concept="2OqwBi" id="4jVGnaqp1Hu" role="3clFbG">
                       <node concept="37vLTw" id="4jVGnaqp1Hv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4jVGnaqp1Hx" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Ds$" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="4jVGnaqp1Hw" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -232,9 +232,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4jVGnaqp1Hx" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Ds$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4jVGnaqp1Hy" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Ds_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -311,7 +311,7 @@
                   <node concept="3clFbF" id="4jVGnaqp6Fr" role="3cqZAp">
                     <node concept="2OqwBi" id="4jVGnaqp6Fs" role="3clFbG">
                       <node concept="37vLTw" id="4jVGnaqp6Ft" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4jVGnaqp6Fv" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1DsA" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="4jVGnaqp6Fu" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -319,9 +319,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4jVGnaqp6Fv" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DsA" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4jVGnaqp6Fw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DsB" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -363,7 +363,7 @@
                   <node concept="3clFbF" id="4jVGnaqp6FK" role="3cqZAp">
                     <node concept="2OqwBi" id="4jVGnaqp6FL" role="3clFbG">
                       <node concept="37vLTw" id="4jVGnaqp6FM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4jVGnaqp6FO" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1DsC" resolve="it" />
                       </node>
                       <node concept="3TrcHB" id="4jVGnaqp6FN" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -371,9 +371,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4jVGnaqp6FO" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DsC" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4jVGnaqp6FP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DsD" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/com.mbeddr.formal.nusmv.ext.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/com.mbeddr.formal.nusmv.ext.mpl
index 51a265fe0..bff21489d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/com.mbeddr.formal.nusmv.ext.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/com.mbeddr.formal.nusmv.ext.mpl
@@ -34,7 +34,7 @@
         <language slang="l:001b2375-3bd5-4d5e-9958-6b3f62dc8548:com.mbeddr.formal.nusmv" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -69,7 +69,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -84,7 +83,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/generator/template/main@generator.mps
index 1a7a1df41..f1ac85a2a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/generator/template/main@generator.mps
@@ -74,7 +74,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -143,6 +143,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -283,7 +284,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>
@@ -306,7 +307,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" />
@@ -484,7 +484,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="1gJVC85KTPl" role="3uHU7B">
                                       <node concept="37vLTw" id="1gJVC85KTPm" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1gJVC85KTPo" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DsN" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="1gJVC85KTPn" role="2OqNvi">
                                         <ref role="3Tt5mk" to="6z8w:1gJVC85KmLu" resolve="param" />
@@ -493,9 +493,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1gJVC85KTPo" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DsN" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1gJVC85KTPp" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DsO" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -598,7 +598,7 @@
                           <node concept="30H73N" id="4ZxQD5yNpfN" role="3uHU7w" />
                           <node concept="2OqwBi" id="4ZxQD5yNpfO" role="3uHU7B">
                             <node concept="37vLTw" id="4ZxQD5yNpfP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4ZxQD5yNpfR" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DsP" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4ZxQD5yNpfQ" role="2OqNvi">
                               <ref role="3Tt5mk" to="6z8w:1gJVC85KmPO" resolve="func" />
@@ -607,9 +607,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4ZxQD5yNpfR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DsP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4ZxQD5yNpfS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DsQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/behavior.mps
index 05e498530..9d1477680 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/behavior.mps
@@ -74,14 +74,14 @@
       <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>
       <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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -131,7 +131,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/constraints.mps
index 073e5bab3..d4eca7df1 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/constraints.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>
@@ -114,7 +114,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/editor.mps
index a16db7b3c..622448b0e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/editor.mps
@@ -59,7 +59,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="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -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="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -102,7 +102,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" />
@@ -113,7 +113,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">
@@ -193,7 +193,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -203,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" />
@@ -268,7 +269,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -283,7 +284,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -741,7 +741,7 @@
                           <node concept="0IXxy" id="25dEoZduO2W" role="3uHU7w" />
                           <node concept="2OqwBi" id="25dEoZduNlj" role="3uHU7B">
                             <node concept="37vLTw" id="25dEoZduNlk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="25dEoZduNlm" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DsE" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="25dEoZduNll" role="2OqNvi">
                               <ref role="3Tt5mk" to="gioj:1IrBcRpiDGm" resolve="param" />
@@ -750,9 +750,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="25dEoZduNlm" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DsE" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="25dEoZduNln" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DsF" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -808,7 +808,7 @@
                         </node>
                         <node concept="2OqwBi" id="25dEoZdvacy" role="37vLTJ">
                           <node concept="37vLTw" id="25dEoZdva2$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="25dEoZdv9Zs" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DsG" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="25dEoZdvatv" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:1IrBcRpiDGm" resolve="param" />
@@ -817,9 +817,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="25dEoZdv9Zs" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DsG" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="25dEoZdv9Zt" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DsH" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -930,7 +930,7 @@
                             <node concept="7Obwk" id="25dEoZdubju" role="3uHU7w" />
                             <node concept="2OqwBi" id="25dEoZdubjv" role="3uHU7B">
                               <node concept="37vLTw" id="25dEoZdubjw" role="2Oq$k0">
-                                <ref role="3cqZAo" node="25dEoZdubjy" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DsI" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="25dEoZdubjx" role="2OqNvi">
                                 <ref role="3Tt5mk" to="gioj:1IrBcRpiDGm" resolve="param" />
@@ -939,9 +939,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="25dEoZdubjy" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DsI" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="25dEoZdubjz" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DsJ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1003,7 +1003,7 @@
                           </node>
                           <node concept="2OqwBi" id="25dEoZdulYw" role="37vLTJ">
                             <node concept="37vLTw" id="25dEoZdulOy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="25dEoZdulLq" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DsK" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="25dEoZdumft" role="2OqNvi">
                               <ref role="3Tt5mk" to="gioj:1IrBcRpiDGm" resolve="param" />
@@ -1012,9 +1012,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="25dEoZdulLq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DsK" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="25dEoZdulLr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DsL" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/structure.mps
index 4c68ba3c5..0bda91ac0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/typesystem.mps
index 05085763c..6f8a9dc55 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/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" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl
index 2637dfe10..9b6abc483 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.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" />
@@ -62,7 +62,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
@@ -76,7 +75,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/generator/template/main@generator.mps
index 581902188..62b5ec6e2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/generator/template/main@generator.mps
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/behavior.mps
index 580566c94..561700742 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/behavior.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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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" />
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/editor.mps
index 4a33c4454..e8c342a24 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/editor.mps
@@ -41,7 +41,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -59,7 +59,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -134,7 +134,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>
@@ -146,7 +146,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -175,7 +175,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/structure.mps
index 54ba94fe8..8e543f54d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/models/structure.mps
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
index 0da69ab51..e069ea0d7 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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" />
@@ -52,7 +51,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/behavior.mps
index a18840226..5be67b7eb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/behavior.mps
@@ -77,7 +77,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -88,7 +88,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -100,7 +100,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/com.mbeddr.formal.nusmv.operatorspanel.plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/com.mbeddr.formal.nusmv.operatorspanel.plugin.mps
index 2a73db35f..e9fd5c827 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/com.mbeddr.formal.nusmv.operatorspanel.plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/com.mbeddr.formal.nusmv.operatorspanel.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="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
@@ -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>
@@ -136,7 +136,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">
@@ -223,7 +223,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
index 920576ecd..601527ecc 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
@@ -34,7 +34,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -51,7 +51,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/structure.mps
index 31f0939d7..f4cb8b742 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/structure.mps
@@ -45,7 +45,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
index 2273e872f..449ee9c7f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
@@ -31,7 +31,7 @@
         <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" 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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)</dependency>
@@ -87,7 +86,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-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" />
@@ -113,7 +112,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/generator/template/main@generator.mps
index 95de8a9c6..925fddee0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/generator/template/main@generator.mps
@@ -76,7 +76,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/actions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/actions.mps
index eb6955dbf..e1c938a4d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/actions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/actions.mps
@@ -53,6 +53,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -138,7 +139,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -194,7 +194,7 @@
                         <node concept="3clFbF" id="40lCrc7T1Oy" role="3cqZAp">
                           <node concept="2OqwBi" id="40lCrc7T1Oz" role="3clFbG">
                             <node concept="37vLTw" id="40lCrc7T1O$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="40lCrc7T1OB" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DsS" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="40lCrc7T1O_" role="2OqNvi">
                               <node concept="chp4Y" id="40lCrc7T1OA" role="cj9EA">
@@ -204,9 +204,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="40lCrc7T1OB" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DsS" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="40lCrc7T1OC" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DsT" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -280,7 +280,7 @@
                         <node concept="3clFbF" id="40lCrc7T1P7" role="3cqZAp">
                           <node concept="2OqwBi" id="40lCrc7T1P8" role="3clFbG">
                             <node concept="37vLTw" id="40lCrc7T1P9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="40lCrc7T1Pc" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DsU" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="40lCrc7T1Pa" role="2OqNvi">
                               <node concept="chp4Y" id="40lCrc7T1Pb" role="cj9EA">
@@ -290,9 +290,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="40lCrc7T1Pc" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DsU" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="40lCrc7T1Pd" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DsV" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/behavior.mps
index b8042b429..b5bedf238 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/behavior.mps
@@ -88,19 +88,20 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -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>
@@ -177,7 +178,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -586,7 +586,7 @@
                       <node concept="2OqwBi" id="2rSUIGXqNTI" role="3clFbG">
                         <node concept="2OqwBi" id="2rSUIGXqNTJ" role="2Oq$k0">
                           <node concept="37vLTw" id="2rSUIGXqNTK" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2rSUIGXqNTO" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DsW" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2rSUIGXqNTL" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:3YQnHt3vU0" resolve="lhs" />
@@ -600,9 +600,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2rSUIGXqNTO" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DsW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2rSUIGXqNTP" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DsX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/constraints.mps
index db8eeb15b..fbc712261 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/constraints.mps
@@ -74,7 +74,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -168,7 +168,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
index d80859d9f..c7c2c8b31 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
@@ -103,7 +103,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -127,7 +127,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1165420413719" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Group" flags="ng" index="1ou48o">
@@ -157,7 +157,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -173,7 +173,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">
@@ -215,7 +215,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_" />
@@ -309,7 +309,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -329,7 +329,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" />
@@ -344,6 +344,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -391,7 +392,7 @@
         <child id="1981294357059564524" name="paletteSources" index="1RuSHk" />
       </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="5725606875425248008" name="delete" index="1ide8m" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -413,7 +414,7 @@
       </concept>
       <concept id="5490129062795541784" name="de.itemis.mps.editor.diagram.structure.PaletteSource_Query" flags="ig" index="yMipj" />
       <concept id="5490129062795632136" name="de.itemis.mps.editor.diagram.structure.Parameter_SubstituteInfoFactory" flags="ng" index="yMSl3" />
-      <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="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
@@ -517,7 +518,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -545,7 +546,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <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="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" />
@@ -3174,7 +3174,7 @@
                                   <node concept="2OqwBi" id="4MR8i$49lGa" role="3uHU7B">
                                     <node concept="2OqwBi" id="4MR8i$49lGb" role="2Oq$k0">
                                       <node concept="37vLTw" id="4MR8i$49lGc" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4MR8i$49lGf" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DsY" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="4MR8i$49lGd" role="2OqNvi">
                                         <ref role="3Tt5mk" to="ahnd:1$vmWKMr0SH" resolve="guard" />
@@ -3187,9 +3187,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4MR8i$49lGf" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36D1DsY" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4MR8i$49lGg" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36D1DsZ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3429,7 +3429,7 @@
                               <node concept="2OqwBi" id="4MR8i$49n8l" role="3uHU7B">
                                 <node concept="2OqwBi" id="4MR8i$49n8m" role="2Oq$k0">
                                   <node concept="37vLTw" id="4MR8i$49n8n" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4MR8i$49n8q" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dt0" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4MR8i$49n8o" role="2OqNvi">
                                     <ref role="3Tt5mk" to="ahnd:1$vmWKMr0SH" resolve="guard" />
@@ -3442,9 +3442,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4MR8i$49n8q" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dt0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4MR8i$49n8r" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dt1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -3591,7 +3591,7 @@
                           <node concept="3fqX7Q" id="4MR8i$4fw$z" role="3clFbG">
                             <node concept="2OqwBi" id="4MR8i$4fw$_" role="3fr31v">
                               <node concept="37vLTw" id="4MR8i$4fw$A" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4MR8i$4fsHb" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dt2" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="4MR8i$4fw$B" role="2OqNvi">
                                 <node concept="chp4Y" id="4MR8i$4fw$C" role="cj9EA">
@@ -3602,9 +3602,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4MR8i$4fsHb" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dt2" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4MR8i$4fsHc" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dt3" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3688,7 +3688,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4MR8i$4cRHV" role="1m5AlR">
                                   <node concept="37vLTw" id="4MR8i$4cRHW" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4MR8i$4cRI5" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dt4" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4MR8i$4cRHX" role="2OqNvi">
                                     <ref role="3Tt5mk" to="gioj:3YQnHt3VFQ" resolve="lhs" />
@@ -3702,9 +3702,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4MR8i$4cRI5" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dt4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="4MR8i$4cRI6" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dt5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/plugin.mps
index 75b10c64c..db73b6011 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/structure.mps
index 89ef76299..3e3d6ea0c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/structure.mps
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/textGen.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/textGen.mps
index 98a6f579d..998be2d36 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/textGen.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/textGen.mps
@@ -72,7 +72,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/typesystem.mps
index 01f801256..42c8eef30 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/typesystem.mps
@@ -62,7 +62,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </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" />
@@ -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>
@@ -175,7 +176,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -305,7 +305,7 @@
                       <node concept="2OqwBi" id="25dEoZdSqhZ" role="3clFbG">
                         <node concept="2OqwBi" id="25dEoZdSj8D" role="2Oq$k0">
                           <node concept="37vLTw" id="25dEoZdSiP6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="25dEoZdSiBM" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dt6" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="25dEoZdSmLl" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:3YQnHt3vU0" resolve="lhs" />
@@ -319,9 +319,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="25dEoZdSiBM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dt6" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="25dEoZdSiBN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dt7" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -337,7 +337,7 @@
                         </node>
                         <node concept="2OqwBi" id="6Kf5KB6Gg3F" role="1m5AlR">
                           <node concept="37vLTw" id="6Kf5KB6Gg3G" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Kf5KB6Gg3J" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dt8" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6Kf5KB6Gg3H" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:3YQnHt3vU0" resolve="lhs" />
@@ -350,9 +350,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6Kf5KB6Gg3J" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dt8" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6Kf5KB6Gg3K" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dt9" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
index 7656888e6..1a526f843 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/constraints.mps
index f2268bff7..3229fae10 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/constraints.mps
@@ -43,7 +43,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -61,6 +61,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" />
@@ -93,7 +94,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -105,7 +106,6 @@
         <child id="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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -154,7 +154,7 @@
                         <node concept="2OqwBi" id="6xNJt7lLq5h" role="3clFbG">
                           <node concept="2OqwBi" id="6xNJt7lLq5i" role="2Oq$k0">
                             <node concept="37vLTw" id="6xNJt7lLq5j" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6xNJt7lLq5w" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dtc" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="6xNJt7lLq5k" role="2OqNvi">
                               <node concept="1xMEDy" id="6xNJt7lLq5l" role="1xVPHs">
@@ -170,7 +170,7 @@
                                 <node concept="3clFbF" id="6xNJt7lLq5q" role="3cqZAp">
                                   <node concept="2OqwBi" id="6xNJt7lLq5r" role="3clFbG">
                                     <node concept="37vLTw" id="6xNJt7lLq5s" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6xNJt7lLq5u" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Dta" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="6xNJt7lLq5t" role="2OqNvi">
                                       <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
@@ -178,18 +178,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6xNJt7lLq5u" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Dta" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6xNJt7lLq5v" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Dtb" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6xNJt7lLq5w" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dtc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6xNJt7lLq5x" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dtd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
index 804f38f14..ce4314182 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
@@ -46,7 +46,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/structure.mps
index d8e15c884..f582cc747 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/structure.mps
@@ -51,7 +51,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/textGen.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/textGen.mps
index f9bfa9a31..cbeda447a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/textGen.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/textGen.mps
@@ -37,7 +37,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>
@@ -83,7 +83,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/com.mbeddr.formal.nusmv.spec.patterns.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/com.mbeddr.formal.nusmv.spec.patterns.mpl
index 73d317c29..5e966b3ce 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/com.mbeddr.formal.nusmv.spec.patterns.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/com.mbeddr.formal.nusmv.spec.patterns.mpl
@@ -34,7 +34,7 @@
         <language slang="l:7f9f6ff3-a7e5-4005-bb24-0a686daae0a1:com.mbeddr.formal.nusmv.spec.patterns" 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" />
@@ -151,7 +151,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
@@ -163,7 +162,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/generator/template/com.mbeddr.formal.nusmv.spec.patterns.main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/generator/template/com.mbeddr.formal.nusmv.spec.patterns.main@generator.mps
index e3cf64c79..28345a3c8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/generator/template/com.mbeddr.formal.nusmv.spec.patterns.main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/generator/template/com.mbeddr.formal.nusmv.spec.patterns.main@generator.mps
@@ -128,7 +128,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/behavior.mps
index a00b92887..21625d928 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/behavior.mps
@@ -48,14 +48,14 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -70,7 +70,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/editor.mps
index 92561082b..0936a53b4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/editor.mps
@@ -32,7 +32,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139744628335" name="jetbrains.mps.lang.editor.structure.CellModel_Image" flags="sg" stub="8104358048506731195" index="1u4HXA">
@@ -49,7 +49,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" />
@@ -62,7 +62,7 @@
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" 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>
@@ -86,7 +86,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/structure.mps
index 00fef30b7..f14700959 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/models/structure.mps
@@ -35,7 +35,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/com.mbeddr.formal.nusmv.tabular.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/com.mbeddr.formal.nusmv.tabular.mpl
index d20cb34c8..982941e54 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/com.mbeddr.formal.nusmv.tabular.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/com.mbeddr.formal.nusmv.tabular.mpl
@@ -37,7 +37,7 @@
         <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" 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" />
@@ -72,7 +72,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -85,7 +84,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/com.mbeddr.formal.nusmv.tabular.generator.utils.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/com.mbeddr.formal.nusmv.tabular.generator.utils.mps
index 2a4ca7efc..c472b0e9d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/com.mbeddr.formal.nusmv.tabular.generator.utils.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/com.mbeddr.formal.nusmv.tabular.generator.utils.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
@@ -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>
@@ -121,7 +121,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">
@@ -189,7 +189,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/main@generator.mps
index 574cc8608..24990a766 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/generator/template/main@generator.mps
@@ -63,7 +63,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
         <child id="2295987781866647191" name="elseExpr" index="d498I" />
         <child id="2295987781866647183" name="cond" index="d498Q" />
       </concept>
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="7842584090744230923" name="com.mbeddr.formal.nusmv.structure.SingleCase" flags="ng" index="2H9I2A">
@@ -255,7 +255,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/behavior.mps
index 77eac4664..88ec6414a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/behavior.mps
@@ -63,11 +63,11 @@
         <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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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" />
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/constraints.mps
index 0c6dbaa06..4e0f7818d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/constraints.mps
@@ -5,7 +5,7 @@
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
     <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="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
@@ -33,7 +33,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/editor.mps
index f5060c752..abc49f5fa 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/editor.mps
@@ -43,10 +43,10 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -65,7 +65,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -87,13 +87,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="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -175,7 +175,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -187,7 +187,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" />
@@ -256,7 +256,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/structure.mps
index 38c841fc0..ad4b8fef0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/typesystem.mps
index a321ab77a..0875f1d2a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/models/typesystem.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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
index 391b880f9..387ce8e6f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
@@ -40,7 +40,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -76,7 +76,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -90,7 +89,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -116,7 +115,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/generator/template/main@generator.mps
index 8bb69fd90..eeb775f87 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/generator/template/main@generator.mps
@@ -72,7 +72,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -168,6 +168,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -346,7 +347,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>
@@ -370,7 +371,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="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -960,7 +960,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6Kf5KB6CYN0" role="3uHU7B">
                                   <node concept="37vLTw" id="6Kf5KB6CYN1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6Kf5KB6CYN3" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dtl" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6Kf5KB6DABW" role="2OqNvi">
                                     <ref role="3Tt5mk" to="fnq2:43FRfGJUExp" resolve="module" />
@@ -969,9 +969,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6Kf5KB6CYN3" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1Dtl" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6Kf5KB6CYN4" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1Dtm" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -993,7 +993,7 @@
                               </node>
                               <node concept="2OqwBi" id="6Kf5KB6D0PA" role="37vLTJ">
                                 <node concept="37vLTw" id="6Kf5KB6D0FS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6Kf5KB6D0C$" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dtn" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6Kf5KB6DH0S" role="2OqNvi">
                                   <ref role="3Tt5mk" to="fnq2:43FRfGJUExp" resolve="module" />
@@ -1002,9 +1002,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Kf5KB6D0C$" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dtn" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Kf5KB6D0C_" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dto" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1122,7 +1122,7 @@
                       <node concept="2OqwBi" id="4IuDkoKHCSp" role="3clFbG">
                         <node concept="2OqwBi" id="4IuDkoKHCSq" role="2Oq$k0">
                           <node concept="37vLTw" id="4IuDkoKHCSr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4IuDkoKHCSv" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dtp" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4IuDkoKHCSs" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1137,9 +1137,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4IuDkoKHCSv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dtp" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4IuDkoKHCSw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dtq" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1192,7 +1192,7 @@
                             <node concept="2OqwBi" id="4IuDkoKIbe7" role="3clFbG">
                               <node concept="2OqwBi" id="4IuDkoKI8p7" role="2Oq$k0">
                                 <node concept="37vLTw" id="4IuDkoKI85q" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4IuDkoKI7UG" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dtr" resolve="it" />
                                 </node>
                                 <node concept="2Rf3mk" id="4IuDkoKI8Lr" role="2OqNvi">
                                   <node concept="1xMEDy" id="4IuDkoKI8Lt" role="1xVPHs">
@@ -1206,9 +1206,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4IuDkoKI7UG" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dtr" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4IuDkoKI7UH" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dts" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/behavior.mps
index 8476e7dd7..f15ecab47 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/behavior.mps
@@ -113,7 +113,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -124,7 +124,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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -156,7 +156,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/constraints.mps
index 3a6d7c521..08a48bb04 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
index 88af9d6b1..01dc9ce69 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
@@ -57,7 +57,7 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -83,7 +83,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" />
@@ -162,7 +162,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>
@@ -177,6 +177,7 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -222,7 +223,7 @@
         <child id="8155811638124638369" name="groupHeader" index="18hjfo" />
         <child id="8155811638124638371" name="childHeaders" index="18hjfq" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -281,7 +282,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -724,7 +724,7 @@
                             <node concept="3clFbF" id="43FRfGK5l5f" role="3cqZAp">
                               <node concept="2OqwBi" id="43FRfGK5lsa" role="3clFbG">
                                 <node concept="37vLTw" id="43FRfGK5l5e" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="43FRfGK5kO9" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dth" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="43FRfGK5m9_" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -732,9 +732,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="43FRfGK5kO9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1Dth" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="43FRfGK5kOa" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1Dti" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -792,7 +792,7 @@
                             <node concept="3clFbF" id="43FRfGK5Ecw" role="3cqZAp">
                               <node concept="2OqwBi" id="43FRfGK5Ecx" role="3clFbG">
                                 <node concept="37vLTw" id="43FRfGK5Ecy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="43FRfGK5Ec$" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dtj" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="43FRfGK5Ecz" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -800,9 +800,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="43FRfGK5Ec$" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1Dtj" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="43FRfGK5Ec_" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1Dtk" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/intentions.mps
index affce904a..999fc5c64 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/intentions.mps
@@ -33,7 +33,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>
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/plugin.mps
index 12b095e0b..2e6d12723 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/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" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/structure.mps
index 0fc542009..19095928e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/typesystem.mps
index 1bfaad94f..fb8db2de1 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/typesystem.mps
@@ -49,7 +49,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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/util.mps
index e178c82ce..b9ed41085 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/util.mps
@@ -2,7 +2,7 @@
 <model ref="r:2bad243b-1b8c-4ccd-8ea4-2b77e6c2045e(com.mbeddr.formal.nusmv.tests.util)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -92,7 +92,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>
@@ -106,7 +106,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1214918975462" name="jetbrains.mps.baseLanguage.structure.PostfixDecrementExpression" flags="nn" index="3uO5VW" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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">
@@ -181,7 +181,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/com.mbeddr.formal.nusmv.verification_cases.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/com.mbeddr.formal.nusmv.verification_cases.mpl
index 531ce2206..a5a4a6def 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/com.mbeddr.formal.nusmv.verification_cases.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/com.mbeddr.formal.nusmv.verification_cases.mpl
@@ -36,7 +36,7 @@
         <language slang="l:001b2375-3bd5-4d5e-9958-6b3f62dc8548:com.mbeddr.formal.nusmv" 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" />
@@ -87,7 +87,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</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:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/generator/template/main@generator.mps
index 3d7e498ee..19f65ba80 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/generator/template/main@generator.mps
@@ -38,7 +38,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
       </concept>
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -255,7 +255,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/behavior.mps
index 3683e042c..3876de980 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/behavior.mps
@@ -51,7 +51,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" />
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/editor.mps
index ffc0bdd40..d0e82fd29 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/editor.mps
@@ -41,7 +41,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" />
@@ -62,7 +62,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -86,7 +86,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/structure.mps
index a7bbff9fa..079aff69c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/structure.mps
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/typesystem.mps
index 435d1140b..e2e5fcbe4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/typesystem.mps
@@ -106,7 +106,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/util.mps
index 5df60ad67..3d5da9b00 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/models/util.mps
@@ -82,7 +82,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>
@@ -99,7 +99,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1214918975462" name="jetbrains.mps.baseLanguage.structure.PostfixDecrementExpression" flags="nn" index="3uO5VW" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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">
@@ -165,7 +165,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl
index fbf5c602a..9a4bd2c76 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.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" />
@@ -60,7 +60,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -77,7 +76,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/generator/template/main@generator.mps
index 619b36aac..fee9e7b10 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/generator/template/main@generator.mps
@@ -59,7 +59,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -77,6 +77,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -117,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>
@@ -139,7 +140,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="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" />
@@ -301,7 +301,7 @@
                         <node concept="3clFbF" id="Kom1UADvvE" role="3cqZAp">
                           <node concept="2OqwBi" id="Kom1UADvJB" role="3clFbG">
                             <node concept="37vLTw" id="Kom1UADvvD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Kom1UADvqG" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dt_" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="Kom1UADw3_" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -309,9 +309,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="Kom1UADvqG" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dt_" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="Kom1UADvqH" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DtA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/behavior.mps
index e2aa69390..159f21e4d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/behavior.mps
@@ -111,7 +111,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,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">
@@ -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" />
@@ -227,7 +228,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -252,7 +253,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" />
@@ -701,7 +701,7 @@
                       <node concept="3JPx81" id="_wUu$TZxaC" role="2OqNvi">
                         <node concept="2OqwBi" id="_wUu$TZxAO" role="25WWJ7">
                           <node concept="37vLTw" id="_wUu$TZxog" role="2Oq$k0">
-                            <ref role="3cqZAo" node="_wUu$TZrfY" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dtu" resolve="it" />
                           </node>
                           <node concept="2yIwOk" id="_wUu$TZxYK" role="2OqNvi" />
                         </node>
@@ -709,9 +709,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="_wUu$TZrfY" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dtu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="_wUu$TZrfZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dtv" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/constraints.mps
index 33c1867ba..6cc05087f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/constraints.mps
@@ -70,7 +70,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,6 +105,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -175,7 +176,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -186,7 +187,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -298,7 +298,7 @@
                         <node concept="2OqwBi" id="25Ap4XX$GFY" role="3clFbG">
                           <node concept="2OqwBi" id="25Ap4XX$GFZ" role="2Oq$k0">
                             <node concept="37vLTw" id="25Ap4XX$GG0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="25Ap4XX$GG4" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dtw" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="25Ap4XX$GG1" role="2OqNvi" />
                           </node>
@@ -310,9 +310,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="25Ap4XX$GG4" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dtw" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="25Ap4XX$GG5" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dtx" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -396,7 +396,7 @@
                           <node concept="2OqwBi" id="6hWVnwAN5jw" role="3uHU7w">
                             <node concept="2OqwBi" id="6hWVnwAMY2i" role="2Oq$k0">
                               <node concept="37vLTw" id="6hWVnwAMXhO" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1gJVC85UGFx" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dty" resolve="it" />
                               </node>
                               <node concept="2yIwOk" id="6hWVnwAN4UD" role="2OqNvi" />
                             </node>
@@ -409,7 +409,7 @@
                           <node concept="2OqwBi" id="1gJVC85UHZw" role="3uHU7B">
                             <node concept="2OqwBi" id="1gJVC85UH7o" role="2Oq$k0">
                               <node concept="37vLTw" id="1gJVC85UGPp" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1gJVC85UGFx" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dty" resolve="it" />
                               </node>
                               <node concept="2yIwOk" id="1gJVC85UHqW" role="2OqNvi" />
                             </node>
@@ -422,9 +422,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1gJVC85UGFx" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dty" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1gJVC85UGFy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dtz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
index 9acfc66c5..56e9ae16a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
@@ -65,7 +65,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>
@@ -75,7 +75,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -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" />
@@ -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>
@@ -242,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>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/intentions.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/intentions.mps
index f106d699f..0c8ea4f4c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/intentions.mps
@@ -55,7 +55,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/plugin.mps
index fa01a0f61..5c33ba750 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/plugin.mps
@@ -41,7 +41,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" />
@@ -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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/structure.mps
index 353183071..985d4ca72 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/structure.mps
@@ -71,7 +71,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/textGen.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/textGen.mps
index 73138e909..2fa55cd73 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/textGen.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/textGen.mps
@@ -121,7 +121,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/typesystem.mps
index 4ff07f91f..98db85cc8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/typesystem.mps
@@ -89,7 +89,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/util.mps
index 4f2090fc3..5828851ea 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/util.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -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>
@@ -73,7 +73,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -97,7 +97,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/com.mbeddr.formal.nuxmv.source.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/com.mbeddr.formal.nuxmv.source.mpl
index 617dca461..376a035ba 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/com.mbeddr.formal.nuxmv.source.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/com.mbeddr.formal.nuxmv.source.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">bf72618c-958a-47f5-9aac-3eff98d79ffd(com.mbeddr.formal.nusmv.source)</dependency>
   </dependencies>
@@ -19,7 +18,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/models/com.mbeddr.formal.nuxmv.source.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/models/com.mbeddr.formal.nuxmv.source.structure.mps
index 4675903d7..ddd72acc5 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/models/com.mbeddr.formal.nuxmv.source.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/models/com.mbeddr.formal.nuxmv.source.structure.mps
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/com.mbeddr.formal.nuxmv.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/com.mbeddr.formal.nuxmv.mpl
index 605435e4d..8739e190c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/com.mbeddr.formal.nuxmv.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/com.mbeddr.formal.nuxmv.mpl
@@ -11,12 +11,11 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.editor.mps
index e95073294..f0e5503ba 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.editor.mps
@@ -16,7 +16,7 @@
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </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="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.structure.mps
index a48e292ed..5210bb11c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.textGen.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.textGen.mps
index 67115a751..926ea128f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.textGen.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/models/com.mbeddr.formal.nuxmv.textGen.mps
@@ -22,7 +22,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
index 482d3f54c..3b9102d2d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps
index dc0fc3077..22294f837 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps
@@ -91,7 +91,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,7 +103,7 @@
         <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">
@@ -112,6 +112,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -185,7 +186,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -196,7 +197,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
     </language>
@@ -807,7 +807,7 @@
                           <node concept="2OqwBi" id="70K71XXibjX" role="JncvB">
                             <node concept="2OqwBi" id="70K71XXiaBr" role="2Oq$k0">
                               <node concept="37vLTw" id="70K71XXia3d" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1QMZQ047zu$" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DtD" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70K71XXiaX0" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hqls:1QMZQ03TlhH" resolve="include" />
@@ -848,9 +848,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1QMZQ047zu$" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DtD" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1QMZQ047zu_" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DtE" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -956,7 +956,7 @@
                           <node concept="2OqwBi" id="70K71XXiBAy" role="JncvB">
                             <node concept="2OqwBi" id="70K71XXiBAz" role="2Oq$k0">
                               <node concept="37vLTw" id="70K71XXiBA$" role="2Oq$k0">
-                                <ref role="3cqZAo" node="70K71XXiBAN" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DtF" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="70K71XXiBA_" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hqls:1QMZQ03TlhH" resolve="include" />
@@ -997,9 +997,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="70K71XXiBAN" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DtF" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="70K71XXiBAO" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DtG" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1105,7 +1105,7 @@
                           <node concept="2OqwBi" id="7o011GVZths" role="JncvB">
                             <node concept="2OqwBi" id="7o011GVZtht" role="2Oq$k0">
                               <node concept="37vLTw" id="7o011GVZthu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7o011GVZthH" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DtH" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7o011GVZthv" role="2OqNvi">
                                 <ref role="3Tt5mk" to="hqls:1QMZQ03TlhH" resolve="include" />
@@ -1146,9 +1146,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="7o011GVZthH" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DtH" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7o011GVZthI" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DtI" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.constraints.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.constraints.mps
index 75d5286fd..9a9212d37 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.constraints.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.constraints.mps
@@ -80,7 +80,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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" />
@@ -183,7 +183,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
index 613b5a2e2..e1f81b141 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
@@ -59,7 +59,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" />
@@ -82,7 +82,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -151,6 +151,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>
@@ -215,7 +216,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>
@@ -773,7 +773,7 @@
                             <node concept="17R0WA" id="6rqy6_PEt4K" role="3clFbG">
                               <node concept="2OqwBi" id="6rqy6_PEt4L" role="3uHU7B">
                                 <node concept="37vLTw" id="6rqy6_PEt4M" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6rqy6_PEt4P" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DtJ" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6rqy6_PEt4N" role="2OqNvi">
                                   <ref role="3Tt5mk" to="hqls:3WeLjIxUQbH" resolve="component" />
@@ -797,9 +797,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6rqy6_PEt4P" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DtJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6rqy6_PEt4Q" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DtK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.structure.mps
index 48063c8c1..cdc763354 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.structure.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.structure.mps
@@ -66,7 +66,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.textGen.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.textGen.mps
index a6bd89df3..4ad925485 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.textGen.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.textGen.mps
@@ -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/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
index fab5ee40c..3a4f35a4b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.ocra.sandbox" uuid="27594dbf-9414-466f-919a-5664359763fb" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.ocra.sandbox" uuid="27594dbf-9414-466f-919a-5664359763fb" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
index d9502b0a6..4eca2201c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
@@ -180,7 +180,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd
index ade8836d4..57e094f72 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.base.activity.sandbox" uuid="95eba2ba-765c-4d69-9158-d4e672c62c35" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.base.activity.sandbox" uuid="95eba2ba-765c-4d69-9158-d4e672c62c35" moduleVersion="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:58f09ba8-d272-44ef-a234-d73536c6b2d9:com.fasten.base.activity" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
index 3798f7c6b..ead5128d9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
@@ -34,7 +34,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd
index d1f6aeeb2..09fd20637 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.base.msc.sandbox" uuid="b8c41a4e-0df8-4bb0-82d1-18397b189c6c" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.base.msc.sandbox" uuid="b8c41a4e-0df8-4bb0-82d1-18397b189c6c" moduleVersion="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:81f6a079-965e-4523-87c3-8e6194f66585:com.fasten.base.msc" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/models/com.fasten.base.msc.sandbox._010_simple_standalone_msc.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/models/com.fasten.base.msc.sandbox._010_simple_standalone_msc.mps
index 7352e278f..37d53f411 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/models/com.fasten.base.msc.sandbox._010_simple_standalone_msc.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/models/com.fasten.base.msc.sandbox._010_simple_standalone_msc.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd
index 78c73ed40..3a34d746c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.base.operatorspanel.rt" uuid="4bf9a860-39c9-4cb2-8004-157a961bf42c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.base.operatorspanel.rt" uuid="4bf9a860-39c9-4cb2-8004-157a961bf42c" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib/jfreechart-1.5.3.jar!/" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib/jfreechart-1.5.3.jar!/">
       <sourceRoot location="." />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="jfreechart-1.5.3.jar" />
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="no">
+    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/jfreechart-1.5.3.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/jfreechart-1.5.3.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd
index 51c0226c5..cae589616 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.base.pluginSolution" uuid="945808cb-09a0-4d70-9f2a-186b7f5c6219" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.base.pluginSolution" uuid="945808cb-09a0-4d70-9f2a-186b7f5c6219" moduleVersion="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">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -30,11 +29,11 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l: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" />
@@ -55,7 +54,6 @@
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps
index a14dd35a7..ddd37186a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps
@@ -2,12 +2,12 @@
 <model ref="r:896eeadf-a850-400e-b516-f92dfb5b5cd9(com.mbeddr.formal.base.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="58e731a3-6aaa-444a-bf40-801b91c15878" name="com.mbeddr.mpsutil.lang.plugin.extensions" 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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -104,7 +104,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>
@@ -143,7 +143,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">
@@ -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>
@@ -283,7 +283,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">
@@ -328,6 +328,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" />
@@ -337,7 +338,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>
@@ -379,7 +380,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -424,7 +425,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
@@ -1085,13 +1085,13 @@
                                   <ref role="37wK5l" node="2DKZaNk2FmX" resolve="FASTENStructureViewModel.Presentation" />
                                   <node concept="2OqwBi" id="2DKZaNke9ZQ" role="37wK5m">
                                     <node concept="37vLTw" id="2DKZaNk38de" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2DKZaNk36O9" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1DtM" resolve="it" />
                                     </node>
                                     <node concept="iZEcu" id="2DKZaNkeal4" role="2OqNvi" />
                                   </node>
                                   <node concept="2OqwBi" id="2DKZaNke6LD" role="37wK5m">
                                     <node concept="37vLTw" id="2DKZaNke6rt" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2DKZaNk36O9" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1DtM" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="2DKZaNke7et" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1104,7 +1104,7 @@
                                     <node concept="liA8E" id="2DKZaNkeOSI" role="2OqNvi">
                                       <ref role="37wK5l" to="sn11:192HKKPOd3m" resolve="getIconFor" />
                                       <node concept="37vLTw" id="2DKZaNkePp4" role="37wK5m">
-                                        <ref role="3cqZAo" node="2DKZaNk36O9" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36D1DtM" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -1112,9 +1112,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2DKZaNk36O9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1DtM" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2DKZaNk36Oa" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1DtN" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1143,7 +1143,7 @@
                   <node concept="3clFbF" id="4w58iiKvGu3" role="3cqZAp">
                     <node concept="2OqwBi" id="4w58iiKvGDf" role="3clFbG">
                       <node concept="37vLTw" id="4w58iiKvGu2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4w58iiKvGga" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1DtO" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4w58iiKvGRM" role="2OqNvi">
                         <ref role="37wK5l" to="2ymi:~ModelListener.onModelChanged()" resolve="onModelChanged" />
@@ -1151,9 +1151,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4w58iiKvGga" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DtO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4w58iiKvGgb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DtP" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
index 0090b7157..8773e6acd 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.base.tooling" uuid="e9ce245b-3106-45ed-8e5b-aff820d09b85" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.base.tooling" uuid="e9ce245b-3106-45ed-8e5b-aff820d09b85" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,12 +11,9 @@
   <facets>
     <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/swingx-core-1.6.2.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/swingx-core-1.6.2.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -41,14 +38,14 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l: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:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
index 400daeec0..f205548c8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -46,7 +46,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -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>
@@ -193,7 +193,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="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -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>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.project.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.project.mps
index 82765f617..04024255f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.project.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.project.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
@@ -74,7 +74,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,12 +90,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -110,7 +111,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>
@@ -121,7 +122,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -243,7 +243,7 @@
                     <node concept="2OqwBi" id="y1G8y66xb3" role="3clFbG">
                       <node concept="2OqwBi" id="y1G8y66xb4" role="2Oq$k0">
                         <node concept="37vLTw" id="y1G8y66xb5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="y1G8y66xb9" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1DtQ" resolve="it" />
                         </node>
                         <node concept="liA8E" id="y1G8y66xb6" role="2OqNvi">
                           <ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
@@ -258,9 +258,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="y1G8y66xb9" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DtQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="y1G8y66xba" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DtR" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.vcs.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.vcs.mps
index 14430a7e4..974f18cca 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.vcs.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/com.mbeddr.formal.base.tooling.vcs.mps
@@ -42,7 +42,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -51,13 +51,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
index 69e10f9cd..d444013a3 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
@@ -3,12 +3,12 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -60,7 +60,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -185,7 +185,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>
@@ -213,7 +213,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">
@@ -287,7 +287,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
index 2bfba658c..6722ea947 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
@@ -124,7 +124,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>
@@ -144,7 +144,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">
@@ -193,7 +193,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps
index 330e7aa3f..77b555319 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.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" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -72,7 +72,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" />
@@ -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" />
@@ -98,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -118,7 +119,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -346,7 +346,7 @@
                       </node>
                       <node concept="2OqwBi" id="5a54bO_HjaK" role="3uHU7B">
                         <node concept="37vLTw" id="5a54bO_Hj0L" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5a54bO_HiVA" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1DtS" resolve="it" />
                         </node>
                         <node concept="liA8E" id="5a54bO_Hm5g" role="2OqNvi">
                           <ref role="37wK5l" node="5a54bO_HkLv" resolve="getAnalyzedNode" />
@@ -355,9 +355,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5a54bO_HiVA" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1DtS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5a54bO_HiVB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1DtT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -395,7 +395,7 @@
                         <node concept="3fqX7Q" id="5a54bO_HFcx" role="3uHU7w">
                           <node concept="2OqwBi" id="5a54bO_HFcy" role="3fr31v">
                             <node concept="37vLTw" id="5a54bO_HFcz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5a54bO_HFcE" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DtU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5a54bO_HFc$" role="2OqNvi">
                               <ref role="37wK5l" node="TJrbIN7moT" resolve="isSuccess" />
@@ -405,7 +405,7 @@
                         <node concept="3clFbC" id="5a54bO_HFc_" role="3uHU7B">
                           <node concept="2OqwBi" id="5a54bO_HFcA" role="3uHU7B">
                             <node concept="37vLTw" id="5a54bO_HFcB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5a54bO_HFcE" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DtU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5a54bO_HFcC" role="2OqNvi">
                               <ref role="37wK5l" node="5a54bO_HkLv" resolve="getAnalyzedNode" />
@@ -418,9 +418,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5a54bO_HFcE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DtU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5a54bO_HFcF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DtV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
index 93b52d120..df816e2fc 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
@@ -2,7 +2,7 @@
 <model ref="r:a3aca88b-58e4-4e34-884c-ec641c87bfca(com.mbeddr.formal.base.tooling.results_ui)">
   <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -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="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -188,7 +188,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>
@@ -213,7 +213,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">
@@ -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" />
@@ -264,7 +265,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -305,7 +306,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
@@ -3163,7 +3163,7 @@
                       <node concept="2OqwBi" id="5PkarIFWnf3" role="3clFbG">
                         <node concept="2OqwBi" id="5PkarIFWnf4" role="2Oq$k0">
                           <node concept="37vLTw" id="5PkarIFWnf5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5PkarIFWnf9" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DtW" resolve="it" />
                           </node>
                           <node concept="2OwXpG" id="5PkarIFWnf6" role="2OqNvi">
                             <ref role="2Oxat5" node="6A1xE5OnF1x" resolve="name" />
@@ -3178,9 +3178,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5PkarIFWnf9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DtW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5PkarIFWnfa" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DtX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3432,6 +3432,9 @@
                 <property role="TrG5h" value="c" />
                 <node concept="3uibUv" id="6A1xE5OotUF" role="1tU5fm">
                   <ref role="3uigEE" node="6A1xE5OnDhk" resolve="AnalysesResultsTreeTableModel.Category" />
+                  <node concept="3uibUv" id="2hED36D6ovk" role="11_B2D">
+                    <ref role="3uigEE" to="c9r8:TJrbIN7de$" resolve="IAnalysisResult" />
+                  </node>
                 </node>
                 <node concept="1eOMI4" id="6A1xE5OotUI" role="33vP2m">
                   <node concept="10QFUN" id="6A1xE5OotUJ" role="1eOMHV">
@@ -3521,7 +3524,7 @@
                                 <node concept="3clFbF" id="7x_ml6$JYRF" role="3cqZAp">
                                   <node concept="2OqwBi" id="7x_ml6$JYRG" role="3clFbG">
                                     <node concept="37vLTw" id="7x_ml6$JYRH" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7x_ml6$JYRJ" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1DtY" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="7x_ml6$JYRI" role="2OqNvi">
                                       <ref role="37wK5l" to="c9r8:TJrbIN7jlD" resolve="isRuntimeError" />
@@ -3529,9 +3532,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7x_ml6$JYRJ" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1DtY" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7x_ml6$JYRK" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1DtZ" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3562,7 +3565,7 @@
                                       <node concept="3clFbF" id="7x_ml6$IBeT" role="3cqZAp">
                                         <node concept="2OqwBi" id="7x_ml6$IBeU" role="3clFbG">
                                           <node concept="37vLTw" id="7x_ml6$IBeV" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7x_ml6$IBeX" resolve="it" />
+                                            <ref role="3cqZAo" node="2hED36D1Du0" resolve="it" />
                                           </node>
                                           <node concept="liA8E" id="7x_ml6$IBeW" role="2OqNvi">
                                             <ref role="37wK5l" to="c9r8:TJrbIN7mu6" resolve="isFail" />
@@ -3570,9 +3573,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="7x_ml6$IBeX" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2hED36D1Du0" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="7x_ml6$IBeY" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2hED36D1Du1" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -3618,7 +3621,7 @@
                                 <node concept="3clFbF" id="7x_ml6$K5np" role="3cqZAp">
                                   <node concept="2OqwBi" id="7x_ml6$K5nq" role="3clFbG">
                                     <node concept="37vLTw" id="7x_ml6$K5nr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7x_ml6$K5nt" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Du2" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="7x_ml6$K5ns" role="2OqNvi">
                                       <ref role="37wK5l" to="c9r8:TJrbIN7mu6" resolve="isFail" />
@@ -3626,9 +3629,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7x_ml6$K5nt" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Du2" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7x_ml6$K5nu" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Du3" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3657,7 +3660,7 @@
                                 <node concept="3clFbF" id="7x_ml6$KaoB" role="3cqZAp">
                                   <node concept="2OqwBi" id="7x_ml6$KaoC" role="3clFbG">
                                     <node concept="37vLTw" id="7x_ml6$KaoD" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7x_ml6$KaoF" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Du4" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="7x_ml6$KaoE" role="2OqNvi">
                                       <ref role="37wK5l" to="c9r8:TJrbIN7_ae" resolve="isUnknown" />
@@ -3665,9 +3668,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7x_ml6$KaoF" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Du4" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7x_ml6$KaoG" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Du5" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3696,7 +3699,7 @@
                                 <node concept="3clFbF" id="7x_ml6$KePx" role="3cqZAp">
                                   <node concept="2OqwBi" id="7x_ml6$KePy" role="3clFbG">
                                     <node concept="37vLTw" id="7x_ml6$KePz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7x_ml6$KeP_" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Du6" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="7x_ml6$KeP$" role="2OqNvi">
                                       <ref role="37wK5l" to="c9r8:TJrbIN7_fe" resolve="isCancel" />
@@ -3704,9 +3707,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7x_ml6$KeP_" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Du6" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7x_ml6$KePA" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Du7" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3735,7 +3738,7 @@
                                 <node concept="3clFbF" id="7x_ml6$KjjV" role="3cqZAp">
                                   <node concept="2OqwBi" id="7x_ml6$KjjW" role="3clFbG">
                                     <node concept="37vLTw" id="7x_ml6$KjjX" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7x_ml6$KjjZ" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Du8" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="7x_ml6$KjjY" role="2OqNvi">
                                       <ref role="37wK5l" to="c9r8:TJrbIN7_vE" resolve="isTimeout" />
@@ -3743,9 +3746,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="7x_ml6$KjjZ" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Du8" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="7x_ml6$Kjk0" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Du9" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -3776,7 +3779,7 @@
                                     <node concept="3fqX7Q" id="7x_ml6$MVPm" role="3clFbG">
                                       <node concept="2OqwBi" id="7x_ml6$MVPn" role="3fr31v">
                                         <node concept="37vLTw" id="7x_ml6$MVPo" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7x_ml6$MVPq" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36D1Dua" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="7x_ml6$MVPp" role="2OqNvi">
                                           <ref role="37wK5l" to="c9r8:TJrbIN7moT" resolve="isSuccess" />
@@ -3785,9 +3788,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7x_ml6$MVPq" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1Dua" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7x_ml6$MVPr" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1Dub" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3838,7 +3841,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="2SXNNz54Lgv" role="3uHU7w">
                                         <node concept="37vLTw" id="2SXNNz54Lgw" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2SXNNz54Hzf" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36D1Duc" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="TJrbIN8jaj" role="2OqNvi">
                                           <ref role="37wK5l" to="c9r8:TJrbIN8g0Y" resolve="getTimeInMillis" />
@@ -3848,9 +3851,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="2SXNNz54Hzf" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36D1Duc" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="2SXNNz54Hzg" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36D1Dud" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -4626,14 +4629,14 @@
                     <node concept="1rXfSq" id="5PkarIFWy1E" role="3clFbG">
                       <ref role="37wK5l" node="5PkarIFWnfO" resolve="doAppendAnalysisResult" />
                       <node concept="37vLTw" id="5PkarIFWy8j" role="37wK5m">
-                        <ref role="3cqZAo" node="5PkarIFWxYR" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Due" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5PkarIFWxYR" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Due" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5PkarIFWxYS" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Duf" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
index e94896bda..1f5ee31a9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -115,7 +115,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>
@@ -137,7 +137,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -175,6 +175,7 @@
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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 @@
         <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>
@@ -248,7 +249,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" />
@@ -401,7 +401,7 @@
                     <node concept="3clFbF" id="6PRHFscQOHN" role="3cqZAp">
                       <node concept="2OqwBi" id="6PRHFscQOQi" role="3clFbG">
                         <node concept="37vLTw" id="6PRHFscQOHM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6PRHFscQOAN" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dug" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6PRHFscQP7z" role="2OqNvi">
                           <ref role="37wK5l" node="3fsZMFLMFZc" resolve="canSimulateNode" />
@@ -412,9 +412,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6PRHFscQOAN" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dug" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6PRHFscQOAO" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Duh" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -425,7 +425,7 @@
                   <node concept="3clFbF" id="6PRHFscQQ_V" role="3cqZAp">
                     <node concept="2OqwBi" id="6PRHFscQQHy" role="3clFbG">
                       <node concept="37vLTw" id="6PRHFscQQ_U" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6PRHFscQQwd" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dui" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6PRHFscQR1J" role="2OqNvi">
                         <ref role="37wK5l" node="3fsZMFLIaEc" resolve="reset" />
@@ -439,9 +439,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6PRHFscQQwd" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dui" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6PRHFscQQwe" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Duj" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1363,15 +1363,15 @@
                         <node concept="3clFbF" id="2xeYpNCzYSN" role="3cqZAp">
                           <node concept="2OqwBi" id="2xeYpNCzYSO" role="3clFbG">
                             <node concept="37vLTw" id="2xeYpNCzYSP" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2xeYpNCzYSR" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Duk" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="2xeYpNCzYSQ" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2xeYpNCzYSR" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Duk" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2xeYpNCzYSS" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dul" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
index 427204f5b..da308da5c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
@@ -2,7 +2,7 @@
 <model ref="r:d71bd9ec-2dae-496f-9887-8fb9facf61b7(com.mbeddr.formal.base.tooling.tools)">
   <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="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -41,7 +41,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -162,7 +162,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -187,7 +187,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -226,6 +226,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" />
@@ -259,7 +260,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -299,7 +300,6 @@
         <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
@@ -807,7 +807,7 @@
                           <node concept="liA8E" id="4CtHBqNls$z" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                             <node concept="37vLTw" id="4CtHBqNls$$" role="37wK5m">
-                              <ref role="3cqZAo" node="4CtHBqNls$B" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dum" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -820,9 +820,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4CtHBqNls$B" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dum" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4CtHBqNls$C" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dun" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -876,7 +876,7 @@
                           <node concept="liA8E" id="4CtHBqNls_1" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                             <node concept="37vLTw" id="4CtHBqNls_2" role="37wK5m">
-                              <ref role="3cqZAo" node="4CtHBqNls_5" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Duo" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -889,9 +889,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4CtHBqNls_5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Duo" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4CtHBqNls_6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dup" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1657,15 +1657,15 @@
                               <node concept="liA8E" id="1mocVhABLTE" role="2OqNvi">
                                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                 <node concept="37vLTw" id="1mocVhABMx9" role="37wK5m">
-                                  <ref role="3cqZAo" node="1mocVhABLE_" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Duq" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1mocVhABLE_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Duq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1mocVhABLEA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dur" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1716,15 +1716,15 @@
                               <node concept="liA8E" id="1mocVhABWZU" role="2OqNvi">
                                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                 <node concept="37vLTw" id="1mocVhABWZV" role="37wK5m">
-                                  <ref role="3cqZAo" node="1mocVhABWZW" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dus" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1mocVhABWZW" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dus" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1mocVhABWZX" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dut" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/ui.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/ui.mps
index f1446688c..c0f91ba38 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/ui.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/ui.mps
@@ -2,7 +2,7 @@
 <model ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)">
   <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="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" />
@@ -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="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -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>
@@ -246,7 +246,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -290,6 +290,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -340,7 +341,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -386,7 +387,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
@@ -2812,7 +2812,7 @@
                   <node concept="3clFbF" id="696iakCBxd" role="3cqZAp">
                     <node concept="2OqwBi" id="696iakCBBH" role="3clFbG">
                       <node concept="37vLTw" id="696iakCBxc" role="2Oq$k0">
-                        <ref role="3cqZAo" node="696iakCBq5" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Duu" resolve="it" />
                       </node>
                       <node concept="liA8E" id="696iakCHYm" role="2OqNvi">
                         <ref role="37wK5l" to="f4zo:~EditorCell.relayout()" resolve="relayout" />
@@ -2820,9 +2820,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="696iakCBq5" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Duu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="696iakCBq6" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Duv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2851,7 +2851,7 @@
                       </node>
                       <node concept="2OqwBi" id="7SQqK0Fk5KA" role="33vP2m">
                         <node concept="37vLTw" id="7SQqK0Fk5KB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7SQqK0Fdk4V" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Duw" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7SQqK0Fk5KC" role="2OqNvi">
                           <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent()" resolve="getComponent" />
@@ -2939,9 +2939,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7SQqK0Fdk4V" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Duw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7SQqK0Fdk4W" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dux" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4602,7 +4602,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5FTX57fMJ4l" role="33vP2m">
                                     <node concept="37vLTw" id="5FTX57fMJ4m" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5FTX57fMJ4R" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1Duy" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="5FTX57fMJ4n" role="2OqNvi">
                                       <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent()" resolve="getComponent" />
@@ -4690,9 +4690,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5FTX57fMJ4R" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36D1Duy" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5FTX57fMJ4S" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36D1Duz" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/com.mbeddr.formal.nusmv.build.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/com.mbeddr.formal.nusmv.build.msd
index 43ab369eb..a72defa74 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/com.mbeddr.formal.nusmv.build.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/com.mbeddr.formal.nusmv.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.build" uuid="7125ed76-a460-4b0f-b95b-a899f99488d6" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.build" uuid="7125ed76-a460-4b0f-b95b-a899f99488d6" moduleVersion="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>
@@ -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:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
index 82ed16590..b347ad7da 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
@@ -85,7 +85,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">
@@ -122,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -162,7 +162,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>
@@ -733,7 +732,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.lib" />
         <property role="3LESm3" value="71bb25aa-20fa-4c18-8954-1b176576f52d" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="6hyv0iVPlHB" role="3LF7KH">
           <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
           <node concept="2Ry0Ak" id="6hyv0iVPlUt" role="iGT6I">
@@ -4028,26 +4026,7 @@
                   <node concept="2Ry0Ak" id="IiE7lRnYjt" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="IiE7lRnYju" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-tree-7.0.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="IiE7lRnYjQ" role="3bR37C">
-          <node concept="1BurEX" id="IiE7lRnYjR" role="1SiIV1">
-            <node concept="398BVA" id="IiE7lRnYjD" role="1BurEY">
-              <ref role="398BVh" node="6mm$FLYQyYs" resolve="mbeddr.formal.nusmv.code" />
-              <node concept="2Ry0Ak" id="IiE7lRnYjE" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="IiE7lRnYjF" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.formal.nusmv.importer.rt" />
-                  <node concept="2Ry0Ak" id="IiE7lRnYjG" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="IiE7lRnYjH" role="2Ry0An">
-                      <property role="2Ry0Am" value="parboiled-java-1.3.0.jar" />
+                      <property role="2Ry0Am" value="asm-tree-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -4066,7 +4045,7 @@
                   <node concept="2Ry0Ak" id="IiE7lRnYjV" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="IiE7lRnYjW" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -4085,7 +4064,7 @@
                   <node concept="2Ry0Ak" id="IiE7lRnYka" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="IiE7lRnYkb" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-analysis-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-analysis-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -4104,7 +4083,7 @@
                   <node concept="2Ry0Ak" id="IiE7lRnYkp" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="IiE7lRnYkq" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-util-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-util-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -4123,7 +4102,7 @@
                   <node concept="2Ry0Ak" id="IiE7lRnYkC" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="IiE7lRnYkD" role="2Ry0An">
-                      <property role="2Ry0Am" value="parboiled-core-1.3.0.jar" />
+                      <property role="2Ry0Am" value="parboiled-core-1.4.1.jar" />
                     </node>
                   </node>
                 </node>
@@ -4136,6 +4115,25 @@
             <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
           </node>
         </node>
+        <node concept="1SiIV0" id="cyyxQXALyw" role="3bR37C">
+          <node concept="1BurEX" id="cyyxQXALyx" role="1SiIV1">
+            <node concept="398BVA" id="cyyxQXALyj" role="1BurEY">
+              <ref role="398BVh" node="6mm$FLYQyYs" resolve="mbeddr.formal.nusmv.code" />
+              <node concept="2Ry0Ak" id="cyyxQXALyk" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="cyyxQXALyl" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.formal.nusmv.importer.rt" />
+                  <node concept="2Ry0Ak" id="cyyxQXALym" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="cyyxQXALyn" role="2Ry0An">
+                      <property role="2Ry0Am" value="parboiled-java-1.4.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6adXBxxUwrY" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.rcp_patcher.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.rcp_patcher.mps
index c1a614b8f..e20973c47 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.rcp_patcher.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.rcp_patcher.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" />
   </languages>
   <imports>
     <import index="embf" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.jar(JDK/)" />
@@ -126,7 +126,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>
@@ -156,7 +156,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">
@@ -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>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
index 57a21cefd..36b6acc11 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.cbd.pluginSolution" uuid="0785c32a-102f-45a9-9367-99fd48b107eb" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.cbd.pluginSolution" uuid="0785c32a-102f-45a9-9367-99fd48b107eb" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="true">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
@@ -31,11 +30,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
index 117759c94..95c9dc4b2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
@@ -59,7 +59,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -177,7 +177,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>
@@ -205,7 +205,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">
@@ -260,6 +260,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -328,7 +329,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>
@@ -366,7 +367,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1205753243362" name="jetbrains.mps.baseLanguage.collections.structure.ChunkOperation" flags="nn" index="2WvAvU">
         <child id="1205753261887" name="length" index="2WvESB" />
@@ -780,7 +780,7 @@
                             <node concept="2OqwBi" id="24fsOzj$9_i" role="3clFbG">
                               <node concept="2OqwBi" id="24fsOzj$9_j" role="2Oq$k0">
                                 <node concept="37vLTw" id="24fsOzj$9_k" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="24fsOzj$9_p" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Du$" resolve="it" />
                                 </node>
                                 <node concept="2Rf3mk" id="24fsOzj$9_l" role="2OqNvi">
                                   <node concept="1xMEDy" id="24fsOzj$9_m" role="1xVPHs">
@@ -794,9 +794,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="24fsOzj$9_p" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Du$" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="24fsOzj$9_q" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Du_" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2507,7 +2507,7 @@
                         <node concept="2OqwBi" id="1EKbsQR13Nk" role="3clFbG">
                           <node concept="2OqwBi" id="1EKbsQR13Nl" role="2Oq$k0">
                             <node concept="37vLTw" id="1EKbsQR13Nm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1EKbsQR13Ns" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DuA" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1EKbsQR13Nn" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2525,9 +2525,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1EKbsQR13Ns" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DuA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1EKbsQR13Nt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DuB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2618,7 +2618,7 @@
                           <node concept="2OqwBi" id="1EKbsQR1m1c" role="3clFbG">
                             <node concept="2OqwBi" id="1EKbsQR1m1d" role="2Oq$k0">
                               <node concept="37vLTw" id="1EKbsQR1m1e" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1EKbsQR1m1k" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DuC" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="1EKbsQR1m1f" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2636,9 +2636,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1EKbsQR1m1k" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DuC" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1EKbsQR1m1l" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DuD" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3032,7 +3032,7 @@
                       <node concept="2OqwBi" id="1EKbsQRb7is" role="3clFbG">
                         <node concept="2OqwBi" id="1EKbsQRb7it" role="2Oq$k0">
                           <node concept="37vLTw" id="1EKbsQRb7iu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1EKbsQRb7i$" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuE" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1EKbsQRb7iv" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3050,9 +3050,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1EKbsQRb7i$" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1EKbsQRb7i_" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/plugin.mps
index f21cafaaa..3060eddb0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -43,6 +43,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" />
@@ -68,7 +69,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" />
@@ -77,7 +78,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -132,7 +133,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>
@@ -144,14 +145,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="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -180,7 +181,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -188,6 +189,7 @@
   <node concept="sE7Ow" id="6NmtaR23THu">
     <property role="TrG5h" value="CheckAGWithNUSMV" />
     <property role="2uzpH1" value="Check AG" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6NmtaR23THv" role="tncku">
       <node concept="3clFbS" id="6NmtaR23THw" role="2VODD2">
         <node concept="3cpWs8" id="7uk5GW4OOBd" role="3cqZAp">
@@ -401,6 +403,7 @@
   <node concept="sE7Ow" id="2l5A0OFaCQJ">
     <property role="TrG5h" value="CheckRefinement" />
     <property role="2uzpH1" value="Check Refinement" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2l5A0OFaCQK" role="tncku">
       <node concept="3clFbS" id="2l5A0OFaCQL" role="2VODD2">
         <node concept="3cpWs8" id="2l5A0OFaCQM" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
index 59bd06e6d..ac0a461b6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.importer.rt" uuid="18cd78f6-e870-412b-81e1-d3955c4ecc88" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.importer.rt" uuid="18cd78f6-e870-412b-81e1-d3955c4ecc88" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
-      <sourceRoot location="asm-tree-7.0.jar" />
-      <sourceRoot location="parboiled-java-1.3.0.jar" />
-      <sourceRoot location="asm-7.0.jar" />
-      <sourceRoot location="asm-analysis-7.0.jar" />
-      <sourceRoot location="asm-util-7.0.jar" />
-      <sourceRoot location="parboiled-core-1.3.0.jar" />
+    <modelRoot type="java_classes" contentPath="${module}/lib">
+      <sourceRoot location="asm-tree-9.2.jar" />
+      <sourceRoot location="parboiled-java-1.4.1.jar" />
+      <sourceRoot location="asm-9.2.jar" />
+      <sourceRoot location="asm-analysis-9.2.jar" />
+      <sourceRoot location="asm-util-9.2.jar" />
+      <sourceRoot location="parboiled-core-1.4.1.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/asm-tree-9.2.jar" />
+      <library location="${module}/lib/parboiled-java-1.4.1.jar" />
+      <library location="${module}/lib/asm-9.2.jar" />
+      <library location="${module}/lib/asm-analysis-9.2.jar" />
+      <library location="${module}/lib/asm-util-9.2.jar" />
+      <library location="${module}/lib/parboiled-core-1.4.1.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/asm-tree-7.0.jar" />
-    <stubModelEntry path="${module}/lib/parboiled-java-1.3.0.jar" />
-    <stubModelEntry path="${module}/lib/asm-7.0.jar" />
-    <stubModelEntry path="${module}/lib/asm-analysis-7.0.jar" />
-    <stubModelEntry path="${module}/lib/asm-util-7.0.jar" />
-    <stubModelEntry path="${module}/lib/parboiled-core-1.3.0.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
@@ -39,7 +36,7 @@
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" 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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -70,4 +67,3 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
-
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-7.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-7.0.jar
deleted file mode 100644
index 2cf38f461..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-7.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-9.2.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-9.2.jar
new file mode 100644
index 000000000..3557ae414
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-9.2.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-7.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-7.0.jar
deleted file mode 100644
index 341d0c5dc..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-7.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-9.2.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-9.2.jar
new file mode 100644
index 000000000..9d575ca1c
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-analysis-9.2.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-7.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-7.0.jar
deleted file mode 100644
index 243c3cbf2..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-7.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-9.2.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-9.2.jar
new file mode 100644
index 000000000..0a6833a68
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-tree-9.2.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-7.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-7.0.jar
deleted file mode 100644
index 47717e5d1..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-7.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-9.2.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-9.2.jar
new file mode 100644
index 000000000..3afe6e699
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/asm-util-9.2.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.3.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.3.0.jar
deleted file mode 100644
index 74c103e37..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.3.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.4.1.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.4.1.jar
new file mode 100644
index 000000000..27fd91b9f
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-core-1.4.1.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.3.0.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.3.0.jar
deleted file mode 100644
index 3c894067d..000000000
Binary files a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.3.0.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.4.1.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.4.1.jar
new file mode 100644
index 000000000..1c62c59e3
Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/lib/parboiled-java-1.4.1.jar differ
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
index 55ade18d5..b11bbe735 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
@@ -51,7 +51,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">
@@ -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>
@@ -197,7 +197,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">
@@ -233,6 +233,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -328,7 +329,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">
@@ -368,7 +369,6 @@
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -380,6 +380,55 @@
     <property role="TrG5h" value="NuSMVParser" />
     <property role="3GE5qa" value="parser" />
     <node concept="2tJIrI" id="5Yu7EhkmFEC" role="jymVt" />
+    <node concept="Wx3nA" id="5F2isghPo8r" role="jymVt">
+      <property role="TrG5h" value="INSTANCE" />
+      <node concept="3uibUv" id="5F2isghPo8u" role="1tU5fm">
+        <ref role="3uigEE" node="63Mqfg9ORDV" resolve="NuSMVParser" />
+      </node>
+      <node concept="10Nm6u" id="5F2isghPo8v" role="33vP2m" />
+      <node concept="3Tm6S6" id="5F2isghPo8t" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5F2isghNHBn" role="jymVt" />
+    <node concept="2YIFZL" id="5F2isghPdV5" role="jymVt">
+      <property role="TrG5h" value="getInstance" />
+      <node concept="3clFbS" id="5F2isghPdV7" role="3clF47">
+        <node concept="3clFbJ" id="5F2isghPdV8" role="3cqZAp">
+          <node concept="3clFbC" id="5F2isghPdV9" role="3clFbw">
+            <node concept="10Nm6u" id="5F2isghPdVa" role="3uHU7w" />
+            <node concept="37vLTw" id="5F2isghPdVb" role="3uHU7B">
+              <ref role="3cqZAo" node="5F2isghPo8r" resolve="INSTANCE" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="5F2isghPdVc" role="3clFbx">
+            <node concept="3clFbF" id="5F2isghPdVd" role="3cqZAp">
+              <node concept="37vLTI" id="5F2isghPdVe" role="3clFbG">
+                <node concept="37vLTw" id="5F2isghPdVf" role="37vLTJ">
+                  <ref role="3cqZAo" node="5F2isghPo8r" resolve="INSTANCE" />
+                </node>
+                <node concept="2YIFZM" id="5F2isghPdVg" role="37vLTx">
+                  <ref role="1Pybhc" to="6rs6:~Parboiled" resolve="Parboiled" />
+                  <ref role="37wK5l" to="6rs6:~Parboiled.createParser(java.lang.Class,java.lang.Object...)" resolve="createParser" />
+                  <node concept="3VsKOn" id="5F2isghPdVh" role="37wK5m">
+                    <ref role="3VsUkX" node="63Mqfg9ORDV" resolve="NuSMVParser" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5F2isghPdVi" role="3cqZAp" />
+        <node concept="3cpWs6" id="5F2isghPdVj" role="3cqZAp">
+          <node concept="37vLTw" id="5F2isghPdVk" role="3cqZAk">
+            <ref role="3cqZAo" node="5F2isghPo8r" resolve="INSTANCE" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5F2isghPdVm" role="3clF45">
+        <ref role="3uigEE" node="63Mqfg9ORDV" resolve="NuSMVParser" />
+      </node>
+      <node concept="3Tm1VV" id="5F2isghPdVl" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5F2isghNdJ7" role="jymVt" />
     <node concept="3clFb_" id="63Mqfg9Pg7i" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="NuSMV" />
@@ -2037,12 +2086,8 @@
             <node concept="3uibUv" id="5uReZOjGm4P" role="1tU5fm">
               <ref role="3uigEE" node="63Mqfg9ORDV" resolve="NuSMVParser" />
             </node>
-            <node concept="2YIFZM" id="5uReZOjFDGe" role="33vP2m">
-              <ref role="1Pybhc" to="6rs6:~Parboiled" resolve="Parboiled" />
-              <ref role="37wK5l" to="6rs6:~Parboiled.createParser(java.lang.Class,java.lang.Object...)" resolve="createParser" />
-              <node concept="3VsKOn" id="5uReZOjFDGf" role="37wK5m">
-                <ref role="3VsUkX" node="63Mqfg9ORDV" resolve="NuSMVParser" />
-              </node>
+            <node concept="1rXfSq" id="5F2isghPDYc" role="33vP2m">
+              <ref role="37wK5l" node="5F2isghPdV5" resolve="getInstance" />
             </node>
           </node>
         </node>
@@ -3216,7 +3261,7 @@
                               <node concept="2OqwBi" id="2H74AM1Fzrw" role="3clFbG">
                                 <node concept="2OqwBi" id="2H74AM1Fzrx" role="2Oq$k0">
                                   <node concept="37vLTw" id="2H74AM1Fzry" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2H74AM1FzrC" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1DuG" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="2H74AM1Fzrz" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3236,9 +3281,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="2H74AM1FzrC" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1DuG" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2H74AM1FzrD" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1DuH" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -3756,7 +3801,7 @@
                       <node concept="2OqwBi" id="2H74AM1I4ZU" role="3clFbG">
                         <node concept="2OqwBi" id="2H74AM1I4ZV" role="2Oq$k0">
                           <node concept="37vLTw" id="2H74AM1I4ZW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2H74AM1I502" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuI" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2H74AM1I4ZX" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:hqLvdgl" resolve="resolveInfo" />
@@ -3771,9 +3816,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2H74AM1I502" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2H74AM1I503" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3843,7 +3888,7 @@
                       <node concept="2OqwBi" id="2H74AM1I50x" role="3clFbG">
                         <node concept="2OqwBi" id="2H74AM1I50y" role="2Oq$k0">
                           <node concept="37vLTw" id="2H74AM1I50z" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2H74AM1I50D" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuK" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2H74AM1I50$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:hqLvdgl" resolve="resolveInfo" />
@@ -3858,9 +3903,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2H74AM1I50D" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2H74AM1I50E" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3930,7 +3975,7 @@
                       <node concept="2OqwBi" id="2H74AM1I518" role="3clFbG">
                         <node concept="2OqwBi" id="2H74AM1I519" role="2Oq$k0">
                           <node concept="37vLTw" id="2H74AM1I51a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2H74AM1I51g" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuM" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2H74AM1I51b" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3945,9 +3990,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2H74AM1I51g" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2H74AM1I51h" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4020,7 +4065,7 @@
                       <node concept="2OqwBi" id="41M_24miwn0" role="3clFbG">
                         <node concept="2OqwBi" id="41M_24miwn1" role="2Oq$k0">
                           <node concept="37vLTw" id="41M_24miwn2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="41M_24miwn6" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuO" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="41M_24miwn3" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -4035,9 +4080,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="41M_24miwn6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="41M_24miwn7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4120,7 +4165,7 @@
                       <node concept="2OqwBi" id="2H74AM1JPDb" role="3clFbG">
                         <node concept="2OqwBi" id="2H74AM1JPDc" role="2Oq$k0">
                           <node concept="37vLTw" id="2H74AM1JPDd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2H74AM1JPDh" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuQ" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2H74AM1JPDe" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:hqLvdgl" resolve="resolveInfo" />
@@ -4135,9 +4180,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2H74AM1JPDh" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuQ" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2H74AM1JPDi" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuR" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4196,7 +4241,7 @@
                       <node concept="2OqwBi" id="2H74AM1JPDG" role="3clFbG">
                         <node concept="2OqwBi" id="2H74AM1JPDH" role="2Oq$k0">
                           <node concept="37vLTw" id="2H74AM1JPDI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2H74AM1JPDM" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DuS" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2H74AM1JPDJ" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:hqLvdgl" resolve="resolveInfo" />
@@ -4211,9 +4256,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2H74AM1JPDM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DuS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2H74AM1JPDN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DuT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
index 0a4f28271..a0d409a30 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.pluginSolution" uuid="692c2a6d-09c5-40f7-98f0-1f4b59860c1b" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.pluginSolution" uuid="692c2a6d-09c5-40f7-98f0-1f4b59860c1b" moduleVersion="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">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -38,13 +37,13 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/com.mbeddr.formal.nusmv.pluginSolution.msc.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/com.mbeddr.formal.nusmv.pluginSolution.msc.mps
index b50dbb283..408dc5a05 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/com.mbeddr.formal.nusmv.pluginSolution.msc.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/com.mbeddr.formal.nusmv.pluginSolution.msc.mps
@@ -43,7 +43,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -139,7 +139,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -161,7 +161,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -187,6 +187,7 @@
       <concept id="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" />
@@ -231,7 +232,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -259,7 +260,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -376,7 +376,7 @@
                                   <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
                                   <node concept="WxPPo" id="7eXh0gmQhwL" role="28ntcv">
                                     <node concept="37vLTw" id="6f7vJBUj6C2" role="WxPPp">
-                                      <ref role="3cqZAo" node="1wencriP3af" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36D1DuU" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -394,7 +394,7 @@
                             </node>
                             <node concept="3EllGN" id="1wencriP5gH" role="37vLTJ">
                               <node concept="37vLTw" id="1wencriP5x4" role="3ElVtu">
-                                <ref role="3cqZAo" node="1wencriP3af" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1DuU" resolve="it" />
                               </node>
                               <node concept="37vLTw" id="1wencriP4Tv" role="3ElQJh">
                                 <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
@@ -403,9 +403,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1wencriP3af" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1DuU" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1wencriP3ag" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1DuV" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -577,7 +577,7 @@
                                     <node concept="2OqwBi" id="6f7vJBUkCiP" role="3clFbG">
                                       <node concept="2OqwBi" id="6f7vJBUkCiQ" role="2Oq$k0">
                                         <node concept="37vLTw" id="6f7vJBUkCiR" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6f7vJBUkCiV" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36D1DuW" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="6f7vJBUkCiS" role="2OqNvi">
                                           <ref role="37wK5l" to="4c75:1ZsZb$iUjw_" resolve="getLhsString" />
@@ -592,9 +592,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6f7vJBUkCiV" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36D1DuW" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6f7vJBUkCiW" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36D1DuX" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
index 6ba9d9b19..bee9ef5ad 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
@@ -2,12 +2,12 @@
 <model ref="r:c064a266-9199-4619-9d01-bcf72fc239bc(com.mbeddr.formal.nusmv.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" 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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
@@ -67,6 +67,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -105,7 +106,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -114,7 +115,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>
@@ -143,7 +144,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">
@@ -242,7 +243,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -262,7 +263,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="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
@@ -278,6 +279,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 +289,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -333,7 +335,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>
@@ -362,7 +364,6 @@
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -381,6 +382,7 @@
   <node concept="sE7Ow" id="6NmtaR23THu">
     <property role="TrG5h" value="RunNUSMVOnSystem" />
     <property role="2uzpH1" value="Run NuSMV" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6NmtaR23THv" role="tncku">
       <node concept="3clFbS" id="6NmtaR23THw" role="2VODD2">
         <node concept="3cpWs8" id="7uk5GW4OOBd" role="3cqZAp">
@@ -623,7 +625,7 @@
                     <node concept="3clFbF" id="6xNJt7lKWd8" role="3cqZAp">
                       <node concept="2OqwBi" id="6xNJt7lKZv2" role="3clFbG">
                         <node concept="37vLTw" id="6xNJt7lKZ6o" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6xNJt7lKVUw" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dv2" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="6xNJt7lL0Am" role="2OqNvi">
                           <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
@@ -631,9 +633,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6xNJt7lKVUw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dv2" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6xNJt7lKVUx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dv3" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1139,6 +1141,7 @@
   <node concept="sE7Ow" id="1ZsZb$iM_jl">
     <property role="TrG5h" value="RunNUSMVOnTestCase" />
     <property role="2uzpH1" value="Run NuSMV on Test-Case" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1ZsZb$iM_jm" role="tncku">
       <node concept="3clFbS" id="1ZsZb$iM_jn" role="2VODD2">
         <node concept="3cpWs8" id="1ZsZb$iM_jo" role="3cqZAp">
@@ -1453,6 +1456,7 @@
   <node concept="sE7Ow" id="6mm$FLZ2PnF">
     <property role="TrG5h" value="RunNUSMVOnTestCollection" />
     <property role="2uzpH1" value="Run NuSMV on Test-Collection" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6mm$FLZ2PnG" role="tncku">
       <node concept="3clFbS" id="6mm$FLZ2PnH" role="2VODD2">
         <node concept="3cpWs8" id="6mm$FLZ2PnI" role="3cqZAp">
@@ -1633,6 +1637,7 @@
   <node concept="sE7Ow" id="2xeYpNCdzDf">
     <property role="TrG5h" value="RunNUSMVOnTestsFromModel" />
     <property role="2uzpH1" value="Run NuSMV on Tests from Model" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2xeYpNCdzDg" role="tncku">
       <node concept="3clFbS" id="2xeYpNCdzDh" role="2VODD2">
         <node concept="3cpWs8" id="2xeYpNCdzDi" role="3cqZAp">
@@ -1827,6 +1832,7 @@
   <node concept="sE7Ow" id="2xeYpNCfAJz">
     <property role="TrG5h" value="RunNUSMVSimulatorOnTestCase" />
     <property role="2uzpH1" value="Run NuSMV Simulator on Test-Case" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2xeYpNCfAJ$" role="tncku">
       <node concept="3clFbS" id="2xeYpNCfAJ_" role="2VODD2">
         <node concept="3cpWs8" id="2xeYpNCfAJA" role="3cqZAp">
@@ -2184,6 +2190,7 @@
   <node concept="sE7Ow" id="6glUKoNPNN0">
     <property role="TrG5h" value="RunNUSMVOnSource" />
     <property role="2uzpH1" value="Run NuSMV" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6glUKoNPNN1" role="tncku">
       <node concept="3clFbS" id="6glUKoNPNN2" role="2VODD2">
         <node concept="3clFbF" id="5PdLXX5Qh2T" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
index 714c7e8d3..c7983627d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" 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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -68,7 +68,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -202,7 +202,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>
@@ -230,7 +230,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">
@@ -278,6 +278,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" />
@@ -358,7 +359,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" />
@@ -397,7 +398,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" />
@@ -2759,14 +2759,14 @@
                               <ref role="3uigEE" node="1ZsZb$iTgio" resolve="Var2ValEntry" />
                             </node>
                             <node concept="37vLTw" id="6f7vJBUizRC" role="2ZW6bz">
-                              <ref role="3cqZAo" node="6f7vJBUiz_E" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dv4" resolve="it" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6f7vJBUiz_E" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dv4" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6f7vJBUiz_F" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dv5" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -2782,7 +2782,7 @@
                                 <ref role="3uigEE" node="1ZsZb$iTgio" resolve="Var2ValEntry" />
                               </node>
                               <node concept="37vLTw" id="6f7vJBUiLyg" role="10QFUP">
-                                <ref role="3cqZAo" node="6f7vJBUiKst" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dv6" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -2792,9 +2792,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6f7vJBUiKst" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dv6" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6f7vJBUiKsu" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dv7" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2829,14 +2829,14 @@
                           <ref role="3uigEE" node="1ZsZb$iS3xC" resolve="CounterexampleState" />
                         </node>
                         <node concept="37vLTw" id="6f7vJBUj7Nn" role="2ZW6bz">
-                          <ref role="3cqZAo" node="6f7vJBUj7No" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dv8" resolve="it" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6f7vJBUj7No" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dv8" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6f7vJBUj7Np" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dv9" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3314,7 +3314,7 @@
                             <ref role="3cqZAo" node="7mSH3Wn52C4" resolve="s" />
                           </node>
                           <node concept="37vLTw" id="7mSH3Wn53H5" role="3uHU7w">
-                            <ref role="3cqZAo" node="7mSH3Wn52C6" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dva" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3324,9 +3324,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="7mSH3Wn530V" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="7mSH3Wn52C6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dva" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7mSH3Wn52C7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dvb" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7mSH3Wn52Km" role="1MDeny">
@@ -3381,7 +3381,7 @@
                             <ref role="3cqZAo" node="7mSH3Wn5$HZ" resolve="s" />
                           </node>
                           <node concept="37vLTw" id="3WDuYQfq5rm" role="3uHU7w">
-                            <ref role="3cqZAo" node="7mSH3Wn5$I1" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dvc" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3391,9 +3391,9 @@
                     <property role="TrG5h" value="s" />
                     <node concept="17QB3L" id="7mSH3Wn5$I0" role="1tU5fm" />
                   </node>
-                  <node concept="Rh6nW" id="7mSH3Wn5$I1" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dvc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7mSH3Wn5$I2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dvd" role="1tU5fm" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7mSH3Wn5$I3" role="1MDeny">
@@ -5860,7 +5860,7 @@
                     <node concept="3clFbF" id="2mjHtwToWXZ" role="3cqZAp">
                       <node concept="2OqwBi" id="2mjHtwTEFIo" role="3clFbG">
                         <node concept="37vLTw" id="2mjHtwTEFIp" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2mjHtwToWGW" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36D1Dve" resolve="it" />
                         </node>
                         <node concept="liA8E" id="2mjHtwTEFIq" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -5871,9 +5871,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2mjHtwToWGW" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dve" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2mjHtwToWGX" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dvf" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -7038,15 +7038,15 @@
                       <node concept="3clFbF" id="3fsZMFLI82m" role="3cqZAp">
                         <node concept="2OqwBi" id="3fsZMFLI82n" role="3clFbG">
                           <node concept="37vLTw" id="3fsZMFLI82o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3fsZMFLI82q" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dvg" resolve="it" />
                           </node>
                           <node concept="3YRAZt" id="3fsZMFLI82p" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3fsZMFLI82q" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dvg" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3fsZMFLI82r" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dvh" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7074,7 +7074,7 @@
                           <node concept="2OqwBi" id="3fsZMFLI82B" role="3clFbG">
                             <node concept="2OqwBi" id="3fsZMFLI82C" role="2Oq$k0">
                               <node concept="37vLTw" id="3fsZMFLI82D" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3fsZMFLI82H" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dvi" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="3fsZMFLI82E" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -7089,9 +7089,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="3fsZMFLI82H" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36D1Dvi" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3fsZMFLI82I" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36D1Dvj" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -7212,7 +7212,7 @@
                           </node>
                           <node concept="2OqwBi" id="3fsZMFLIlaL" role="3uHU7B">
                             <node concept="37vLTw" id="3fsZMFLIlaM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3fsZMFLIlaO" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dvk" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3fsZMFLIlaN" role="2OqNvi">
                               <ref role="3Tt5mk" to="gioj:1IrBcRpiDGm" resolve="param" />
@@ -7221,9 +7221,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3fsZMFLIlaO" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dvk" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3fsZMFLIlaP" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dvl" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7298,7 +7298,7 @@
                           </node>
                           <node concept="2OqwBi" id="3fsZMFLIlbk" role="3uHU7B">
                             <node concept="37vLTw" id="3fsZMFLIlbl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3fsZMFLIlbn" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dvm" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3fsZMFLIlbm" role="2OqNvi">
                               <ref role="3Tt5mk" to="gioj:7mSH3WmXrCC" resolve="definition" />
@@ -7307,9 +7307,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3fsZMFLIlbn" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dvm" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3fsZMFLIlbo" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dvn" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8335,7 +8335,7 @@
                           <node concept="2OqwBi" id="2RmPJMxvgaw" role="3uHU7B">
                             <node concept="2OqwBi" id="2RmPJMxveyM" role="2Oq$k0">
                               <node concept="37vLTw" id="2RmPJMxvdSY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2xeYpNCz6uT" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dvo" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2RmPJMxvfc6" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8346,7 +8346,7 @@
                           <node concept="2OqwBi" id="2xeYpNCz6uN" role="3uHU7w">
                             <node concept="2OqwBi" id="2xeYpNCz6uO" role="2Oq$k0">
                               <node concept="37vLTw" id="2xeYpNCz6uP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2xeYpNCz6uT" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dvo" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="2xeYpNCz6uQ" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -8362,9 +8362,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2xeYpNCz6uT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dvo" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2xeYpNCz6uU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dvp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8615,7 +8615,7 @@
                           <node concept="3clFbF" id="1uIpCUusx5N" role="3cqZAp">
                             <node concept="2OqwBi" id="1uIpCUusx5O" role="3clFbG">
                               <node concept="37vLTw" id="1uIpCUusx5P" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1uIpCUusx5R" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dvq" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="1uIpCUusx5Q" role="2OqNvi">
                                 <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
@@ -8623,9 +8623,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1uIpCUusx5R" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dvq" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1uIpCUusx5S" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dvr" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -9137,7 +9137,7 @@
                               <node concept="3clFbF" id="6Kf5KB77UmS" role="3cqZAp">
                                 <node concept="2OqwBi" id="6Kf5KB77UmT" role="3clFbG">
                                   <node concept="37vLTw" id="6Kf5KB77UmU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6Kf5KB77UmW" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dvs" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="6Kf5KB77UmV" role="2OqNvi">
                                     <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
@@ -9145,9 +9145,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6Kf5KB77UmW" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36D1Dvs" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6Kf5KB77UmX" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36D1Dvt" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -9551,15 +9551,15 @@
                   <node concept="3clFbF" id="2RmPJMxz7B2" role="3cqZAp">
                     <node concept="2OqwBi" id="2RmPJMxz8pf" role="3clFbG">
                       <node concept="37vLTw" id="2RmPJMxz7B1" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2RmPJMxz6Z_" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36D1Dvu" resolve="it" />
                       </node>
                       <node concept="17RlXB" id="2RmPJMxz9Jw" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2RmPJMxz6Z_" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36D1Dvu" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2RmPJMxz6ZA" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36D1Dvv" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -9595,7 +9595,7 @@
                       <node concept="2OqwBi" id="6bK0Ak3Ec_U" role="3clFbG">
                         <node concept="2OqwBi" id="6bK0Ak3Ec_V" role="2Oq$k0">
                           <node concept="37vLTw" id="6bK0Ak3Ec_W" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6bK0Ak3EcA0" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dvw" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6bK0Ak3Ec_X" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9610,9 +9610,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6bK0Ak3EcA0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dvw" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6bK0Ak3EcA1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dvx" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -9940,7 +9940,7 @@
                       <node concept="2OqwBi" id="6bK0Ak3DJwT" role="3clFbG">
                         <node concept="2OqwBi" id="6bK0Ak3DJwU" role="2Oq$k0">
                           <node concept="37vLTw" id="6bK0Ak3DJwV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6bK0Ak3DJwZ" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dvy" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6bK0Ak3DJwW" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -9955,9 +9955,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6bK0Ak3DJwZ" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dvy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6bK0Ak3DJx0" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dvz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -11682,7 +11682,7 @@
                         <node concept="2OqwBi" id="6XKrTzkAoRn" role="3clFbG">
                           <node concept="2OqwBi" id="6XKrTzkAoRo" role="2Oq$k0">
                             <node concept="37vLTw" id="6XKrTzkAoRp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6XKrTzkAoRt" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1Dv$" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6XKrTzkAoRq" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -11697,9 +11697,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6XKrTzkAoRt" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dv$" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6XKrTzkAoRu" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dv_" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/tests.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/tests.mps
index 0b317f9d0..eea2057cf 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
@@ -87,7 +87,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
index ef19b9e14..62ebf92a6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
@@ -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">
@@ -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>
@@ -182,7 +182,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -214,6 +214,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" />
@@ -228,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>
@@ -252,7 +253,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -2053,7 +2053,7 @@
                             <node concept="2OqwBi" id="6Kf5KB6QMxt" role="3clFbG">
                               <node concept="2OqwBi" id="6Kf5KB6QL5v" role="2Oq$k0">
                                 <node concept="37vLTw" id="6Kf5KB6QKMx" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6Kf5KB6QKpl" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DuY" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="6Kf5KB6QLo3" role="2OqNvi">
                                   <ref role="37wK5l" to="4c75:1ZsZb$iUhjy" resolve="getLhsString" />
@@ -2068,9 +2068,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6Kf5KB6QKpl" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DuY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6Kf5KB6QKpm" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DuZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2102,7 +2102,7 @@
                               <node concept="2OqwBi" id="6Kf5KB6QXag" role="3clFbG">
                                 <node concept="2OqwBi" id="6Kf5KB6QXah" role="2Oq$k0">
                                   <node concept="37vLTw" id="6Kf5KB6QXai" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6Kf5KB6QXam" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1Dv0" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="6Kf5KB6QXaj" role="2OqNvi">
                                     <ref role="37wK5l" to="4c75:1ZsZb$iUhjy" resolve="getLhsString" />
@@ -2117,9 +2117,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6Kf5KB6QXam" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36D1Dv0" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6Kf5KB6QXan" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36D1Dv1" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
index 7f4fdd478..64c71307f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="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" />
@@ -82,7 +82,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
@@ -110,7 +110,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/com.mbeddr.formal.nuxmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/com.mbeddr.formal.nuxmv.pluginSolution.msd
index cdfb94fbd..4113e66e4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/com.mbeddr.formal.nuxmv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/com.mbeddr.formal.nuxmv.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nuxmv.pluginSolution" uuid="263ebba5-d9c9-4f02-b38c-e344aa263f98" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.nuxmv.pluginSolution" uuid="263ebba5-d9c9-4f02-b38c-e344aa263f98" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/models/com.mbeddr.formal.nuxmv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/models/com.mbeddr.formal.nuxmv.pluginSolution.plugin.mps
index c8f999b21..c738ab64e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/models/com.mbeddr.formal.nuxmv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/models/com.mbeddr.formal.nuxmv.pluginSolution.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
@@ -37,6 +37,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -62,7 +63,7 @@
         <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>
@@ -104,7 +105,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,14 +113,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="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -134,7 +135,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>
@@ -149,6 +150,7 @@
   <node concept="sE7Ow" id="6glUKoNPNN0">
     <property role="TrG5h" value="RunNUXMVOnSource" />
     <property role="2uzpH1" value="Run NuXmv" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6glUKoNPNN1" role="tncku">
       <node concept="3clFbS" id="6glUKoNPNN2" role="2VODD2">
         <node concept="3clFbF" id="5PdLXX5Qh2T" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/com.mbeddr.formal.rcp.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/com.mbeddr.formal.rcp.pluginSolution.msd
index fac81812f..7925057da 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/com.mbeddr.formal.rcp.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/com.mbeddr.formal.rcp.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.rcp.pluginSolution" uuid="73e1a7c9-a5f5-454a-9845-1d6af2cedac9" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.rcp.pluginSolution" uuid="73e1a7c9-a5f5-454a-9845-1d6af2cedac9" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -23,10 +22,10 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
index d90f52c22..5203e31ce 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
@@ -2,10 +2,10 @@
 <model ref="r:9c5b8a3f-0cb0-4483-909a-d7fa6c870e08(com.mbeddr.formal.rcp.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
@@ -71,7 +71,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd
index a0b7c7012..0c3bc1e72 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.rcp.tips_and_tricks" uuid="d599fae5-4709-4828-943d-5c57296d1034" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.rcp.tips_and_tricks" uuid="d599fae5-4709-4828-943d-5c57296d1034" moduleVersion="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:feee615f-9f2b-486f-804f-8987b652fcea:jetbrains.mps.build.tips" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/models/_000_basic_usage.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/models/_000_basic_usage.mps
index 259b255b1..ed075a8cb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/models/_000_basic_usage.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/models/_000_basic_usage.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
index 9d76a4af0..33c1ce38d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.rcp.tutorialActions" uuid="c122a48d-0fca-4b6d-a3a2-a690559b55b4" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.rcp.tutorialActions" uuid="c122a48d-0fca-4b6d-a3a2-a690559b55b4" moduleVersion="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">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
index 284fbc064..1e4e7761e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.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="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -64,7 +64,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">
@@ -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>
@@ -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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -184,7 +184,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">
@@ -675,38 +675,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="7Y21hZBa4E3" role="3cqZAp">
-              <node concept="3y3z36" id="7Y21hZBa4E4" role="3clFbw">
-                <node concept="37vLTw" id="7Y21hZBa4E5" role="3uHU7B">
-                  <ref role="3cqZAo" node="7Y21hZBa4DX" resolve="project" />
-                </node>
-                <node concept="10Nm6u" id="7Y21hZBa4E6" role="3uHU7w" />
-              </node>
-              <node concept="3clFbS" id="7Y21hZBa4E7" role="3clFbx">
-                <node concept="3clFbF" id="7Y21hZBa4E8" role="3cqZAp">
-                  <node concept="2OqwBi" id="7Y21hZBa4E9" role="3clFbG">
-                    <node concept="2YIFZM" id="7Y21hZBa4Ea" role="2Oq$k0">
-                      <ref role="37wK5l" to="ofh9:~ProjectBaseDirectory.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
-                      <ref role="1Pybhc" to="ofh9:~ProjectBaseDirectory" resolve="ProjectBaseDirectory" />
-                      <node concept="37vLTw" id="7Y21hZBa4Eb" role="37wK5m">
-                        <ref role="3cqZAo" node="7Y21hZBa4DX" resolve="project" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7Y21hZBa4Ec" role="2OqNvi">
-                      <ref role="37wK5l" to="ofh9:~ProjectBaseDirectory.setBaseDir(com.intellij.openapi.vfs.VirtualFile)" resolve="setBaseDir" />
-                      <node concept="2OqwBi" id="7Y21hZBa4Ed" role="37wK5m">
-                        <node concept="37vLTw" id="7Y21hZBa4Ee" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7Y21hZBa4DX" resolve="project" />
-                        </node>
-                        <node concept="liA8E" id="7Y21hZBa4Ef" role="2OqNvi">
-                          <ref role="37wK5l" to="4nm9:~Project.getBaseDir()" resolve="getBaseDir" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="1Wc70l" id="7Y21hZBa4Eg" role="3clFbw">
             <node concept="3y3z36" id="7Y21hZBa4Eh" role="3uHU7B">
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd
index 67d490fb9..9f6188d6f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.sandbox" uuid="25c1b1b7-1a2a-4976-9844-5bc41350353d" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.sandbox" uuid="25c1b1b7-1a2a-4976-9844-5bc41350353d" moduleVersion="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">2dd5dace-06d5-4283-a878-7272f2df6d4b(com.mbeddr.formal.nusmv.operatorspanel)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
@@ -45,7 +44,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_010_simple_smv_models.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_010_simple_smv_models.mps
index cd749d468..51392447a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_010_simple_smv_models.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_010_simple_smv_models.mps
@@ -14,7 +14,7 @@
       </concept>
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -112,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_015_nusmv_ext.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_015_nusmv_ext.mps
index f304ced6e..fd282704f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_015_nusmv_ext.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_015_nusmv_ext.mps
@@ -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/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_020_operatorspanel.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_020_operatorspanel.mps
index b002cd2b4..1186b0d59 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_020_operatorspanel.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_020_operatorspanel.mps
@@ -6,7 +6,7 @@
     <use id="2dd5dace-06d5-4283-a878-7272f2df6d4b" name="com.mbeddr.formal.nusmv.operatorspanel" 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="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -97,7 +97,7 @@
       </concept>
     </language>
     <language id="3fb92f6f-450c-4e41-8129-97a4b9978951" name="com.mbeddr.formal.base.operatorspanel">
-      <concept id="4261645280576222797" name="com.mbeddr.formal.base.operatorspanel.structure.IColoredShape" flags="ng" index="28kP60">
+      <concept id="4261645280576222797" name="com.mbeddr.formal.base.operatorspanel.structure.IColoredShape" flags="ngI" index="28kP60">
         <child id="4261645280576222798" name="color" index="28kP63" />
       </concept>
       <concept id="4261645280576222595" name="com.mbeddr.formal.base.operatorspanel.structure.ColorDefinition" flags="ng" index="28kP9e">
@@ -174,7 +174,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_030_unit_tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_030_unit_tests.mps
index 003955cdc..3236cd0d1 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_030_unit_tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_030_unit_tests.mps
@@ -116,7 +116,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_050_running_tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_050_running_tests.mps
index c47a78e12..a3397121b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_050_running_tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_050_running_tests.mps
@@ -13,7 +13,7 @@
       </concept>
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="8004696212664077689" name="com.mbeddr.formal.nusmv.structure.AbstractSpecSection" flags="ng" index="tPUAM">
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_100_diagramatic_notation_samples.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_100_diagramatic_notation_samples.mps
index fff80ef02..c5c064034 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_100_diagramatic_notation_samples.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_100_diagramatic_notation_samples.mps
@@ -40,7 +40,7 @@
         <child id="2295987781863305067" name="left" index="dhpfi" />
         <child id="2295987781863305070" name="right" index="dhpfn" />
       </concept>
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="7842584090744230923" name="com.mbeddr.formal.nusmv.structure.SingleCase" flags="ng" index="2H9I2A">
@@ -118,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>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_200_tables.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_200_tables.mps
index 6e06f71f6..c73fbb233 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_200_tables.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_200_tables.mps
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_210_nusmv_importer.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_210_nusmv_importer.mps
index 1773e2309..d836c9eb4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_210_nusmv_importer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_210_nusmv_importer.mps
@@ -24,7 +24,7 @@
       <concept id="2858146662931636880" name="com.mbeddr.formal.nusmv.structure.GreaterExpression" flags="ng" index="nE0YJ" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
       <concept id="2707707741262126533" name="com.mbeddr.formal.nusmv.structure.EmptyModuleContent" flags="ng" index="s4Ewt" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -145,7 +145,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_300_cbd.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_300_cbd.mps
index afc0bddcc..3e18648d9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_300_cbd.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_300_cbd.mps
@@ -36,7 +36,7 @@
       <concept id="2858146662931636879" name="com.mbeddr.formal.nusmv.structure.LessEqualsExpression" flags="ng" index="nE0YK" />
       <concept id="5906421183242417472" name="com.mbeddr.formal.nusmv.structure.IffExpression" flags="ng" index="2oXAu5" />
       <concept id="2707707741262126533" name="com.mbeddr.formal.nusmv.structure.EmptyModuleContent" flags="ng" index="s4Ewt" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -148,7 +148,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -190,7 +190,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_350_arch_spec_with_msc.mps b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_350_arch_spec_with_msc.mps
index f19620f52..7ada00098 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_350_arch_spec_with_msc.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/models/_350_arch_spec_with_msc.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/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.fasten.base._020_ts_tests_cbd_msc_testcode.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.fasten.base._020_ts_tests_cbd_msc_testcode.mps
index ca0d6fa1d..b59b22ecb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.fasten.base._020_ts_tests_cbd_msc_testcode.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.fasten.base._020_ts_tests_cbd_msc_testcode.mps
@@ -21,7 +21,7 @@
       <concept id="6447909589225766051" name="com.mbeddr.formal.nusmv.structure.EmptySystemContent" flags="ng" index="2SQmWS" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.mbeddr.formal.nusmv._020_ts_tests_cbd_msc@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.mbeddr.formal.nusmv._020_ts_tests_cbd_msc@tests.mps
index c12aa99e3..abf26a4c0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.mbeddr.formal.nusmv._020_ts_tests_cbd_msc@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/models/test.mbeddr.formal.nusmv._020_ts_tests_cbd_msc@tests.mps
@@ -65,7 +65,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/test.fasten.base.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/test.fasten.base.msd
index 8f11d841a..befe40abe 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/test.fasten.base.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/test.fasten.base.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.fasten.base" uuid="f5ce9397-6680-44ec-931f-95861db3337f" moduleVersion="0" compileInMPS="true">
+<solution name="test.fasten.base" uuid="f5ce9397-6680-44ec-931f-95861db3337f" moduleVersion="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">b0f97242-b2a5-4637-95d3-c63ed6f55701(test.mbeddr.formal.nusmv)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
index 5ca2ce967..f07c12145 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <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="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
@@ -121,7 +121,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -143,7 +143,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">
@@ -159,6 +159,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" />
@@ -185,7 +186,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,7 +199,6 @@
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -229,7 +229,7 @@
                       <node concept="2OqwBi" id="6EFcW_ADDv_" role="3clFbG">
                         <node concept="2OqwBi" id="6EFcW_ADDvA" role="2Oq$k0">
                           <node concept="37vLTw" id="6EFcW_ADDvB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6EFcW_ADDvF" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1DvA" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6EFcW_ADDvC" role="2OqNvi">
                             <ref role="37wK5l" to="4c75:7mSH3Wn4cMJ" resolve="getUserFriendlyMessage" />
@@ -244,9 +244,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6EFcW_ADDvF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DvA" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6EFcW_ADDvG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DvB" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -298,7 +298,7 @@
                             <node concept="3cpWs3" id="6EFcW_ADLUE" role="37wK5m">
                               <node concept="2OqwBi" id="6EFcW_ADMgp" role="3uHU7w">
                                 <node concept="37vLTw" id="6EFcW_ADM0B" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6EFcW_ADKOt" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvC" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="6EFcW_ADNbK" role="2OqNvi">
                                   <ref role="37wK5l" to="4c75:7mSH3Wn4cMJ" resolve="getUserFriendlyMessage" />
@@ -312,9 +312,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6EFcW_ADKOt" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1DvC" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6EFcW_ADKOu" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1DvD" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -396,7 +396,7 @@
                               <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
                             </node>
                             <node concept="37vLTw" id="5a54bO_K$Il" role="2ZW6bz">
-                              <ref role="3cqZAo" node="5a54bO_K$IC" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36D1DvE" resolve="it" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="5a54bO_K$Im" role="3uHU7w">
@@ -407,7 +407,7 @@
                                     <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
                                   </node>
                                   <node concept="37vLTw" id="5a54bO_K$Ir" role="10QFUP">
-                                    <ref role="3cqZAo" node="5a54bO_K$IC" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36D1DvE" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -431,7 +431,7 @@
                                   <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
                                 </node>
                                 <node concept="37vLTw" id="5a54bO_K$I$" role="10QFUP">
-                                  <ref role="3cqZAo" node="5a54bO_K$IC" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvE" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -449,9 +449,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5a54bO_K$IC" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1DvE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5a54bO_K$ID" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1DvF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -635,7 +635,7 @@
                             <node concept="2OqwBi" id="6WmpcHMOgge" role="3clFbG">
                               <node concept="2OqwBi" id="6WmpcHMOfu3" role="2Oq$k0">
                                 <node concept="37vLTw" id="6WmpcHMOfhy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6WmpcHMOeKz" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvG" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6WmpcHMOfGB" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -650,9 +650,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6WmpcHMOeKz" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvG" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6WmpcHMOeK$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvH" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd.mps
index f77671b23..65f3524f4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd.mps
@@ -151,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -184,7 +184,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
index 9e41221e1..4bf31192e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="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" />
     <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
@@ -141,7 +141,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>
@@ -163,7 +163,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -183,6 +183,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -254,7 +255,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -272,7 +273,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="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" />
@@ -366,7 +366,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRCN9" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRCNa" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRCNb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRCNf" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvI" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRCNc" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -381,9 +381,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRCNf" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvI" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRCNg" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -433,7 +433,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRO$Q" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRO$R" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRO$S" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRO$W" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvK" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRO$T" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -448,9 +448,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRO$W" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvK" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRO$X" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvL" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -682,7 +682,7 @@
                             <node concept="2OqwBi" id="2_LXzlpunyh" role="3clFbG">
                               <node concept="2OqwBi" id="2_LXzlpunyi" role="2Oq$k0">
                                 <node concept="37vLTw" id="2_LXzlpunyj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2_LXzlpunyn" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvM" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2_LXzlpunyk" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -697,9 +697,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2_LXzlpunyn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvM" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2_LXzlpunyo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvN" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -749,7 +749,7 @@
                             <node concept="2OqwBi" id="2_LXzlpunyI" role="3clFbG">
                               <node concept="2OqwBi" id="2_LXzlpunyJ" role="2Oq$k0">
                                 <node concept="37vLTw" id="2_LXzlpunyK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2_LXzlpunyO" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvO" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="2_LXzlpunyL" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -764,9 +764,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2_LXzlpunyO" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvO" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2_LXzlpunyP" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvP" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/importer.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/importer.mps
index 8bfd2a43b..a494d0e21 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/importer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/importer.mps
@@ -24,7 +24,7 @@
       <concept id="2858146662931636879" name="com.mbeddr.formal.nusmv.structure.LessEqualsExpression" flags="ng" index="nE0YK" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
       <concept id="5906421183242417472" name="com.mbeddr.formal.nusmv.structure.IffExpression" flags="ng" index="2oXAu5" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -189,7 +189,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
index 4dda97d5a..a37ae6b2e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -135,7 +135,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>
@@ -153,7 +153,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">
@@ -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" />
@@ -271,7 +272,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -296,7 +297,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -498,7 +498,7 @@
                             <node concept="2OqwBi" id="59AZjhg27Fh" role="3clFbG">
                               <node concept="2OqwBi" id="59AZjhg27Fi" role="2Oq$k0">
                                 <node concept="37vLTw" id="59AZjhg27Fj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="59AZjhg27Fn" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvS" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="59AZjhg27Fk" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -513,9 +513,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="59AZjhg27Fn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvS" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="59AZjhg27Fo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvT" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -739,7 +739,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRCN9" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRCNa" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRCNb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRCNf" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvU" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRCNc" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -754,9 +754,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRCNf" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvU" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRCNg" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvV" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -785,7 +785,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRO$Q" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRO$R" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRO$S" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRO$W" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvW" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRO$T" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -800,9 +800,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRO$W" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvW" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRO$X" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvX" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
index 2f758cb4a..62e704a25 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -141,7 +141,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>
@@ -159,7 +159,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">
@@ -190,6 +190,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -241,7 +242,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -1074,7 +1074,7 @@
                             <node concept="2OqwBi" id="L6k24q6YwK" role="3clFbG">
                               <node concept="2OqwBi" id="L6k24q6YwL" role="2Oq$k0">
                                 <node concept="37vLTw" id="L6k24q6YwM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="L6k24q6YwS" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvY" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="L6k24q6YwN" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1089,9 +1089,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="L6k24q6YwS" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvY" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="L6k24q6YwT" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvZ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
index 9a845e188..b82752973 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -118,7 +118,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>
@@ -136,7 +136,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">
@@ -153,6 +153,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" />
@@ -206,7 +207,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +221,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -421,7 +421,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRCN9" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRCNa" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRCNb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRCNf" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dw0" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRCNc" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -436,9 +436,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRCNf" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dw0" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRCNg" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dw1" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -467,7 +467,7 @@
                             <node concept="2OqwBi" id="6mm$FLYRO$Q" role="3clFbG">
                               <node concept="2OqwBi" id="6mm$FLYRO$R" role="2Oq$k0">
                                 <node concept="37vLTw" id="6mm$FLYRO$S" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6mm$FLYRO$W" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dw2" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6mm$FLYRO$T" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -482,9 +482,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6mm$FLYRO$W" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dw2" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6mm$FLYRO$X" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dw3" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -707,7 +707,7 @@
                             <node concept="2OqwBi" id="59AZjhg27Fh" role="3clFbG">
                               <node concept="2OqwBi" id="59AZjhg27Fi" role="2Oq$k0">
                                 <node concept="37vLTw" id="59AZjhg27Fj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="59AZjhg27Fn" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dw4" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="59AZjhg27Fk" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -722,9 +722,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="59AZjhg27Fn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dw4" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="59AZjhg27Fo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dw5" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ts@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ts@tests.mps
index 8211f0a80..8e1ca36b9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ts@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ts@tests.mps
@@ -102,7 +102,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample.mps
index 1d06fb53b..c48395893 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample.mps
@@ -56,7 +56,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
index fab6bfe18..7d5161031 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
@@ -119,7 +119,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -137,7 +137,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">
@@ -152,6 +152,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" />
@@ -198,7 +199,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -212,7 +213,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -423,7 +423,7 @@
                             <node concept="2OqwBi" id="59AZjhg27Fh" role="3clFbG">
                               <node concept="2OqwBi" id="59AZjhg27Fi" role="2Oq$k0">
                                 <node concept="37vLTw" id="59AZjhg27Fj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="59AZjhg27Fn" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1DvQ" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="59AZjhg27Fk" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -438,9 +438,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="59AZjhg27Fn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1DvQ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="59AZjhg27Fo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1DvR" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.nusmv_ext_ts@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.nusmv_ext_ts@tests.mps
index 14840601f..9114918f8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.nusmv_ext_ts@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.nusmv_ext_ts@tests.mps
@@ -77,7 +77,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode._010_documentation_lines.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode._010_documentation_lines.mps
index 96282a0b5..34aee1f8c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode._010_documentation_lines.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode._010_documentation_lines.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/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode.types.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode.types.mps
index 09c87102c..72ceb70f6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode.types.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/testcode.types.mps
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests.mps
index 44baa7441..b83da2e2c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests.mps
@@ -81,7 +81,7 @@
         <child id="7320199582619499452" name="value" index="rqu$0" />
         <child id="7320199582619499448" name="size" index="rqu$4" />
       </concept>
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -240,7 +240,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_ext.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_ext.mps
index 179093d28..d36a10457 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_ext.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_ext.mps
@@ -18,7 +18,7 @@
       </concept>
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636879" name="com.mbeddr.formal.nusmv.structure.LessEqualsExpression" flags="ng" index="nE0YK" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="8004696212664077689" name="com.mbeddr.formal.nusmv.structure.AbstractSpecSection" flags="ng" index="tPUAM">
@@ -125,7 +125,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source.mps
index 1dbe0e813..5c84c649f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source.mps
@@ -120,7 +120,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
index 0166fe02a..ac98e34aa 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
@@ -116,7 +116,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -138,7 +138,7 @@
         <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">
@@ -153,6 +153,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 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>
@@ -209,7 +210,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -223,7 +224,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -400,7 +400,7 @@
                             <node concept="2OqwBi" id="59AZjhg27Fh" role="3clFbG">
                               <node concept="2OqwBi" id="59AZjhg27Fi" role="2Oq$k0">
                                 <node concept="37vLTw" id="59AZjhg27Fj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="59AZjhg27Fn" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dw6" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="59AZjhg27Fk" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -415,9 +415,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="59AZjhg27Fn" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dw6" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="59AZjhg27Fo" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dw7" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_testcode.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_testcode.mps
index 6dc733149..3641a9f5f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_testcode.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_testcode.mps
@@ -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/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
index b9375c795..8a4d2dc8a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
@@ -8,7 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" 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>
@@ -124,7 +124,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,7 +146,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">
@@ -162,6 +162,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -203,7 +204,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -1007,7 +1007,7 @@
                             <node concept="2OqwBi" id="6WmpcHMOgge" role="3clFbG">
                               <node concept="2OqwBi" id="6WmpcHMOfu3" role="2Oq$k0">
                                 <node concept="37vLTw" id="6WmpcHMOfhy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6WmpcHMOeKz" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36D1Dw8" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6WmpcHMOfGB" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1022,9 +1022,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6WmpcHMOeKz" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36D1Dw8" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6WmpcHMOeK$" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36D1Dw9" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1186,7 +1186,7 @@
                       <node concept="2OqwBi" id="6hWVnwAk6Jh" role="3clFbG">
                         <node concept="2OqwBi" id="6hWVnwAk6Ji" role="2Oq$k0">
                           <node concept="37vLTw" id="6hWVnwAk6Jj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hWVnwAk6Jn" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36D1Dwa" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6hWVnwAk6Jk" role="2OqNvi">
                             <ref role="37wK5l" to="4c75:7mSH3Wn4cMJ" resolve="getUserFriendlyMessage" />
@@ -1201,9 +1201,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hWVnwAk6Jn" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36D1Dwa" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hWVnwAk6Jo" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36D1Dwb" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1268,7 +1268,7 @@
                             <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                             <node concept="2OqwBi" id="6hWVnwAkieH" role="37wK5m">
                               <node concept="37vLTw" id="6hWVnwAkhUY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6hWVnwAkh$7" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36D1Dwc" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6hWVnwAkm8h" role="2OqNvi">
                                 <ref role="37wK5l" to="4c75:7mSH3Wn4cMJ" resolve="getUserFriendlyMessage" />
@@ -1278,9 +1278,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6hWVnwAkh$7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36D1Dwc" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6hWVnwAkh$8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36D1Dwd" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests@tests.mps
index 5650e1e31..efc671e63 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests@tests.mps
@@ -17,7 +17,7 @@
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh" />
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
@@ -169,7 +169,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_editor@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_editor@tests.mps
index 1369916fd..e932cc070 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_editor@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_editor@tests.mps
@@ -51,7 +51,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_intentions@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_intentions@tests.mps
index 8333ffc72..4465bb128 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_intentions@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/ts_tests_intentions@tests.mps
@@ -64,7 +64,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
index 0b47d5555..20599ae03 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.nusmv" uuid="b0f97242-b2a5-4637-95d3-c63ed6f55701" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="test.mbeddr.formal.nusmv" uuid="b0f97242-b2a5-4637-95d3-c63ed6f55701" 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">692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)</dependency>
     <dependency reexport="false">cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)</dependency>
@@ -54,7 +53,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/models/test.mbeddr.formal.nuxmv._010_timed_models.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/models/test.mbeddr.formal.nuxmv._010_timed_models.mps
index 7863833fd..fbcd394af 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/models/test.mbeddr.formal.nuxmv._010_timed_models.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/models/test.mbeddr.formal.nuxmv._010_timed_models.mps
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd
index 0189dc0ea..1c845a8cd 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.nuxmv" uuid="8599a2d5-6f19-4a6a-a096-5ea4fe725499" moduleVersion="0" compileInMPS="true">
+<solution name="test.mbeddr.formal.nuxmv" uuid="8599a2d5-6f19-4a6a-a096-5ea4fe725499" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:71797868-de95-425c-8470-36aa52c8ebc4:com.mbeddr.formal.base.arch" version="1" />
diff --git a/code/languages/com.mbeddr.formal.prism/.mps/migration.xml b/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
index 039487648..8f9a3d99d 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.behavior.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.behavior.mps
index 33c71b0a2..f7f676418 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.behavior.mps
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.behavior.mps
@@ -77,7 +77,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" />
@@ -105,7 +105,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
index 02eeac3cb..7ddceb593 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
@@ -39,7 +39,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>
@@ -48,7 +48,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" />
@@ -121,7 +121,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.structure.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.structure.mps
index 9d1afcafa..5cc90c99a 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.structure.mps
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.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/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.textGen.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.textGen.mps
index 318fef7c7..c274e8033 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.textGen.mps
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.textGen.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>
@@ -108,7 +108,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
index 5e0e9e2af..b6e55d654 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.prism.pluginSolution" uuid="4e6c1b7e-ca4e-4172-8e14-215a5bd55c18" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.prism.pluginSolution" uuid="4e6c1b7e-ca4e-4172-8e14-215a5bd55c18" moduleVersion="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">3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
@@ -24,11 +23,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.plugin.mps
index ceaad6880..7e52cce8d 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:cd05867a-535f-4d45-9992-c49ff22ca995(com.mbeddr.formal.prism.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
@@ -29,6 +29,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -63,7 +64,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -123,7 +124,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +136,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -144,7 +145,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -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>
@@ -187,6 +188,7 @@
   <node concept="sE7Ow" id="1xpXAu0NSey">
     <property role="TrG5h" value="RunPrism" />
     <property role="2uzpH1" value="Run PRISM" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="1xpXAu0NSez" role="tncku">
       <node concept="3clFbS" id="1xpXAu0NSe$" role="2VODD2">
         <node concept="3cpWs8" id="1xpXAu0ODgs" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
index f6defbb7d..57a543e01 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
@@ -5,7 +5,7 @@
     <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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
@@ -83,7 +83,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -101,7 +101,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" />
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
index c17f9a295..08df01f6a 100644
--- a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
@@ -48,7 +48,7 @@
         <child id="1137896353117004005" name="text" index="112JTh" />
       </concept>
       <concept id="1137896353117084364" name="com.mbeddr.formal.prism.structure.LocalVariableDeclaration" flags="ng" index="112KhS" />
-      <concept id="1137896353117084361" name="com.mbeddr.formal.prism.structure.IVariableDeclaration" flags="ng" index="112KhX">
+      <concept id="1137896353117084361" name="com.mbeddr.formal.prism.structure.IVariableDeclaration" flags="ngI" index="112KhX">
         <child id="1137896353117084370" name="init" index="112KhA" />
         <child id="1137896353117084367" name="tpe" index="112KhV" />
       </concept>
@@ -82,7 +82,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
index c7d6e04b0..67462783b 100644
--- a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
+++ b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.prism" uuid="9075688b-a848-4499-8de3-928dde5b64eb" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.prism" uuid="9075688b-a848-4499-8de3-928dde5b64eb" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/.mps/migration.xml b/code/languages/com.mbeddr.formal.req/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.mbeddr.formal.req/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.req/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
index 733f4e620..d7504a4ab 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps
index a8c6af665..32311ee6c 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.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>
@@ -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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
index a700f6db5..8c714e4c6 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
@@ -17,7 +17,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" />
@@ -51,7 +51,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>
@@ -60,7 +60,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -76,7 +76,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -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/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.migration.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.migration.mps
index beb5ea865..ce9020fee 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.migration.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.migration.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/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
index 77dd9ea50..c5ddbd4e0 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
@@ -81,7 +81,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
index 80b8d807a..7d1943600 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -29,7 +28,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -51,7 +50,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps
index d35aa9241..5181baeb6 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps
@@ -66,14 +66,14 @@
       <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>
       <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" />
@@ -99,7 +99,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
index a20e0ac9a..29eb8a2a1 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="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="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
     <use id="c73b17af-16a1-4490-8072-8a84937c5206" name="com.mbeddr.mpsutil.treenotation" version="0" />
     <use id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible" version="0" />
@@ -90,7 +90,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </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>
@@ -104,7 +104,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223386653097" name="jetbrains.mps.lang.editor.structure.StrikeOutStyleSheet" flags="ln" index="3nxI2P" />
@@ -134,7 +134,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -151,7 +151,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -187,7 +187,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">
@@ -278,7 +278,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>
@@ -296,7 +296,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -386,7 +386,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.intentions.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.intentions.mps
index cd0baf002..3f06abdd2 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.intentions.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.intentions.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps
index 3e5cef839..60152a6a3 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.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>
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -65,12 +65,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>
@@ -165,7 +166,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="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" />
@@ -275,7 +275,7 @@
                               <node concept="2OqwBi" id="5qtcz4Llovr" role="3clFbG">
                                 <node concept="2OqwBi" id="5qtcz4Llovs" role="2Oq$k0">
                                   <node concept="37vLTw" id="5qtcz4Llovt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5qtcz4Llovw" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36EN4sW" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="5qtcz4Llovu" role="2OqNvi">
                                     <ref role="3TtcxE" to="6wa3:1UJ51yZ_hOp" resolve="attributes" />
@@ -285,9 +285,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5qtcz4Llovw" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36EN4sW" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5qtcz4Llovx" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36EN4sX" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -333,7 +333,7 @@
                                           <ref role="2pIpSl" to="6wa3:5qtcz4LkW_W" resolve="conceptRef" />
                                           <node concept="36biLy" id="5qtcz4LlvZj" role="28nt2d">
                                             <node concept="37vLTw" id="5qtcz4Llwdq" role="36biLW">
-                                              <ref role="3cqZAo" node="5qtcz4LlpI4" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36EN4sY" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -343,9 +343,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5qtcz4LlpI4" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EN4sY" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5qtcz4LlpI5" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EN4sZ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.structure.mps
index 9295b9932..0d8465622 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.structure.mps
@@ -60,7 +60,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.typesystem.mps
index 315e3dc20..81d788d06 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.typesystem.mps
@@ -5,7 +5,7 @@
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
@@ -77,7 +77,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -90,7 +90,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -148,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/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
index 2e7541c4d..90f3a9b3d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
@@ -45,12 +45,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" />
@@ -84,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>
@@ -93,7 +94,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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -128,7 +128,7 @@
                       <node concept="2OqwBi" id="1wKSXwEAPy$" role="3clFbG">
                         <node concept="2OqwBi" id="1wKSXwEAP4J" role="2Oq$k0">
                           <node concept="37vLTw" id="1wKSXwEAOOZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1wKSXwEAOIG" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4sS" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7gUa1Zsy7ZM" role="2OqNvi">
                             <ref role="3Tt5mk" to="6wa3:3Jn$RV31w1r" resolve="superConcept" />
@@ -138,9 +138,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1wKSXwEAOIG" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EN4sS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1wKSXwEAOIH" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EN4sT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -200,7 +200,7 @@
                         </node>
                         <node concept="2OqwBi" id="1wKSXwEB9pU" role="3uHU7B">
                           <node concept="37vLTw" id="1wKSXwEAUGN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1wKSXwEAUAm" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4sU" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7gUa1Zsy8oo" role="2OqNvi">
                             <ref role="3Tt5mk" to="6wa3:3Jn$RV31w1r" resolve="superConcept" />
@@ -209,9 +209,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1wKSXwEAUAm" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EN4sU" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1wKSXwEAUAn" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EN4sV" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/com.mbeddr.formal.req.arch.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/com.mbeddr.formal.req.arch.mpl
index 94fd0c4ae..13be5fb3b 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/com.mbeddr.formal.req.arch.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/com.mbeddr.formal.req.arch.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" />
@@ -60,7 +60,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
@@ -70,7 +69,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/generator/templates/main@generator.mps
index 044931d70..7395daa1b 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.editor.mps
index 43c536d08..e3677168e 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.editor.mps
@@ -39,7 +39,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" />
@@ -70,7 +70,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.structure.mps
index 171c69a4e..26820fd9f 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/models/com.mbeddr.formal.req.arch.structure.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl
index f2b1e2dd4..6ce440e62 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.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" />
@@ -64,7 +64,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">1919c723-b60b-4592-9318-9ce96d91da44(de.itemis.mps.editor.celllayout)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
@@ -77,7 +76,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/generator/template/main@generator.mps
index 6a50d8ded..222a9b244 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/behavior.mps
index 1b299f8fc..a0b601045 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/behavior.mps
@@ -75,7 +75,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -83,7 +83,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/com.mbeddr.formal.req.base.intentions.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/com.mbeddr.formal.req.base.intentions.mps
index 20a9116fa..b0aae3c63 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/com.mbeddr.formal.req.base.intentions.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/com.mbeddr.formal.req.base.intentions.mps
@@ -64,7 +64,7 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
index 5271d4312..7700799b1 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
@@ -18,7 +18,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -68,7 +68,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,7 +80,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" />
@@ -101,6 +101,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -139,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -153,7 +154,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <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" />
@@ -214,7 +214,7 @@
                             <node concept="2OqwBi" id="SmAS9imHMn" role="2Oq$k0">
                               <node concept="2OqwBi" id="SmAS9imFJi" role="2Oq$k0">
                                 <node concept="37vLTw" id="SmAS9imFtV" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="34jvijxyxmo" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EN4t3" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="SmAS9imG5w" role="2OqNvi">
                                   <ref role="3TtcxE" to="z27p:6VJDb1ZGaw$" resolve="reqRefs" />
@@ -226,7 +226,7 @@
                                     <node concept="3clFbF" id="SmAS9imKV$" role="3cqZAp">
                                       <node concept="2OqwBi" id="SmAS9imLfd" role="3clFbG">
                                         <node concept="37vLTw" id="SmAS9imKVz" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="SmAS9imKz2" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36EN4t1" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="SmAS9imLzp" role="2OqNvi">
                                           <ref role="3Tt5mk" to="z27p:6VJDb1ZGawG" resolve="req" />
@@ -234,9 +234,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="SmAS9imKz2" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2hED36EN4t1" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="SmAS9imKz3" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2hED36EN4t2" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -250,7 +250,7 @@
                           <node concept="3clFbC" id="34jvijxyxmj" role="3uHU7B">
                             <node concept="2OqwBi" id="34jvijxyxml" role="3uHU7B">
                               <node concept="37vLTw" id="34jvijxyxmm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="34jvijxyxmo" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36EN4t3" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="34jvijxyxmn" role="2OqNvi">
                                 <ref role="3Tt5mk" to="z27p:pWUwO6BvC7" resolve="req" />
@@ -263,9 +263,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="34jvijxyxmo" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EN4t3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="34jvijxyxmp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EN4t4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
index 1ae55707c..37da3d0b3 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
@@ -40,7 +40,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -99,7 +99,7 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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>
@@ -128,7 +128,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
@@ -148,7 +148,7 @@
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ngI" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
@@ -165,7 +165,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" />
@@ -178,7 +178,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="6918029743850363447" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_targetNode" flags="ng" index="1NM5Ph" />
@@ -225,11 +225,11 @@
       <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_" />
-      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
+      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ngI" index="IEa8$">
         <property id="1224848525476" name="isDeprecated" index="IEkAT" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -343,7 +343,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -365,7 +365,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">
@@ -445,7 +445,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/structure.mps
index 2c09b39a8..ac6afc410 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/structure.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/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
index f285d9c2a..1c88dbaff 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
@@ -66,7 +66,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -77,6 +77,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" />
@@ -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>
@@ -195,7 +196,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" />
@@ -262,7 +262,7 @@
                         <node concept="2OqwBi" id="SmAS9iiNOV" role="3fr31v">
                           <node concept="2OqwBi" id="SmAS9iiNOW" role="2Oq$k0">
                             <node concept="37vLTw" id="SmAS9iiNOX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="_wUu$TXR6A" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EN4t5" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="SmAS9iiNOY" role="2OqNvi">
                               <ref role="3TsBF5" to="z27p:2N7iSwG$CrI" resolve="id" />
@@ -274,7 +274,7 @@
                       <node concept="2OqwBi" id="_wUu$TXR6u" role="3uHU7w">
                         <node concept="2OqwBi" id="_wUu$TXR6v" role="2Oq$k0">
                           <node concept="37vLTw" id="_wUu$TXR6w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="_wUu$TXR6A" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4t5" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="_wUu$TXR6x" role="2OqNvi">
                             <ref role="3TsBF5" to="z27p:2N7iSwG$CrI" resolve="id" />
@@ -295,9 +295,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="_wUu$TXR6A" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36EN4t5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="_wUu$TXR6B" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36EN4t6" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/com.mbeddr.formal.req.msc.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/com.mbeddr.formal.req.msc.mpl
index 94639a6cf..769d70a6c 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/com.mbeddr.formal.req.msc.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/com.mbeddr.formal.req.msc.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" />
@@ -68,7 +68,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3b22dedc-d6cf-4626-9445-6e9909b3e04a(com.fasten.base.arch.msc)</dependency>
   </dependencies>
@@ -76,7 +75,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/generator/templates/main@generator.mps
index 7a8774220..2f31d421a 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.behavior.mps
index df5f6f453..89fabc458 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.behavior.mps
@@ -60,11 +60,11 @@
       <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>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -83,7 +83,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.structure.mps
index 4dacc7bd8..07e2ae845 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/models/com.mbeddr.formal.req.msc.structure.mps
@@ -26,7 +26,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/com.mbeddr.formal.req.nusmv.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/com.mbeddr.formal.req.nusmv.mpl
index 3ddf79cb4..b0c015813 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/com.mbeddr.formal.req.nusmv.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/com.mbeddr.formal.req.nusmv.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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
@@ -76,7 +75,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/generator/template/main@generator.mps
index cc7864283..10896ffcd 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/editor.mps
index 36b1a8b92..767bb80b7 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/editor.mps
@@ -60,7 +60,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -101,7 +101,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -131,7 +131,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/structure.mps
index ba6adb3f5..07a892541 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/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/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl
index 25f609354..adbc8bc9d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
@@ -78,7 +77,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/generator/templates/main@generator.mps
index b88f40f77..02bfb0004 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
index 6ecb2545f..9f8434dcd 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
@@ -51,7 +51,7 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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>
@@ -62,7 +62,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" />
@@ -78,7 +78,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" />
@@ -133,7 +133,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>
@@ -178,7 +178,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.structure.mps
index bc3ff6139..faedc3124 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.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/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/com.mbeddr.formal.req.tl_patterns.arch.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/com.mbeddr.formal.req.tl_patterns.arch.mpl
index 1437842bc..63de3e2e6 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/com.mbeddr.formal.req.tl_patterns.arch.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/com.mbeddr.formal.req.tl_patterns.arch.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" />
@@ -67,7 +67,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -78,7 +77,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/generator/templates/main@generator.mps
index 86b088bbc..d9cc7b4f5 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.behavior.mps
index e81d3ba15..f6d7eb78a 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.behavior.mps
@@ -62,14 +62,14 @@
       <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>
       <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" />
@@ -89,7 +89,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.editor.mps
index 6ce0c363a..f1959cf5e 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.editor.mps
@@ -32,7 +32,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" />
@@ -48,7 +48,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" />
@@ -70,7 +70,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.structure.mps
index d544622b5..1b4271cfb 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/models/com.mbeddr.formal.req.tl_patterns.arch.structure.mps
@@ -34,7 +34,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/com.mbeddr.formal.req.tl_patterns.nusmv.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/com.mbeddr.formal.req.tl_patterns.nusmv.mpl
index eb354f873..c9c844869 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/com.mbeddr.formal.req.tl_patterns.nusmv.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/com.mbeddr.formal.req.tl_patterns.nusmv.mpl
@@ -42,7 +42,7 @@
         <language slang="l:450c81f1-1811-41ac-a9c8-8fda59f778ca:com.mbeddr.formal.nusmv.tabular" 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" />
@@ -142,7 +142,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">22a84bd5-d947-48ae-b9f6-8288eea41dce(com.mbeddr.formal.nusmv.arch)</dependency>
@@ -153,7 +152,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
index 215255672..3d29435da 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
@@ -83,7 +83,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -149,7 +149,7 @@
       </concept>
       <concept id="1170725621272" name="jetbrains.mps.lang.generator.structure.MapSrcMacro_MapperFunction" flags="in" index="2kFOW8" />
       <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_" />
@@ -194,6 +194,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" />
@@ -204,7 +205,7 @@
     </language>
     <language id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv">
       <concept id="2707707741262126533" name="com.mbeddr.formal.nusmv.structure.EmptyModuleContent" flags="ng" index="s4Ewt" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="8004696212664087401" name="com.mbeddr.formal.nusmv.structure.CTLSpecSection" flags="ng" index="tPTuy" />
@@ -344,7 +345,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">
@@ -371,7 +372,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" />
@@ -689,7 +689,7 @@
                         <node concept="2OqwBi" id="6hWVnwADEWv" role="3clFbG">
                           <node concept="2OqwBi" id="6hWVnwADBpN" role="2Oq$k0">
                             <node concept="37vLTw" id="6hWVnwADB0B" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6hWVnwADABQ" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EN4tf" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6hWVnwADD7Q" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -709,9 +709,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6hWVnwADABQ" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EN4tf" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6hWVnwADABR" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EN4tg" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -772,7 +772,7 @@
                       <node concept="2OqwBi" id="6hWVnwAdViG" role="3clFbG">
                         <node concept="2OqwBi" id="6hWVnwAdOVa" role="2Oq$k0">
                           <node concept="37vLTw" id="6hWVnwAdOwS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hWVnwAdOkn" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4th" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6hWVnwAdS6a" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -787,9 +787,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hWVnwAdOkn" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EN4th" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hWVnwAdOko" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EN4ti" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -872,7 +872,7 @@
                                 <node concept="3clFbF" id="6hWVnwA$rjo" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hWVnwA$rjp" role="3clFbG">
                                     <node concept="37vLTw" id="6hWVnwA$rjq" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6hWVnwA$rjs" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36EN4tj" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="6hWVnwA$rjr" role="2OqNvi">
                                       <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -880,9 +880,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6hWVnwA$rjs" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36EN4tj" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6hWVnwA$rjt" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36EN4tk" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1674,7 +1674,7 @@
                       <node concept="3clFbF" id="6hWVnwAEsGw" role="3cqZAp">
                         <node concept="2OqwBi" id="6hWVnwAEsGx" role="3clFbG">
                           <node concept="37vLTw" id="6hWVnwAEsGy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hWVnwAEsG$" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4tl" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hWVnwAEsGz" role="2OqNvi">
                             <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -1682,9 +1682,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6hWVnwAEsG$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EN4tl" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6hWVnwAEsG_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EN4tm" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1728,7 +1728,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6hWVnwAETT5" role="3uHU7B">
                                   <node concept="37vLTw" id="6hWVnwAETT6" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6hWVnwAETT8" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36EN4tn" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6hWVnwAETT7" role="2OqNvi">
                                     <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -1737,9 +1737,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="6hWVnwAETT8" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36EN4tn" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="6hWVnwAETT9" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36EN4to" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -1751,7 +1751,7 @@
                             <node concept="2OqwBi" id="5uTeY1FmZei" role="3clFbG">
                               <node concept="2OqwBi" id="6hWVnwAETTe" role="2Oq$k0">
                                 <node concept="37vLTw" id="6hWVnwAETTf" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6hWVnwAETTh" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EN4tp" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="5FhZjqTOKQQ" role="2OqNvi">
                                   <ref role="3TtcxE" to="yyq9:5FhZjqTO19U" resolve="specs" />
@@ -1765,9 +1765,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6hWVnwAETTh" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EN4tp" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6hWVnwAETTi" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EN4tq" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.behavior.mps
index 781513103..f38f15da1 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.behavior.mps
@@ -42,7 +42,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -59,7 +59,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.constraints.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.constraints.mps
index 0de8b74e8..3112fa134 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.constraints.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.constraints.mps
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.editor.mps
index 9e8f65352..8a0014380 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.editor.mps
@@ -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="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.structure.mps
index cddbe55f7..edb543d48 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.structure.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.typesystem.mps
index f598a06a9..0b18ede3d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.typesystem.mps
@@ -98,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
index 81722a1a5..b5b0d4d3a 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
@@ -58,12 +58,13 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -97,7 +98,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -106,7 +107,6 @@
         <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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -149,7 +149,7 @@
                       <node concept="2OqwBi" id="6hWVnwAb4RN" role="3clFbG">
                         <node concept="2OqwBi" id="6hWVnwAb4RO" role="2Oq$k0">
                           <node concept="37vLTw" id="6hWVnwAb4RP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hWVnwAb4RT" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EN4tc" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hWVnwAb4RQ" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
@@ -163,9 +163,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6hWVnwAb4RT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EN4tc" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hWVnwAb4RU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EN4td" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/com.mbeddr.formal.req.tl_patterns.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/com.mbeddr.formal.req.tl_patterns.mpl
index 8c08a3e4d..ad906b962 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/com.mbeddr.formal.req.tl_patterns.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/com.mbeddr.formal.req.tl_patterns.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</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/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps
index 23a1341d2..b3c77363d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps
@@ -63,14 +63,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.editor.mps
index 03fde482c..a2a8f9e9d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.editor.mps
@@ -50,7 +50,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="1139744628335" name="jetbrains.mps.lang.editor.structure.CellModel_Image" flags="sg" stub="8104358048506731195" index="1u4HXA">
@@ -67,7 +67,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" />
@@ -90,7 +90,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>
@@ -103,7 +103,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
index 7b75f0ba3..285870280 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
@@ -41,6 +41,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" />
@@ -92,7 +93,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -101,7 +102,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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -215,7 +215,7 @@
                     <node concept="3clFbF" id="3bh1RFvtFBx" role="3cqZAp">
                       <node concept="17QLQc" id="3bh1RFvtMXz" role="3clFbG">
                         <node concept="37vLTw" id="3bh1RFvtFBw" role="3uHU7B">
-                          <ref role="3cqZAo" node="3bh1RFvtFwI" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36EN4tr" resolve="it" />
                         </node>
                         <node concept="35c_gC" id="3bh1RFvtEur" role="3uHU7w">
                           <ref role="35c_gD" to="yyq9:1Tg5$nepcbz" resolve="Time" />
@@ -223,9 +223,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3bh1RFvtFwI" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EN4tr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3bh1RFvtFwJ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EN4ts" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.structure.mps
index db59d392a..4e649fe68 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.structure.mps
@@ -45,7 +45,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.typesystem.mps
index ea58b0899..5fde93b18 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.typesystem.mps
@@ -49,7 +49,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">
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd
index 5fd77ca3e..3c2b0f644 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.req.odd.sandbox" uuid="73fb596f-9570-4b3a-ac73-e7cd09a99ac8" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.req.odd.sandbox" uuid="73fb596f-9570-4b3a-ac73-e7cd09a99ac8" moduleVersion="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">8fe22e59-5111-4d11-87a2-2938e839b2fd(com.fasten.req.ontology.lib)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps
index 1d4944a5f..1530154bc 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/com.fasten.req.ontology.lib.msd b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/com.fasten.req.ontology.lib.msd
index 310f9ce11..b7a00d0e0 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/com.fasten.req.ontology.lib.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/com.fasten.req.ontology.lib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.req.ontology.lib" uuid="8fe22e59-5111-4d11-87a2-2938e839b2fd" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.req.ontology.lib" uuid="8fe22e59-5111-4d11-87a2-2938e839b2fd" moduleVersion="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:f52452b6-7f99-441b-98f9-a98c52b92236:com.fasten.req.odd" version="1" />
     <language slang="l:65ed2ac6-4499-4751-951e-3819684a4b8d:com.fasten.req.ontology" version="1" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.czarnecki.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.czarnecki.mps
index a9ef61b57..5761f1f42 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.czarnecki.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.czarnecki.mps
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.koopman.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.koopman.mps
index 6bda9f7f7..93b421240 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.koopman.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.koopman.mps
@@ -29,7 +29,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.wordnet.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.wordnet.mps
index a40de0608..82e5015ad 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.wordnet.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/models/com.fasten.req.ontology.lib.wordnet.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/com.fasten.req.ontology.pluginSolution.msd b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/com.fasten.req.ontology.pluginSolution.msd
index 18b61aae7..d787facb3 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/com.fasten.req.ontology.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/com.fasten.req.ontology.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.req.ontology.pluginSolution" uuid="f0ea6b3a-8982-4cc9-8499-97dda9c3bd86" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.fasten.req.ontology.pluginSolution" uuid="f0ea6b3a-8982-4cc9-8499-97dda9c3bd86" moduleVersion="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">945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)</dependency>
     <dependency reexport="false">f52452b6-7f99-441b-98f9-a98c52b92236(com.fasten.req.odd)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/models/com.fasten.req.ontology.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/models/com.fasten.req.ontology.pluginSolution.plugin.mps
index c391fb9a1..cc6f6332e 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/models/com.fasten.req.ontology.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/models/com.fasten.req.ontology.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:0ce468fe-cd11-4bd0-b286-f546c692582d(com.fasten.req.ontology.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
   </languages>
@@ -27,7 +27,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/com.mbeddr.formal.req.base.pluginSolution.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/com.mbeddr.formal.req.base.pluginSolution.msd
index 18bd89e35..75be86af2 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/com.mbeddr.formal.req.base.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/com.mbeddr.formal.req.base.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.req.base.pluginSolution" uuid="7ef3bfd1-5c44-48e1-9906-6b55babec257" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.req.base.pluginSolution" uuid="7ef3bfd1-5c44-48e1-9906-6b55babec257" moduleVersion="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">fdd69818-de3d-4ebf-9ec6-17ea152db151(com.mpsbasics.docx4j.core)</dependency>
@@ -22,10 +21,10 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.plugin.mps
index 3c61aa4e5..e935ecc6c 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:d8e3f492-1bbb-4890-947d-6d9bfa99e3cc(com.mbeddr.formal.req.base.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -25,6 +25,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -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>
@@ -107,7 +108,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>
@@ -115,7 +116,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">
@@ -125,7 +126,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>
@@ -141,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -291,6 +292,7 @@
   <node concept="sE7Ow" id="2w5Gq4UtlOH">
     <property role="TrG5h" value="SerializeRequirements2Word" />
     <property role="2uzpH1" value="Serialize Requirement Document to Word" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="2w5Gq4Utm4H" role="1NuT2Z">
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="2w5Gq4Utm4I" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps
index 8262de0ff..9803e44de 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -80,7 +80,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,12 +97,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" />
@@ -135,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -151,7 +152,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="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
     </language>
@@ -764,7 +764,7 @@
                           <node concept="2OqwBi" id="38aFq1j6lm9" role="2Oq$k0">
                             <node concept="2OqwBi" id="38aFq1j6gXT" role="2Oq$k0">
                               <node concept="37vLTw" id="38aFq1j6gMB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="38aFq1j6gBs" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36EN4tu" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="38aFq1j6hhM" role="2OqNvi">
                                 <ref role="3Tt5mk" to="z27p:2N7iSwGA7QF" resolve="text" />
@@ -780,9 +780,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="38aFq1j6gBs" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EN4tu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="38aFq1j6gBt" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EN4tv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
index b33d278ca..08394e99b 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.req.sandbox" uuid="618688ed-913c-470c-bd0d-f2efcc6bdfc0" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.req.sandbox" uuid="618688ed-913c-470c-bd0d-f2efcc6bdfc0" moduleVersion="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:3b22dedc-d6cf-4626-9445-6e9909b3e04a:com.fasten.base.arch.msc" version="0" />
     <language slang="l:81f6a079-965e-4523-87c3-8e6194f66585:com.fasten.base.msc" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._010_requirements.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._010_requirements.mps
index ae68e6e54..66b828cc5 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._010_requirements.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._010_requirements.mps
@@ -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>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._020_tl_patterns_boilerplates_spec.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._020_tl_patterns_boilerplates_spec.mps
index 777f12c61..0b58fd9cd 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._020_tl_patterns_boilerplates_spec.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._020_tl_patterns_boilerplates_spec.mps
@@ -11,10 +11,10 @@
   <imports />
   <registry>
     <language id="5ff577d1-1817-495b-9d6c-ff7b52c68609" name="com.mbeddr.formal.req.tl_patterns">
-      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ng" index="Sxolh">
+      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ngI" index="Sxolh">
         <child id="7632099376746146980" name="time" index="Sxolm" />
       </concept>
-      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ng" index="SB3Yt">
+      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ngI" index="SB3Yt">
         <child id="7632099376746632816" name="probability" index="SB3Y2" />
       </concept>
       <concept id="7632099376746544950" name="com.mbeddr.formal.req.tl_patterns.structure.HighProbabilityBound" flags="ng" index="SBTr4" />
@@ -39,7 +39,7 @@
       <concept id="2184270308345955043" name="com.mbeddr.formal.req.tl_patterns.structure.Time" flags="ng" index="3gddiA">
         <child id="2184270308345955380" name="unit" index="3gdd9L" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
       <concept id="6544290145033461193" name="com.mbeddr.formal.req.tl_patterns.structure.TLRequirementSpecification" flags="ng" index="3z7I3Z" />
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._030_tl_patterns_req_spec.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._030_tl_patterns_req_spec.mps
index 3750ca3ab..c11d2b5bb 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._030_tl_patterns_req_spec.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._030_tl_patterns_req_spec.mps
@@ -25,7 +25,7 @@
       <concept id="7240923401194766738" name="com.mbeddr.formal.req.tl_patterns.structure.AfterScope" flags="ng" index="12uYNE">
         <child id="7240923401194766754" name="q" index="12uYNq" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -81,7 +81,7 @@
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636880" name="com.mbeddr.formal.nusmv.structure.GreaterExpression" flags="ng" index="nE0YJ" />
       <concept id="2858146662931636879" name="com.mbeddr.formal.nusmv.structure.LessEqualsExpression" flags="ng" index="nE0YK" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="7842584090744804989" name="com.mbeddr.formal.nusmv.structure.AndExpression" flags="ng" index="2HbMbg" />
@@ -142,7 +142,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
index e86102eeb..9dae37704 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
@@ -21,7 +21,7 @@
         <child id="7240923401194766808" name="r" index="12uYMw" />
         <child id="7240923401194766806" name="q" index="12uYMI" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._100_msc_req_spec.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._100_msc_req_spec.mps
index 3800c1463..98051e06f 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._100_msc_req_spec.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._100_msc_req_spec.mps
@@ -121,7 +121,7 @@
       <concept id="4446202499243314330" name="com.mbeddr.formal.req.msc.structure.ScenarioSpecReq" flags="ng" index="2brx$7" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._200_scenarios_spec.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._200_scenarios_spec.mps
index aad8791bd..1da0b1316 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._200_scenarios_spec.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._200_scenarios_spec.mps
@@ -59,7 +59,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
index 104925daa..d7c22e31b 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution" uuid="1164b831-8cda-44ed-89c4-3c28e36c6eea" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution" uuid="1164b831-8cda-44ed-89c4-3c28e36c6eea" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -32,12 +31,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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
index 8488048bf..dd58cd7cb 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
@@ -27,7 +27,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -75,7 +75,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -87,13 +87,14 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="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" />
@@ -111,7 +112,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -130,7 +131,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -255,7 +255,7 @@
                           <node concept="1pGfFk" id="6hWVnwAONq6" role="2ShVmc">
                             <ref role="37wK5l" node="6hWVnwAOhJ_" resolve="NuSMVReqConsistencyAnalysisLiftedResult" />
                             <node concept="37vLTw" id="6hWVnwAONwB" role="37wK5m">
-                              <ref role="3cqZAo" node="6hWVnwAOILJ" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EN4tw" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -263,9 +263,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6hWVnwAOILJ" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36EN4tw" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6hWVnwAOILK" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36EN4tx" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
index 04bdb5310..e301e4ceb 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
@@ -2,12 +2,12 @@
 <model ref="r:c9cead59-6d55-4d23-adfe-779561088ac4(com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" 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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -48,6 +48,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -71,7 +72,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -92,7 +93,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -165,7 +166,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>
@@ -182,13 +183,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" />
@@ -196,7 +198,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>
@@ -238,7 +240,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -247,7 +249,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -256,6 +257,7 @@
   <node concept="sE7Ow" id="6NmtaR23THu">
     <property role="TrG5h" value="RunNUSMVOnRequirementsDocument" />
     <property role="2uzpH1" value="Check Requirements Consistency with NuSMV" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6NmtaR23THv" role="tncku">
       <node concept="3clFbS" id="6NmtaR23THw" role="2VODD2">
         <node concept="3cpWs8" id="6hWVnwAvmv$" role="3cqZAp">
@@ -303,7 +305,7 @@
                           <node concept="2OqwBi" id="6hWVnwAv2_U" role="1m5AlR">
                             <node concept="2OqwBi" id="6hWVnwAuZZy" role="2Oq$k0">
                               <node concept="37vLTw" id="6hWVnwAuZOI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6hWVnwAuZFq" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36EN4t$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6hWVnwAv0i1" role="2OqNvi">
                                 <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -314,9 +316,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6hWVnwAuZFq" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EN4t$" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6hWVnwAuZFr" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EN4t_" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
index 4f3d2533c..0edbf9986 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
@@ -88,7 +88,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,7 +103,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">
@@ -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" />
@@ -156,7 +157,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,7 +172,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="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -218,7 +218,7 @@
                             <node concept="2OqwBi" id="5uTeY1FknC5" role="3clFbG">
                               <node concept="2OqwBi" id="5uTeY1Fkl4H" role="2Oq$k0">
                                 <node concept="37vLTw" id="5uTeY1FkkSK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5uTeY1FkkL5" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EN4ty" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5uTeY1FkmhS" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -233,9 +233,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5uTeY1FkkL5" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EN4ty" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5uTeY1FkkL6" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EN4tz" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.word_serializer.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.word_serializer.mps
index 52024765f..e154de477 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.word_serializer.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.word_serializer.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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -79,7 +79,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -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/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._010_requirements_consistency@tests.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._010_requirements_consistency@tests.mps
index 9af266000..f2dfeacc3 100644
--- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._010_requirements_consistency@tests.mps
+++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._010_requirements_consistency@tests.mps
@@ -62,7 +62,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps
index 3cac80e21..eb8127aa1 100644
--- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps
+++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps
@@ -70,7 +70,7 @@
       <concept id="7240923401194766860" name="com.mbeddr.formal.req.tl_patterns.structure.ExistencePattern" flags="ng" index="12uYXO">
         <child id="7240923401194766873" name="p" index="12uYXx" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
       <concept id="6584464211391019107" name="com.mbeddr.formal.nusmv.arch.structure.OutputRef" flags="ng" index="JmOWN" />
     </language>
     <language id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv">
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="7842584090743386548" name="com.mbeddr.formal.nusmv.structure.VariableDeclaration" flags="ng" index="2Hdskp">
@@ -147,7 +147,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._050_tl_patterns_requirements@tests.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._050_tl_patterns_requirements@tests.mps
index 5754e0046..3eaee19ed 100644
--- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._050_tl_patterns_requirements@tests.mps
+++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._050_tl_patterns_requirements@tests.mps
@@ -54,10 +54,10 @@
         <child id="7632099376748602196" name="time" index="SvwEA" />
         <child id="7632099376748602197" name="timeUnit" index="SvwEB" />
       </concept>
-      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ng" index="Sxolh">
+      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ngI" index="Sxolh">
         <child id="7632099376746146980" name="time" index="Sxolm" />
       </concept>
-      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ng" index="SB3Yt">
+      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ngI" index="SB3Yt">
         <child id="7632099376746632816" name="probability" index="SB3Y2" />
       </concept>
       <concept id="7632099376746544950" name="com.mbeddr.formal.req.tl_patterns.structure.HighProbabilityBound" flags="ng" index="SBTr4" />
@@ -102,7 +102,7 @@
       <concept id="2184270308345955043" name="com.mbeddr.formal.req.tl_patterns.structure.Time" flags="ng" index="3gddiA">
         <child id="2184270308345955380" name="unit" index="3gdd9L" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
       <concept id="6544290145033461193" name="com.mbeddr.formal.req.tl_patterns.structure.TLRequirementSpecification" flags="ng" index="3z7I3Z" />
@@ -123,7 +123,7 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -177,7 +177,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns.testcode._010_requirements_consistency.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns.testcode._010_requirements_consistency.mps
index 724020926..a544adce3 100644
--- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns.testcode._010_requirements_consistency.mps
+++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns.testcode._010_requirements_consistency.mps
@@ -25,7 +25,7 @@
       <concept id="7240923401194766860" name="com.mbeddr.formal.req.tl_patterns.structure.ExistencePattern" flags="ng" index="12uYXO">
         <child id="7240923401194766873" name="p" index="12uYXx" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -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/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd
index eb762813c..2ff0f7f52 100644
--- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd
+++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.req.tl_patterns" uuid="710e4a44-4764-4107-9c89-e059fb11d8f5" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.req.tl_patterns" uuid="710e4a44-4764-4107-9c89-e059fb11d8f5" 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">1164b831-8cda-44ed-89c4-3c28e36c6eea(com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/.mps/migration.xml b/code/languages/com.mbeddr.formal.safety/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.mbeddr.formal.safety/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.safety/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
index 29370c67f..f622f4ad4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,7 +54,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -65,7 +64,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -86,7 +85,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps
index 6af37c5b0..2d8cdb798 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.behavior.mps
index e5f2cd403..eac52d193 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.behavior.mps
@@ -80,7 +80,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>
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.constraints.mps
index 316e9f51a..ecfe7b74e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.constraints.mps
@@ -43,7 +43,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/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
index 964d24b17..382e0fc6d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
@@ -80,7 +80,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -105,7 +105,7 @@
       <concept id="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">
@@ -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>
@@ -180,7 +180,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -229,7 +229,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
index ce62650e5..2cf3e3373 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -66,6 +66,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -84,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>
@@ -92,7 +93,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" />
     </language>
@@ -147,7 +147,7 @@
                         <node concept="1beSmn" id="5t37uj6C0e5" role="3uHU7w" />
                         <node concept="2OqwBi" id="5t37uj6C0e6" role="3uHU7B">
                           <node concept="37vLTw" id="5t37uj6C0e7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5t37uj6C0e9" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCvH" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5t37uj6C0e8" role="2OqNvi">
                             <ref role="3Tt5mk" to="kivz:5t37uj6_AgL" resolve="subject" />
@@ -156,9 +156,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5t37uj6C0e9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCvH" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5t37uj6C0ea" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCvI" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.structure.mps
index e96b4a951..31c914b78 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.structure.mps
@@ -50,7 +50,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.typesystem.mps
index e6a0a6df4..62e638f79 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.typesystem.mps
@@ -52,7 +52,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +127,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
index 3c3a09993..bb5439119 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
@@ -27,7 +27,7 @@
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -54,7 +54,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -66,7 +65,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps
index 6669cf0e2..a39b93b42 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
index 04ff27b69..e88f4ea25 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
@@ -86,7 +86,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="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">
@@ -119,7 +119,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
index 9d97046dd..7595e8225 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
@@ -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="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -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">
@@ -225,7 +225,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -242,7 +242,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">
@@ -306,7 +306,7 @@
       <concept id="3155126767689025629" name="de.itemis.mps.editor.diagram.structure.Content_Childs" flags="ng" index="aDKH9">
         <reference id="3155126767689025691" name="linkDeclaration" index="aDKIf" />
       </concept>
-      <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>
@@ -323,7 +323,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="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
@@ -388,7 +388,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
index 5bfad1669..63c688ed3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
@@ -50,7 +50,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.typesystem.mps
index 2f0c5c235..af2c4472b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.typesystem.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
index c6305fd48..4ea484704 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)</dependency>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
@@ -25,7 +24,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
index d326276c4..a24f2438e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="41f8da2b-a34a-4d66-950d-f1091bdb451f(jetbrains.mps.devkit.aspect.behavior)" />
   </languages>
   <imports>
     <import index="arip" ref="r:05796a31-2f42-44d2-9b5e-7769941d865b(com.fasten.safety.fmea.behavior)" />
@@ -75,7 +75,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,12 +86,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" />
@@ -120,7 +121,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -128,7 +129,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
@@ -217,7 +217,7 @@
                         </node>
                         <node concept="2OqwBi" id="GA19r1644w" role="3uHU7B">
                           <node concept="37vLTw" id="GA19r1644x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="GA19r1644z" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCvK" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="GA19r1644y" role="2OqNvi">
                             <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
@@ -226,9 +226,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="GA19r1644z" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCvK" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="GA19r1644$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCvL" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -318,7 +318,7 @@
                         </node>
                         <node concept="2OqwBi" id="22gnu5EUEyg" role="3uHU7B">
                           <node concept="37vLTw" id="22gnu5EUEyh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="22gnu5EUEyj" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCvM" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="22gnu5EUEyi" role="2OqNvi">
                             <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
@@ -327,9 +327,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="22gnu5EUEyj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCvM" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="22gnu5EUEyk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCvN" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
index e395f3856..355b514fa 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
@@ -46,7 +46,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.editor.mps
index 5bf15f25d..e9ffea3fc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.editor.mps
@@ -31,7 +31,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" />
@@ -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" />
@@ -86,7 +86,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps
index b449b0417..c1f59f218 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.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/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
index b3494c4a6..3b45b67cf 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.behavior.mps
index facef0eab..d12a48ea7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.behavior.mps
@@ -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>
@@ -81,7 +81,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -109,7 +109,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
index 66a2e9980..c36f83bae 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
@@ -37,7 +37,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -53,7 +53,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -110,7 +110,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>
@@ -158,7 +158,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.structure.mps
index 7e6bcd2ba..5b4bfe78f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.structure.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
index 22fc4c997..f13c6cefc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.behavior.mps
index 03c7df1ff..34414e20a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.behavior.mps
@@ -43,7 +43,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -63,7 +63,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
index 447677a81..2ccfc3ee9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
@@ -37,7 +37,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>
@@ -55,7 +55,7 @@
       </concept>
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn" />
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -78,7 +78,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>
@@ -123,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>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.structure.mps
index 6ecae1660..79d314f2c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.structure.mps
@@ -58,7 +58,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
index 032c189b9..66e702ae1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
@@ -56,7 +56,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -74,6 +74,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" />
@@ -128,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -146,7 +147,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -360,7 +360,7 @@
                   <node concept="3clFbF" id="3x7uzC8sp3t" role="3cqZAp">
                     <node concept="2OqwBi" id="3x7uzC8sp3u" role="3clFbG">
                       <node concept="37vLTw" id="3x7uzC8sp3v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3x7uzC8sp3x" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCvQ" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="3x7uzC8sp3w" role="2OqNvi">
                         <ref role="3Tt5mk" to="6k2r:31P83hzFOt7" resolve="failureModeDefinition" />
@@ -368,9 +368,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3x7uzC8sp3x" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCvQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3x7uzC8sp3y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCvR" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -427,7 +427,7 @@
                       <node concept="3clFbF" id="22gnu5EV2rP" role="3cqZAp">
                         <node concept="2OqwBi" id="22gnu5EV2Fl" role="3clFbG">
                           <node concept="37vLTw" id="22gnu5EV2rO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="22gnu5EV2k6" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCvS" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="22gnu5EV2Vv" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -435,9 +435,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="22gnu5EV2k6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCvS" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="22gnu5EV2k7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCvT" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
index 0dba5c10a..109d881b6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
@@ -33,7 +33,7 @@
         <language slang="l:b67a6ca0-735e-4903-b238-4b525bddf96a:com.mbeddr.mpsutil.genutil" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -66,7 +66,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -77,7 +76,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
index bcc6ffd84..ba298e8be 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
@@ -47,7 +47,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -143,7 +143,7 @@
         <child id="1145195647826100986" name="content" index="356KY_" />
       </concept>
       <concept id="1145195647826084325" name="com.dslfoundry.plaintextgen.structure.VerticalLines" flags="ng" index="356WMU" />
-      <concept id="7214912913997260680" name="com.dslfoundry.plaintextgen.structure.IVerticalGroup" flags="ng" index="383Yap">
+      <concept id="7214912913997260680" name="com.dslfoundry.plaintextgen.structure.IVerticalGroup" flags="ngI" index="383Yap">
         <child id="7214912913997260696" name="lines" index="383Ya9" />
       </concept>
     </language>
@@ -180,7 +180,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.util.mps
index da2070d5e..16d4f619d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.util.mps
@@ -56,7 +56,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>
@@ -68,7 +68,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">
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
index 81a6c6a0f..5b04bf862 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.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>
@@ -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" />
@@ -61,7 +60,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
index 9f51b1e4c..7303e15be 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
@@ -58,19 +58,20 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -114,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +127,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="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" />
@@ -207,7 +207,7 @@
                           <node concept="13iPFW" id="3oGITgu_M2u" role="3uHU7w" />
                           <node concept="2OqwBi" id="3oGITgu_Lvu" role="3uHU7B">
                             <node concept="37vLTw" id="3oGITgu_LgD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3oGITgu_L85" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCvV" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3oGITgu_Nzo" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -216,9 +216,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3oGITgu_L85" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCvV" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3oGITgu_L86" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCvW" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -229,7 +229,7 @@
                     <node concept="3clFbF" id="3oGITgu_N1r" role="3cqZAp">
                       <node concept="2OqwBi" id="3oGITgu_NhH" role="3clFbG">
                         <node concept="37vLTw" id="3oGITgu_N1q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3oGITgu_MCT" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCvX" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3oGITgu_NDs" role="2OqNvi">
                           <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -237,9 +237,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3oGITgu_MCT" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCvX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3oGITgu_MCU" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCvY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -287,7 +287,7 @@
                           <node concept="13iPFW" id="3oGITguAph3" role="3uHU7w" />
                           <node concept="2OqwBi" id="3oGITguAph4" role="3uHU7B">
                             <node concept="37vLTw" id="3oGITguAph5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3oGITguAph7" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCvZ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3oGITguAph6" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -296,9 +296,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3oGITguAph7" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCvZ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3oGITguAph8" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCw0" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -417,7 +417,7 @@
                         <node concept="3clFbC" id="1GpuQySZp47" role="3clFbG">
                           <node concept="2OqwBi" id="1GpuQySZp49" role="3uHU7B">
                             <node concept="37vLTw" id="1GpuQySZp4a" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1GpuQySZp4c" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCw1" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveETB7f" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -427,9 +427,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1GpuQySZp4c" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCw1" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1GpuQySZp4d" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCw2" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -476,7 +476,7 @@
                         <node concept="3clFbC" id="12e1nc$3fy$" role="3clFbG">
                           <node concept="2OqwBi" id="12e1nc$3fy_" role="3uHU7B">
                             <node concept="37vLTw" id="12e1nc$3fyA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="12e1nc$3fyD" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCw3" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="12e1nc$3fyB" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -486,9 +486,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="12e1nc$3fyD" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCw3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="12e1nc$3fyE" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCw4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
index 05bf0e51d..443ff29c6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
@@ -46,7 +46,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -69,6 +69,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -94,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -102,7 +103,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
@@ -141,7 +141,7 @@
                           <node concept="3fqX7Q" id="6csJveEW4PH" role="3uHU7B">
                             <node concept="2OqwBi" id="6csJveEW4PJ" role="3fr31v">
                               <node concept="37vLTw" id="6csJveEW4PK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6csJveEW3k6" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCw5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6csJveEW4PL" role="2OqNvi">
                                 <node concept="chp4Y" id="6csJveEW4PM" role="cj9EA">
@@ -153,7 +153,7 @@
                           <node concept="3fqX7Q" id="6csJveEW4TU" role="3uHU7w">
                             <node concept="2OqwBi" id="6csJveEW4TV" role="3fr31v">
                               <node concept="37vLTw" id="6csJveEW4TW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6csJveEW3k6" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCw5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6csJveEW4TX" role="2OqNvi">
                                 <node concept="chp4Y" id="6csJveEW521" role="cj9EA">
@@ -165,9 +165,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6csJveEW3k6" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCw5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6csJveEW3k7" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCw6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -208,7 +208,7 @@
                         <node concept="3fqX7Q" id="6csJveEW5sA" role="3clFbG">
                           <node concept="2OqwBi" id="6csJveEW5sB" role="3fr31v">
                             <node concept="37vLTw" id="6csJveEW5sC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6csJveEW5sK" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCw7" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6csJveEW5sD" role="2OqNvi">
                               <node concept="chp4Y" id="6csJveEW5Fu" role="cj9EA">
@@ -219,9 +219,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6csJveEW5sK" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCw7" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6csJveEW5sL" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCw8" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index 3b9aef194..1f52502d5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -93,12 +93,12 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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="1235999440492" name="jetbrains.mps.lang.editor.structure.HorizontalAlign" flags="ln" index="37jFXN">
@@ -119,7 +119,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -149,7 +149,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -168,7 +168,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -200,7 +200,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">
@@ -312,7 +312,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -330,7 +330,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">
@@ -363,6 +363,7 @@
       <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -426,7 +427,7 @@
         <child id="1981294357059564524" name="paletteSources" index="1RuSHk" />
       </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="5725606875425248008" name="delete" index="1ide8m" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -451,7 +452,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="5112292084089908370" name="de.itemis.mps.editor.diagram.structure.EditorContextExpression" flags="ng" index="UMIS2" />
@@ -588,7 +589,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -619,7 +620,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="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
@@ -2467,7 +2467,7 @@
                         </node>
                         <node concept="2OqwBi" id="1GpuQySZp49" role="3uHU7B">
                           <node concept="37vLTw" id="1GpuQySZp4a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1GpuQySZp4c" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCw9" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveETB7f" role="2OqNvi">
                             <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -2476,9 +2476,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1GpuQySZp4c" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCw9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1GpuQySZp4d" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCwa" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
index 3bf6e5b54..2992f4457 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -134,6 +134,7 @@
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -225,7 +226,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -256,7 +257,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -513,7 +513,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEcMyF" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEcMlB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4G_iuUEcMgE" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCwb" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveEQt5G" role="2OqNvi">
                             <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -522,9 +522,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4G_iuUEcMgE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCwb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4G_iuUEcMgF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCwc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -539,7 +539,7 @@
                       </node>
                       <node concept="2OqwBi" id="4G_iuUEcOj2" role="37vLTJ">
                         <node concept="37vLTw" id="4G_iuUEcOdF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4G_iuUEcO9n" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCwd" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6csJveEQtJw" role="2OqNvi">
                           <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -548,9 +548,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4G_iuUEcO9n" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCwd" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4G_iuUEcO9o" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCwe" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -918,7 +918,7 @@
                             <node concept="3JPx81" id="6fCPE$QM6F3" role="2OqNvi">
                               <node concept="2OqwBi" id="6fCPE$QM6F4" role="25WWJ7">
                                 <node concept="37vLTw" id="6fCPE$QM6F5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6fCPE$QM6F7" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCwf" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6csJveEQJwZ" role="2OqNvi">
                                   <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -928,9 +928,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6fCPE$QM6F7" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCwf" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6fCPE$QM6F8" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCwg" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -968,7 +968,7 @@
                               <node concept="TSZUe" id="6fCPE$QM9YH" role="2OqNvi">
                                 <node concept="2OqwBi" id="6fCPE$QMav5" role="25WWJ7">
                                   <node concept="37vLTw" id="6fCPE$QMabn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6fCPE$QM8fe" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpCwh" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6csJveEQKuX" role="2OqNvi">
                                     <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -978,9 +978,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6fCPE$QM8fe" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCwh" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6fCPE$QM8ff" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCwi" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
index afdb0063c..a1746d31e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -55,7 +55,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -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" />
@@ -107,7 +107,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
index d1bc400b4..f12e306ac 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
@@ -41,7 +41,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -80,7 +80,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">
@@ -127,7 +127,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -143,7 +143,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
@@ -155,6 +155,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" />
@@ -210,7 +211,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -249,7 +250,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="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -582,7 +582,7 @@
                                       <node concept="17R0WA" id="4dyd$$w7ZJS" role="3clFbG">
                                         <node concept="2OqwBi" id="4dyd$$w7ZJT" role="3uHU7B">
                                           <node concept="37vLTw" id="4dyd$$w7ZJU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1r1mR59OsS1" resolve="it" />
+                                            <ref role="3cqZAo" node="2hED36FpCwj" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4dyd$$w7ZJV" role="2OqNvi">
                                             <ref role="3Tt5mk" to="spwl:1SpkZ1V83E9" resolve="subtreeStart" />
@@ -594,9 +594,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="1r1mR59OsS1" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2hED36FpCwj" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="1r1mR59OsS2" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2hED36FpCwk" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -623,7 +623,7 @@
                                           </node>
                                           <node concept="TSZUe" id="1r1mR59O$rQ" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59O_S$" role="25WWJ7">
-                                              <ref role="3cqZAo" node="1r1mR59Owok" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36FpCwl" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -636,16 +636,16 @@
                                         </node>
                                         <node concept="3JPx81" id="4dyd$$w64u6" role="2OqNvi">
                                           <node concept="37vLTw" id="4dyd$$w64u7" role="25WWJ7">
-                                            <ref role="3cqZAo" node="1r1mR59Owok" resolve="it" />
+                                            <ref role="3cqZAo" node="2hED36FpCwl" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="1r1mR59Owok" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36FpCwl" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1r1mR59Owol" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36FpCwm" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -722,15 +722,15 @@
                                           </node>
                                           <node concept="3JPx81" id="1r1mR59M8xZ" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59M8y0" role="25WWJ7">
-                                              <ref role="3cqZAo" node="1r1mR59M8y1" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36FpCwn" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="1r1mR59M8y1" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2hED36FpCwn" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="1r1mR59M8y2" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2hED36FpCwo" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
@@ -796,15 +796,15 @@
                                           </node>
                                           <node concept="3JPx81" id="1r1mR59M3lD" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59M3lE" role="25WWJ7">
-                                              <ref role="3cqZAo" node="1r1mR59M3lF" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36FpCwp" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="1r1mR59M3lF" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2hED36FpCwp" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="1r1mR59M3lG" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2hED36FpCwq" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps
index 45b0c4a60..6bc7eb1df 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.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/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
index e04e76670..7478499f7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
@@ -27,7 +27,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -106,7 +106,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -119,7 +119,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -234,7 +234,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl
index 4ac03a74d..b8e3929a7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)</dependency>
     <dependency reexport="false">a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)</dependency>
@@ -75,7 +74,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps
index 0f23c43eb..c0170f532 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.editor.mps
index 4830080bc..29fd9c303 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.editor.mps
@@ -35,7 +35,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
index 38be14e10..78475e8e4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
index 764b2feb1..d73d0cab8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -22,7 +21,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
index 778198243..086316382 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
@@ -23,7 +23,7 @@
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -34,7 +34,7 @@
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
       </concept>
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
index 2f2586389..416d5eded 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
index 4685647fd..7e1b5ffd9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
     <dependency reexport="false">c6d7e8a3-3d80-479a-8799-a11fe1902b1c(com.fasten.safety.hiphops)</dependency>
@@ -30,7 +29,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" />
@@ -52,6 +51,7 @@
     <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: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" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
index 7b8072050..6968d8e3f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
@@ -80,7 +80,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>
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -114,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
index c79a046fb..d92e2bff6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
@@ -67,7 +67,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,6 +95,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" />
@@ -132,7 +133,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -143,7 +144,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="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" />
@@ -236,7 +236,7 @@
                             <node concept="2EnYce" id="4kHGjX8PUMo" role="37wK5m">
                               <node concept="2EnYce" id="4kHGjX8PUeG" role="2Oq$k0">
                                 <node concept="37vLTw" id="62cfieEP3hd" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="62cfieEP3hg" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCwt" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="62cfieEP3he" role="2OqNvi">
                                   <ref role="3Tt5mk" to="zsc5:62cfieENpyv" resolve="tpe" />
@@ -250,9 +250,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="62cfieEP3hg" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCwt" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="62cfieEP3hh" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCwu" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -277,7 +277,7 @@
                       <node concept="3clFbF" id="62cfieEP3hs" role="3cqZAp">
                         <node concept="2OqwBi" id="62cfieEP3ht" role="3clFbG">
                           <node concept="37vLTw" id="62cfieEP3hu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="62cfieEP3hw" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCwv" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="62cfieEP3hv" role="2OqNvi">
                             <ref role="3TtcxE" to="ii8j:1TeaL8Rdz2r" resolve="failureModes" />
@@ -285,9 +285,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="62cfieEP3hw" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCwv" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="62cfieEP3hx" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCww" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -405,7 +405,7 @@
                             </node>
                             <node concept="2OqwBi" id="5g1NREKOuyS" role="3uHU7B">
                               <node concept="37vLTw" id="5g1NREKOu6X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5g1NREKOtRP" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCwx" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5g1NREKOuZx" role="2OqNvi">
                                 <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
@@ -414,9 +414,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5g1NREKOtRP" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCwx" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5g1NREKOtRQ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCwy" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
index 81228fdf6..635065828 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
@@ -35,7 +35,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -57,7 +57,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.intentions.mps
index 6490298ef..984f1c0cb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.intentions.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>
@@ -115,7 +115,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
index 629640d1c..ac59dce08 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
@@ -37,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
index bc90cab4d..274e5fb0c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -38,7 +38,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -82,7 +82,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -96,13 +96,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" />
@@ -158,7 +159,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -167,7 +168,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -203,7 +203,7 @@
                       </node>
                       <node concept="2OqwBi" id="62cfieENmYf" role="3uHU7B">
                         <node concept="37vLTw" id="62cfieENmIS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="62cfieENmEV" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCwz" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="62cfieENneQ" role="2OqNvi">
                           <ref role="3Tt5mk" to="zsc5:1TeaL8RddiD" resolve="interf" />
@@ -212,9 +212,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="62cfieENmEV" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCwz" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="62cfieENmEW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCw$" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -403,7 +403,7 @@
                         </node>
                         <node concept="2OqwBi" id="3bh1RFvB3Ib" role="33vP2m">
                           <node concept="37vLTw" id="3bh1RFvB3Ic" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3bh1RFvrx$I" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCw_" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3bh1RFvB3Id" role="2OqNvi">
                             <ref role="3Tt5mk" to="zsc5:62cfieENpyv" resolve="tpe" />
@@ -445,9 +445,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3bh1RFvrx$I" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCw_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3bh1RFvrx$J" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCwA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -537,7 +537,7 @@
                     <node concept="3clFbC" id="1f_hJh2erwT" role="3clFbG">
                       <node concept="2OqwBi" id="1f_hJh2erwV" role="3uHU7B">
                         <node concept="37vLTw" id="1f_hJh2erwW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1f_hJh2erwY" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCwB" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1f_hJh2erwX" role="2OqNvi">
                           <ref role="3Tt5mk" to="zsc5:1TeaL8RddiD" resolve="interf" />
@@ -554,9 +554,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1f_hJh2erwY" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCwB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1f_hJh2erwZ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCwC" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/com.fasten.safety.hiphops.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/com.fasten.safety.hiphops.mpl
index 49fe6211c..4e395cd8e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/com.fasten.safety.hiphops.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/com.fasten.safety.hiphops.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
     <dependency reexport="false">b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.behavior.mps
index 25b8cfb8c..f4a749ae9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.behavior.mps
@@ -43,11 +43,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" />
@@ -58,7 +58,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.editor.mps
index 108319b01..ce5187468 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.editor.mps
@@ -32,7 +32,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" />
@@ -48,7 +48,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -84,7 +84,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.structure.mps
index f790da574..fe3d10151 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.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/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
index ce61b32d5..8850ca0f0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.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>
@@ -151,7 +151,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -177,6 +177,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -262,7 +263,7 @@
       <concept id="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>
@@ -295,7 +296,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -942,7 +942,7 @@
                       <node concept="2OqwBi" id="5N87GIKinVM" role="3clFbG">
                         <node concept="2OqwBi" id="5N87GIKinVN" role="2Oq$k0">
                           <node concept="37vLTw" id="5N87GIKinVO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5N87GIKinVS" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCwE" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKinVP" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -957,9 +957,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5N87GIKinVS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCwE" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5N87GIKinVT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCwF" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1341,7 +1341,7 @@
                                 <node concept="3clFbF" id="1f_hJh2j_FJ" role="3cqZAp">
                                   <node concept="2OqwBi" id="1f_hJh2j_FK" role="3clFbG">
                                     <node concept="37vLTw" id="1f_hJh2j_FL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1f_hJh2j_FO" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCwG" resolve="it" />
                                     </node>
                                     <node concept="3JPx81" id="1f_hJh2j_FM" role="2OqNvi">
                                       <node concept="2GrUjf" id="1f_hJh2j_FN" role="25WWJ7">
@@ -1351,9 +1351,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1f_hJh2j_FO" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36FpCwG" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1f_hJh2j_FP" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36FpCwH" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1386,16 +1386,16 @@
                                     <ref role="3cqZAo" node="5N87GIKdCu_" resolve="port" />
                                   </node>
                                   <node concept="37vLTw" id="1f_hJh2j_G7" role="37wK5m">
-                                    <ref role="3cqZAo" node="1f_hJh2j_G8" resolve="fm" />
+                                    <ref role="3cqZAo" node="2hED36FpCwI" resolve="fm" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1f_hJh2j_G8" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCwI" role="1bW2Oz">
                           <property role="TrG5h" value="fm" />
-                          <node concept="2jxLKc" id="1f_hJh2j_G9" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCwJ" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1564,16 +1564,16 @@
                                     <ref role="3cqZAo" node="5N87GIKeaB7" resolve="port" />
                                   </node>
                                   <node concept="37vLTw" id="5N87GIKm5oZ" role="37wK5m">
-                                    <ref role="3cqZAo" node="1f_hJh2j_Hm" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpCwK" resolve="it" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1f_hJh2j_Hm" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCwK" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1f_hJh2j_Hn" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCwL" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1728,7 +1728,7 @@
                                   <node concept="3clFbC" id="3bh1RFvEbzT" role="3clFbG">
                                     <node concept="2OqwBi" id="3bh1RFvE7KO" role="3uHU7B">
                                       <node concept="37vLTw" id="3bh1RFvE7KP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3bh1RFvE7KU" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpCwM" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3f8ZVRYc_A7" role="2OqNvi">
                                         <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -1745,9 +1745,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="3bh1RFvE7KU" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36FpCwM" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="3bh1RFvE7KV" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36FpCwN" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1774,7 +1774,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3bh1RFvE9Xe" role="37vLTJ">
                                     <node concept="37vLTw" id="3bh1RFvE9NW" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3bh1RFvE9Jl" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCwO" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3f8ZVRYcAtZ" role="2OqNvi">
                                       <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -1783,9 +1783,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="3bh1RFvE9Jl" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpCwO" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="3bh1RFvE9Jm" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpCwP" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1912,7 +1912,7 @@
                                   <node concept="3clFbC" id="5g1NREKQyHL" role="3clFbG">
                                     <node concept="2OqwBi" id="5g1NREKQyHM" role="3uHU7B">
                                       <node concept="37vLTw" id="5g1NREKQyHN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5g1NREKQyHS" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpCwQ" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3f8ZVRYc$An" role="2OqNvi">
                                         <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -1924,9 +1924,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="5g1NREKQyHS" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36FpCwQ" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="5g1NREKQyHT" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36FpCwR" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -1956,7 +1956,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5g1NREKQyI5" role="37vLTJ">
                                     <node concept="37vLTw" id="5g1NREKQyI6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5g1NREKQyI8" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCwS" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3f8ZVRYc$Wx" role="2OqNvi">
                                       <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -1965,9 +1965,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5g1NREKQyI8" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpCwS" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5g1NREKQyI9" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpCwT" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2540,7 +2540,7 @@
                       <node concept="3cpWs6" id="5N87GIKjGSm" role="3cqZAp">
                         <node concept="2OqwBi" id="5N87GIKjGSo" role="3cqZAk">
                           <node concept="37vLTw" id="5N87GIKjGSp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5N87GIKjGfY" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCwU" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKjGSq" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2548,9 +2548,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5N87GIKjGfY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCwU" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5N87GIKjGfZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCwV" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="5N87GIKjGg0" role="2S7zOq">
@@ -2611,7 +2611,7 @@
                       <node concept="3cpWs6" id="5N87GIKjL4m" role="3cqZAp">
                         <node concept="2OqwBi" id="5N87GIKjL4n" role="3cqZAk">
                           <node concept="37vLTw" id="5N87GIKjL4o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5N87GIKjL4q" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCwW" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKjL4p" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2619,9 +2619,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5N87GIKjL4q" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCwW" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5N87GIKjL4r" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCwX" role="1tU5fm" />
                     </node>
                   </node>
                   <node concept="1nlBCl" id="5N87GIKjL4s" role="2S7zOq">
@@ -2710,7 +2710,7 @@
                             <node concept="2OqwBi" id="5N87GIKnxNm" role="33vP2m">
                               <node concept="2OqwBi" id="5N87GIKnx7j" role="2Oq$k0">
                                 <node concept="37vLTw" id="5N87GIKnwPb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5N87GIKmDmL" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCwY" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5N87GIKnxt1" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2721,7 +2721,7 @@
                                 <node concept="2OqwBi" id="5N87GIKnzCF" role="37wK5m">
                                   <node concept="2OqwBi" id="5N87GIKnyIM" role="2Oq$k0">
                                     <node concept="37vLTw" id="5N87GIKnytw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5N87GIKmDmL" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCwY" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="5N87GIKnyZS" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2753,9 +2753,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5N87GIKmDmL" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCwY" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5N87GIKmDmM" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCwZ" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
index 3fa10bc2d..28d1616fa 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.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" />
@@ -81,7 +81,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -97,7 +96,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -118,7 +117,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
index eeab2e684..71803268d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
@@ -66,7 +66,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -80,7 +80,7 @@
         <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" />
@@ -170,7 +170,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps
index 0e793df84..cd5edc8f0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps
@@ -49,7 +49,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -102,7 +102,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index 4f469c8d4..a2fa97a68 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -54,7 +54,7 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -65,7 +65,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -84,7 +84,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -96,7 +96,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_">
@@ -134,7 +134,7 @@
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
index 0fdb862b9..33edaefda 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
@@ -63,6 +63,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -81,7 +82,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -89,7 +90,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" />
     </language>
@@ -122,7 +122,7 @@
                         <node concept="1beSmn" id="5t37uj6C0e5" role="3uHU7w" />
                         <node concept="2OqwBi" id="5t37uj6C0e6" role="3uHU7B">
                           <node concept="37vLTw" id="5t37uj6C0e7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5t37uj6C0e9" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCx1" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5t37uj6C0e8" role="2OqNvi">
                             <ref role="3Tt5mk" to="9br2:1vid6hjrzqr" resolve="gs" />
@@ -131,9 +131,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5t37uj6C0e9" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCx1" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5t37uj6C0ea" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCx2" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
index 2abfae9d1..3d537226d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
@@ -54,7 +54,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
index e3e90d56d..a63407f7e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
index f986f1301..0482b2a7e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
@@ -81,7 +81,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,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">
@@ -122,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
index 1de64e1b7..f9dfc7eae 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
index c32c90649..8d04025a2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
@@ -56,12 +56,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -86,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -94,7 +95,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>
@@ -132,7 +132,7 @@
                     <node concept="3clFbF" id="1r1mR59umRt" role="3cqZAp">
                       <node concept="2OqwBi" id="1r1mR59umRu" role="3clFbG">
                         <node concept="37vLTw" id="1r1mR59umRv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1r1mR59umRx" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCx3" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="1r1mR59umRw" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -140,9 +140,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1r1mR59umRx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCx3" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1r1mR59umRy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCx4" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
index be03f0112..c62896fd2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
@@ -57,7 +57,7 @@
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
@@ -77,7 +77,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">
@@ -107,7 +107,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" />
@@ -122,7 +122,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -207,7 +207,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>
@@ -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" />
@@ -291,7 +292,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -312,7 +313,6 @@
         <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="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>
@@ -1211,7 +1211,7 @@
                               <node concept="2OqwBi" id="5YWtEMPHmbV" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="5YWtEMPHlS$" role="2Oq$k0">
                                   <node concept="37vLTw" id="5YWtEMPHkgi" role="2JrQYb">
-                                    <ref role="3cqZAo" node="5YWtEMPHk2H" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpCx5" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="5YWtEMPHmAx" role="2OqNvi">
@@ -1231,9 +1231,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5YWtEMPHk2H" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCx5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5YWtEMPHk2I" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCx6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.structure.mps
index 3e5cce312..1d3a4eabe 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.structure.mps
@@ -75,7 +75,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.typesystem.mps
index f38e8dd21..e53a6325d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.typesystem.mps
@@ -44,7 +44,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -88,7 +88,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
index daaba4312..e67759101 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.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>
@@ -78,12 +78,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" />
@@ -98,7 +99,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -124,7 +125,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="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -166,7 +166,7 @@
                           <node concept="2OqwBi" id="5YWtEMPH2wh" role="2Oq$k0">
                             <node concept="2JrnkZ" id="5YWtEMPH2wi" role="2Oq$k0">
                               <node concept="37vLTw" id="5YWtEMPH2wj" role="2JrQYb">
-                                <ref role="3cqZAo" node="5YWtEMPH2wo" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCx7" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5YWtEMPH2wk" role="2OqNvi">
@@ -186,9 +186,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5YWtEMPH2wo" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCx7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5YWtEMPH2wp" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCx8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -225,7 +225,7 @@
                         <node concept="2OqwBi" id="5YWtEMPH8Iu" role="2Oq$k0">
                           <node concept="2JrnkZ" id="5YWtEMPH8ki" role="2Oq$k0">
                             <node concept="37vLTw" id="5YWtEMPH7T1" role="2JrQYb">
-                              <ref role="3cqZAo" node="5YWtEMPH7NG" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCx9" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="5YWtEMPH8Tq" role="2OqNvi">
@@ -245,9 +245,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5YWtEMPH7NG" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCx9" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="5YWtEMPH7NH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxa" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
index c3a5e3ff8..f9a5ffa35 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.behavior.mps
index fd84cf879..d54b979c1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.behavior.mps
@@ -76,7 +76,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" />
@@ -106,7 +106,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.constraints.mps
index f1fc320b1..824360461 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.constraints.mps
@@ -35,7 +35,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
index 99a5d344e..1e834b7a7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
@@ -54,7 +54,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -73,7 +73,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -134,7 +134,7 @@
       <concept id="1397920687864683158" name="de.slisson.mps.tables.structure.Table" flags="ng" index="2rfBfz">
         <child id="1397920687864865354" name="cells" index="2rf8GZ" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
index dc256d05b..a60ca4782 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
@@ -65,7 +65,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
index 3b1aafcf4..5e4dfc7b0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.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" />
@@ -50,7 +49,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
index 0aa440a81..d24599847 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
@@ -57,7 +57,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -110,7 +110,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -122,7 +122,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" />
@@ -144,7 +144,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps
index 7eed17d5a..11938b9e0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.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" />
@@ -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="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -78,7 +78,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">
@@ -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>
@@ -155,7 +155,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -176,6 +176,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 id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -249,7 +250,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -754,7 +754,7 @@
                       </node>
                       <node concept="2OqwBi" id="56pBK14$m1Z" role="3uHU7B">
                         <node concept="37vLTw" id="56pBK14$lQk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="56pBK14$lFl" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCxd" resolve="it" />
                         </node>
                         <node concept="liA8E" id="56pBK14$mk8" role="2OqNvi">
                           <ref role="37wK5l" node="56pBK14$0oo" resolve="getAnalyzedNode" />
@@ -763,9 +763,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="56pBK14$lFl" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxd" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="56pBK14$lFm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxe" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1035,7 +1035,7 @@
                                         <node concept="2OqwBi" id="56pBK14_pZE" role="3uHU7B">
                                           <node concept="2OqwBi" id="56pBK14$A0b" role="2Oq$k0">
                                             <node concept="37vLTw" id="56pBK14$A0c" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="56pBK14$A0e" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36FpCxf" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="56pBK14$A0d" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1046,9 +1046,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="56pBK14$A0e" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2hED36FpCxf" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="56pBK14$A0f" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2hED36FpCxg" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.structure.mps
index 704881a6d..28bb79054 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.structure.mps
@@ -32,7 +32,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/com.mbeddr.formal.safety.cae.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/com.mbeddr.formal.safety.cae.ext.mpl
index f31695f53..94c870a28 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/com.mbeddr.formal.safety.cae.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/com.mbeddr.formal.safety.cae.ext.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">eb32334c-372a-488f-ba9b-e549a59115e9(com.mbeddr.formal.safety.cae)</dependency>
     <dependency reexport="false">6464626a-ab04-4051-908e-5e8dc75acd78(com.mbeddr.formal.safety.gsn.ext)</dependency>
@@ -20,7 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/models/com.mbeddr.formal.safety.cae.ext.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/models/com.mbeddr.formal.safety.cae.ext.structure.mps
index 8a32124f3..391d00fee 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/models/com.mbeddr.formal.safety.cae.ext.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/models/com.mbeddr.formal.safety.cae.ext.structure.mps
@@ -35,7 +35,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/com.mbeddr.formal.safety.cae.external_evidence.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/com.mbeddr.formal.safety.cae.external_evidence.mpl
index e47caaa2e..f6be31130 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/com.mbeddr.formal.safety.cae.external_evidence.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/com.mbeddr.formal.safety.cae.external_evidence.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">eb32334c-372a-488f-ba9b-e549a59115e9(com.mbeddr.formal.safety.cae)</dependency>
     <dependency reexport="false">5e7ffa70-8e23-49f4-8c13-a887bba14c36(com.mbeddr.formal.safety.gsn.external_evidence)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.behavior.mps
index f901897be..ba1f43bec 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.behavior.mps
@@ -40,13 +40,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.editor.mps
index a831e3549..27c0b1611 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.editor.mps
@@ -42,7 +42,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -52,7 +52,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.structure.mps
index 562b8a096..bd0fcd8d9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/models/com.mbeddr.formal.safety.cae.external_evidence.structure.mps
@@ -28,7 +28,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
index 2a5354cc1..939aa3d09 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.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" />
@@ -49,7 +48,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.behavior.mps
index 207150f38..e759bfcc0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.behavior.mps
@@ -64,7 +64,7 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
index 6001b5f1d..4a8bd4612 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
@@ -62,7 +62,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" />
@@ -82,7 +82,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -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>
@@ -182,7 +182,7 @@
         <child id="6554619383001456819" name="targetId" index="23hSWE" />
       </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>
@@ -233,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>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.plugin.mps
index fb75b555e..335fbe526 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -28,7 +28,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -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>
@@ -110,7 +110,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">
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.structure.mps
index 799503315..85b90a23e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.structure.mps
@@ -54,7 +54,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
index 48a004f86..1ba802a11 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</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" />
@@ -47,7 +46,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.actions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.actions.mps
index aa3e78065..9964b5c57 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.actions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.actions.mps
@@ -89,7 +89,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.behavior.mps
index 06faa4238..6ac601f1e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.behavior.mps
@@ -52,7 +52,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -63,7 +63,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.constraints.mps
index 9a19ea5d5..dbb5be2b0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.constraints.mps
@@ -90,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
index 52787c210..cb10dff22 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
@@ -34,7 +34,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -53,7 +53,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
index 85aaa253c..2d8876aeb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
@@ -5,7 +5,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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -39,7 +39,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -106,7 +106,7 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -121,7 +121,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -172,7 +172,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.structure.mps
index 082238036..54de655b4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.structure.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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
index dc8d80b61..2bea7673e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</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" />
@@ -55,7 +54,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
index ef51e24d4..d8ee58d44 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
@@ -98,7 +98,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>
@@ -109,7 +109,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -140,7 +140,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
index 5d36ab090..22874dea8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
@@ -56,7 +56,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>
@@ -115,7 +115,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
index 0b7c8fd25..d9aaccd25 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
@@ -41,7 +41,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </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>
@@ -62,7 +62,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1176474535556" name="jetbrains.mps.lang.editor.structure.QueryFunction_JComponent" flags="in" index="3Fmcul" />
@@ -88,7 +88,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">
@@ -146,7 +146,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -158,7 +158,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -186,7 +186,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
index 434ec46bc..7799d7e83 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
@@ -145,7 +145,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>
@@ -166,7 +166,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="7024111702304495340" name="jetbrains.mps.baseLanguage.structure.MulAssignmentExpression" flags="nn" index="3vZbUc" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -189,6 +189,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -245,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>
@@ -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="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
@@ -347,7 +347,7 @@
                         <node concept="2OqwBi" id="1HYO_kn5VEo" role="3clFbG">
                           <node concept="2OqwBi" id="1HYO_kn5Sfb" role="2Oq$k0">
                             <node concept="37vLTw" id="1HYO_kn5R52" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1HYO_kn5PBR" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCxj" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="1HYO_kn5TaZ" role="2OqNvi">
                               <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
@@ -357,9 +357,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1HYO_kn5PBR" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxj" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1HYO_kn5PBS" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxk" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
index 7cdcbec92..cd96a2831 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
@@ -5,7 +5,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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -44,7 +44,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -79,7 +79,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="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -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>
@@ -149,7 +149,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="7024111702304495340" name="jetbrains.mps.baseLanguage.structure.MulAssignmentExpression" flags="nn" index="3vZbUc" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -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" />
@@ -242,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>
@@ -267,7 +268,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="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" />
@@ -3772,7 +3772,7 @@
                       <node concept="3clFbF" id="3AZUhOjM$Dg" role="3cqZAp">
                         <node concept="2OqwBi" id="3AZUhOjM$Dh" role="3clFbG">
                           <node concept="37vLTw" id="3AZUhOjM$Di" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3AZUhOjM$Dl" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxl" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3AZUhOjM$Dj" role="2OqNvi">
                             <node concept="chp4Y" id="3AZUhOjM$Dk" role="cj9EA">
@@ -3782,9 +3782,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3AZUhOjM$Dl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxl" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3AZUhOjM$Dm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxm" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3845,7 +3845,7 @@
                             <node concept="2OqwBi" id="3AZUhOjM$DK" role="3clFbG">
                               <node concept="2OqwBi" id="3AZUhOjM$DL" role="2Oq$k0">
                                 <node concept="37vLTw" id="3AZUhOjM$DM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3AZUhOjM$DY" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCxp" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="3AZUhOjM$DN" role="2OqNvi">
                                   <ref role="3TtcxE" to="py52:3Px2xUV1gzV" resolve="attributes" />
@@ -3857,7 +3857,7 @@
                                     <node concept="3clFbF" id="3AZUhOjM$DR" role="3cqZAp">
                                       <node concept="2OqwBi" id="3AZUhOjM$DS" role="3clFbG">
                                         <node concept="37vLTw" id="3AZUhOjM$DT" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3AZUhOjM$DW" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36FpCxn" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="3AZUhOjM$DU" role="2OqNvi">
                                           <node concept="chp4Y" id="3AZUhOjM$DV" role="cj9EA">
@@ -3867,18 +3867,18 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="3AZUhOjM$DW" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2hED36FpCxn" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3AZUhOjM$DX" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2hED36FpCxo" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3AZUhOjM$DY" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCxp" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3AZUhOjM$DZ" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCxq" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure.mps
index 2cd4b54ad..71ad2f787 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure.mps
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.typesystem.mps
index 69d064795..1cd931d45 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.typesystem.mps
@@ -75,7 +75,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -151,7 +151,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
index 56a8b1655..b5efa9ea9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
@@ -39,7 +39,7 @@
         <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -122,7 +122,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -137,7 +136,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
index 1c03f306d..106acee89 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.templates@generator.mps
index 551993bd2..8f7ef6e7c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.templates@generator.mps
@@ -39,7 +39,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>
@@ -61,7 +61,7 @@
         <property id="5785245534399940634" name="numCols" index="C6TCN" />
         <child id="5785245534399940635" name="rows" index="C6TCM" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="126932837435370865" name="authors" index="Wq1Bf" />
       </concept>
@@ -81,7 +81,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596579911728" name="com.mbeddr.doc.structure.Document" flags="ng" index="1_1swa">
@@ -196,7 +196,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
index 8f74fa49a..6313954ad 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
@@ -83,7 +83,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>
@@ -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" />
@@ -158,7 +158,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.constraints.mps
index 27a85942d..304bd3ecc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.constraints.mps
@@ -41,7 +41,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
index f1b319fd3..2cea17e90 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
@@ -20,7 +20,7 @@
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -64,7 +64,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>
@@ -94,7 +94,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" />
@@ -153,7 +153,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -207,7 +207,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps
index 6db7e8201..58cc60a1c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
index 5349a5614..10769cbed 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
@@ -45,7 +45,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
index 416545634..e0f1df3e4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</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:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -63,7 +62,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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
index 124f5cc04..d3909d66b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
@@ -90,7 +90,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps
index f0885de33..6d89cffd5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.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>
@@ -91,6 +91,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>
@@ -139,7 +140,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
@@ -258,7 +258,7 @@
                         <node concept="2OqwBi" id="56pBK14wEzH" role="3clFbG">
                           <node concept="2OqwBi" id="56pBK14wEzI" role="2Oq$k0">
                             <node concept="37vLTw" id="56pBK14wEzJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="56pBK14wEzP" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCxs" resolve="it" />
                             </node>
                             <node concept="liA8E" id="56pBK14wEzK" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.getConceptAlias()" resolve="getConceptAlias" />
@@ -276,9 +276,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="56pBK14wEzP" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxs" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="56pBK14wEzQ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxt" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -306,7 +306,7 @@
                           <node concept="3bZ5Sz" id="56pBK14wKaE" role="1tU5fm" />
                           <node concept="2OqwBi" id="56pBK14wKi3" role="33vP2m">
                             <node concept="37vLTw" id="56pBK14wKi4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="56pBK14wIBa" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCxu" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="56pBK14wKi5" role="2OqNvi" />
                           </node>
@@ -325,9 +325,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="56pBK14wIBa" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxu" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="56pBK14wIBb" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxv" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
index c1b22c33b..16d32ab2e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
@@ -85,15 +85,15 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
@@ -110,13 +110,13 @@
       <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="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ng" index="1rj3mw">
+      <concept id="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ngI" index="1rj3mw">
         <property id="7228435049763093186" name="family" index="1rj3mz" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -148,7 +148,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -159,7 +159,7 @@
         <child id="4233361609415241000" name="parameterQuery" index="1GhOrs" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
@@ -246,7 +246,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -273,7 +273,7 @@
         <child id="6554619383001456819" name="targetId" index="23hSWE" />
       </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="621570459751239491" name="canSplit" index="KYgL9" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -332,7 +332,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
index 5f5c0d867..5195a8910 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
@@ -127,7 +127,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -141,7 +141,7 @@
       </concept>
       <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">
@@ -164,6 +164,7 @@
       <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -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>
@@ -297,7 +298,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -821,7 +821,7 @@
                           <node concept="3clFbF" id="6csJveEL7nX" role="3cqZAp">
                             <node concept="2OqwBi" id="6csJveEL7CB" role="3clFbG">
                               <node concept="37vLTw" id="6csJveEL7nW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6csJveEL7hA" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCxw" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6csJveEL7Sp" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -829,9 +829,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6csJveEL7hA" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCxw" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6csJveEL7hB" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCxx" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2002,7 +2002,7 @@
                           <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                           <node concept="2OqwBi" id="6K99IwmtT9x" role="37wK5m">
                             <node concept="37vLTw" id="6K99IwmtSLd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6K99IwmtRHl" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCxy" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6K99IwmtUaE" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2011,9 +2011,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6K99IwmtRHl" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxy" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6K99IwmtRHm" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxz" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -2039,7 +2039,7 @@
                         <node concept="2OqwBi" id="6csJveEMR$4" role="3uHU7w">
                           <node concept="2OqwBi" id="6csJveEMQQ1" role="2Oq$k0">
                             <node concept="37vLTw" id="6csJveEMQEY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6csJveEMBQk" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveEMRcb" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2050,7 +2050,7 @@
                         <node concept="2OqwBi" id="6csJveEMPPd" role="3uHU7B">
                           <node concept="2OqwBi" id="6csJveEMPmQ" role="2Oq$k0">
                             <node concept="37vLTw" id="6csJveEMPbW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6csJveEMBQk" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveEMPyY" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -2072,7 +2072,7 @@
                           <node concept="3JPx81" id="6csJveEMHvb" role="2OqNvi">
                             <node concept="2OqwBi" id="6csJveEMHOA" role="25WWJ7">
                               <node concept="37vLTw" id="6csJveEMHEv" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6csJveEMBQk" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6csJveEMI1$" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -2092,7 +2092,7 @@
                           <node concept="3JPx81" id="6csJveEMNUS" role="2OqNvi">
                             <node concept="2OqwBi" id="6csJveEMOlw" role="25WWJ7">
                               <node concept="37vLTw" id="6csJveEMO3V" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6csJveEMBQk" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6csJveEMOtK" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2104,9 +2104,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6csJveEMBQk" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCx$" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6csJveEMBQl" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCx_" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2478,7 +2478,7 @@
                             <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                             <node concept="2OqwBi" id="6K99Iwmu2ED" role="37wK5m">
                               <node concept="37vLTw" id="6K99Iwmu2EE" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6K99IwmtVGB" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCxA" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6K99Iwmu2EF" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2490,7 +2490,7 @@
                             <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                             <node concept="2OqwBi" id="6K99Iwmu473" role="37wK5m">
                               <node concept="37vLTw" id="6K99Iwmu474" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6K99IwmtVGB" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCxA" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6K99Iwmu475" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2500,9 +2500,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6K99IwmtVGB" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCxA" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6K99IwmtVGC" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCxB" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3114,7 +3114,7 @@
                           </node>
                           <node concept="2OqwBi" id="4kPUbDDtC5f" role="33vP2m">
                             <node concept="37vLTw" id="4kPUbDDtC5g" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6csJveEJhT9" resolve="crtGSEB" />
+                              <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                             </node>
                             <node concept="2Rf3mk" id="4kPUbDDtC5h" role="2OqNvi">
                               <node concept="1xMEDy" id="4kPUbDDtC5i" role="1xVPHs">
@@ -3164,7 +3164,7 @@
                                   <node concept="3clFbF" id="6csJveELy0r" role="3cqZAp">
                                     <node concept="2OqwBi" id="6csJveELy0s" role="3clFbG">
                                       <node concept="37vLTw" id="6csJveELy0t" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6csJveELy0v" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpCxC" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6csJveELy0u" role="2OqNvi">
                                         <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -3172,9 +3172,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="6csJveELy0v" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36FpCxC" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6csJveELy0w" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36FpCxD" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3189,7 +3189,7 @@
                           </node>
                           <node concept="2OqwBi" id="6csJveEJkjL" role="33vP2m">
                             <node concept="37vLTw" id="6csJveEJkjM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6csJveEJhT9" resolve="crtGSEB" />
+                              <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                             </node>
                             <node concept="2Rf3mk" id="6csJveEJkjN" role="2OqNvi">
                               <node concept="1xMEDy" id="6csJveEJkjO" role="1xVPHs">
@@ -3219,15 +3219,15 @@
                                       </node>
                                       <node concept="3JPx81" id="4kPUbDDqY3x" role="2OqNvi">
                                         <node concept="37vLTw" id="4kPUbDDqY3y" role="25WWJ7">
-                                          <ref role="3cqZAo" node="4kPUbDDqY3z" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36FpCxE" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="4kPUbDDqY3z" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36FpCxE" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4kPUbDDqY3$" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36FpCxF" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3249,7 +3249,7 @@
                     </node>
                     <node concept="2OqwBi" id="6csJveEJiAw" role="3clFbw">
                       <node concept="37vLTw" id="6csJveEJikh" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6csJveEJhT9" resolve="crtGSEB" />
+                        <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                       </node>
                       <node concept="1mIQ4w" id="6csJveEJiUB" role="2OqNvi">
                         <node concept="chp4Y" id="6csJveEJj0s" role="cj9EA">
@@ -3271,7 +3271,7 @@
                                 </node>
                                 <node concept="3JPx81" id="6csJveEJ$VB" role="2OqNvi">
                                   <node concept="37vLTw" id="6csJveEJ$VC" role="25WWJ7">
-                                    <ref role="3cqZAo" node="6csJveEJhT9" resolve="crtGSEB" />
+                                    <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                                   </node>
                                 </node>
                               </node>
@@ -3287,9 +3287,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6csJveEJhT9" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxG" role="1bW2Oz">
                   <property role="TrG5h" value="crtGSEB" />
-                  <node concept="2jxLKc" id="6csJveEJhTa" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxH" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3522,7 +3522,7 @@
                         </node>
                         <node concept="2OqwBi" id="6csJveEKsxV" role="3uHU7B">
                           <node concept="37vLTw" id="6csJveEKske" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6csJveEKscw" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxI" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveEKtVu" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -3531,9 +3531,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6csJveEKscw" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCxI" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6csJveEKscx" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCxJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3549,7 +3549,7 @@
                       </node>
                       <node concept="2OqwBi" id="6csJveEKxXj" role="33vP2m">
                         <node concept="37vLTw" id="6csJveEKxXk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6csJveEKuIK" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCxK" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6csJveEKxXl" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -3592,9 +3592,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6csJveEKuIK" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6csJveEKuIL" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3636,7 +3636,7 @@
                         <node concept="1rXfSq" id="6K99Iwm_GjP" role="3fr31v">
                           <ref role="37wK5l" node="6K99IwmtHVY" resolve="entityOnEast" />
                           <node concept="37vLTw" id="6K99Iwm_Gx$" role="37wK5m">
-                            <ref role="3cqZAo" node="6K99IwmsvVz" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxM" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3644,16 +3644,16 @@
                         <node concept="1rXfSq" id="6K99Iwm_F6w" role="3fr31v">
                           <ref role="37wK5l" node="6K99IwmtKxA" resolve="entityOnWest" />
                           <node concept="37vLTw" id="6K99Iwm_F6x" role="37wK5m">
-                            <ref role="3cqZAo" node="6K99IwmsvVz" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxM" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6K99IwmsvVz" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6K99IwmsvV$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3790,14 +3790,14 @@
                     <node concept="1rXfSq" id="6K99IwmtJiL" role="3clFbG">
                       <ref role="37wK5l" node="6K99IwmtHVY" resolve="entityOnEast" />
                       <node concept="37vLTw" id="6K99IwmtJuF" role="37wK5m">
-                        <ref role="3cqZAo" node="6K99Iwmszyp" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCxO" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6K99Iwmszyp" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxO" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6K99Iwmszyq" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxP" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -3836,14 +3836,14 @@
                     <node concept="1rXfSq" id="6K99IwmtN88" role="3clFbG">
                       <ref role="37wK5l" node="6K99IwmtKxA" resolve="entityOnWest" />
                       <node concept="37vLTw" id="6K99IwmtNl2" role="37wK5m">
-                        <ref role="3cqZAo" node="6K99Iwms_hv" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCxQ" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6K99Iwms_hv" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxQ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6K99Iwms_hw" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxR" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
index 8ee3ef3a4..7b9ee3e2e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
index f7dff286b..eeffdcd52 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -46,7 +46,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -135,7 +135,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,7 @@
         <child id="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">
@@ -183,6 +183,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" />
@@ -310,7 +311,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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">
@@ -473,7 +473,7 @@
                       <node concept="2OqwBi" id="1qrXfdH3Mu3" role="3clFbG">
                         <node concept="2OqwBi" id="1qrXfdH3Mu4" role="2Oq$k0">
                           <node concept="37vLTw" id="1qrXfdH3Mu5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1qrXfdH3Mu8" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxS" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="1qrXfdH3Mu6" role="2OqNvi" />
                         </node>
@@ -481,9 +481,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1qrXfdH3Mu8" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCxS" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1qrXfdH3Mu9" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCxT" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1669,7 +1669,7 @@
                               <node concept="2OqwBi" id="WKGDODMr5I" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="WKGDODMr5J" role="2Oq$k0">
                                   <node concept="37vLTw" id="WKGDODMr5K" role="2JrQYb">
-                                    <ref role="3cqZAo" node="WKGDODMr5P" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpCxU" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="WKGDODMr5L" role="2OqNvi">
@@ -1689,9 +1689,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="WKGDODMr5P" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCxU" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="WKGDODMr5Q" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCxV" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -4099,7 +4099,7 @@
                           <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="x1FXqz9cU" role="37wK5m">
                             <node concept="37vLTw" id="x1FXqz8_P" role="2Oq$k0">
-                              <ref role="3cqZAo" node="x1FXqxMMx" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCxW" resolve="it" />
                             </node>
                             <node concept="liA8E" id="x1FXqza13" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
@@ -4112,9 +4112,9 @@
                       <node concept="3clFbT" id="x1FXqxMMw" role="3clFbG" />
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="x1FXqxMMx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCxW" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="x1FXqxMMy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCxX" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4219,7 +4219,7 @@
                       <node concept="TSZUe" id="x1FXq_058" role="2OqNvi">
                         <node concept="2OqwBi" id="x1FXq_0DY" role="25WWJ7">
                           <node concept="37vLTw" id="x1FXq_0mi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="x1FXq$T1$" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCxY" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="x1FXq_11O" role="2OqNvi" />
                         </node>
@@ -4227,9 +4227,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="x1FXq$T1$" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCxY" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="x1FXq$T1_" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCxZ" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
index 1b9a23aee..ff34c43af 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
@@ -72,7 +72,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
index d753e1f16..9a6953c9a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
@@ -45,7 +45,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -82,7 +82,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
index d25e463a5..e09785c63 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.behavior.mps
index 2a2956144..1576ca074 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.behavior.mps
@@ -68,7 +68,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">
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
index 312fa45a6..205acfb93 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
@@ -79,7 +79,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </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>
@@ -88,7 +88,7 @@
         <child id="1176475119347" name="componentProvider" index="3FoqZy" />
       </concept>
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="6681408443912431607" name="jetbrains.mps.lang.editor.structure.URLStyleClassItem" flags="ln" index="3u2Kpz">
@@ -111,7 +111,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -124,7 +124,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="7033942394256351208" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclarationReference" flags="ng" index="1PE4EZ">
@@ -150,7 +150,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">
@@ -216,7 +216,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>
@@ -232,7 +232,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" />
@@ -287,7 +287,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
index cfbd877b7..687efa59a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
@@ -33,7 +33,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>
@@ -50,7 +50,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.structure.mps
index 9b87cc2c2..a1a9295d9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.structure.mps
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.typesystem.mps
index 917fb4d87..3b5ff53d8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.typesystem.mps
@@ -58,7 +58,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +110,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
index 15386f03a..a35779033 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
@@ -120,7 +120,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -140,7 +140,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">
@@ -163,6 +163,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" />
@@ -188,7 +189,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -221,7 +222,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="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
         <child id="5232196642625575056" name="fromIndex" index="1eb2uK" />
       </concept>
@@ -493,7 +493,7 @@
                     <node concept="3clFbF" id="79zp7zi7B93" role="3cqZAp">
                       <node concept="2OqwBi" id="79zp7zi7B94" role="3clFbG">
                         <node concept="37vLTw" id="79zp7zi7B95" role="2Oq$k0">
-                          <ref role="3cqZAo" node="79zp7zi7B98" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCy0" resolve="it" />
                         </node>
                         <node concept="liA8E" id="79zp7zi7B96" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
@@ -504,9 +504,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="79zp7zi7B98" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCy0" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="79zp7zi7B99" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCy1" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
index 4ca8d6b4e..50dbd0bfe 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
@@ -50,7 +50,7 @@
         <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -116,7 +116,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
@@ -137,7 +136,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
index 31d180521..ce41d6c97 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
@@ -61,7 +61,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -139,10 +139,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
@@ -193,7 +193,7 @@
       <concept id="4613921340552550723" name="com.mbeddr.formal.spin.structure.AtomicBlock" flags="ng" index="Xfmx0">
         <child id="4613921340552550736" name="stmts" index="Xfmxj" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616790990" name="com.mbeddr.formal.spin.structure.NotExpression" flags="ng" index="1a3nki" />
@@ -369,7 +369,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -381,7 +381,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
index 28ec639ce..9186e0e42 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
@@ -48,7 +48,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>
@@ -56,7 +56,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" />
@@ -65,7 +65,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.c_api.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.c_api.mps
index 6866fb6a6..7e5711007 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.c_api.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.c_api.mps
@@ -27,17 +27,17 @@
       <concept id="7611646782270335346" name="com.mbeddr.formal.spin.c.core.structure.ArbitraryTextType" flags="ng" index="3Xlu$p" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.constraints.mps
index 0a005a433..3fb9c7a6d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.constraints.mps
@@ -37,7 +37,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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
index c0f5e4b9c..ffafb42b5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
@@ -39,14 +39,14 @@
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <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" />
@@ -63,7 +63,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -123,7 +123,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>
@@ -140,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
index 6db8e6688..e94b16c68 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
@@ -54,7 +54,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
index f033c6204..e6a5e9b3a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
@@ -48,7 +48,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -60,6 +60,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -127,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>
@@ -144,7 +145,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="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
@@ -199,7 +199,7 @@
                       <node concept="3clFbF" id="4b60pu4yoDU" role="3cqZAp">
                         <node concept="2OqwBi" id="4b60pu4yoDV" role="3clFbG">
                           <node concept="37vLTw" id="4b60pu4yoDW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4b60pu4yoDY" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCy3" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4b60pu4yoDX" role="2OqNvi">
                             <ref role="37wK5l" to="23hk:6Kf5KB6G5PF" resolve="variableDeclaration" />
@@ -207,9 +207,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4b60pu4yoDY" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCy3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4b60pu4yoDZ" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCy4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps
index 673dfb77e..a3539a9f2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.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>
@@ -77,7 +77,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">
@@ -86,6 +86,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" />
@@ -124,7 +125,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -154,7 +155,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -406,7 +406,7 @@
                   <node concept="3clFbF" id="4b60pu4w4QR" role="3cqZAp">
                     <node concept="2OqwBi" id="4b60pu4w4QS" role="3clFbG">
                       <node concept="37vLTw" id="4b60pu4w4QT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4b60pu4w4QV" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCy5" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4b60pu4w4QU" role="2OqNvi">
                         <ref role="37wK5l" to="23hk:6Kf5KB6G5PF" resolve="variableDeclaration" />
@@ -414,9 +414,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4b60pu4w4QV" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCy5" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4b60pu4w4QW" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCy6" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -474,7 +474,7 @@
                     <node concept="3clFbF" id="guJe75HD4O" role="3cqZAp">
                       <node concept="2OqwBi" id="guJe75HD4P" role="3clFbG">
                         <node concept="37vLTw" id="guJe75HD4Q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="guJe75HD4S" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCy7" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="guJe75HD4R" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -482,9 +482,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="guJe75HD4S" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCy7" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="guJe75HD4T" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCy8" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
index 1a8104975..13503a0b3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.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: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" />
@@ -51,7 +50,7 @@
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
index 20c3076f0..67f08f40e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
@@ -91,7 +91,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
index d2279abc2..5fc9b334a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
@@ -101,7 +101,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="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">
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps
index d82b6d134..380c726a0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.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>
@@ -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" />
@@ -137,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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>
@@ -344,7 +344,7 @@
                                 <node concept="2OqwBi" id="1Y8zh0m0ayN" role="3clFbG">
                                   <node concept="2OqwBi" id="1Y8zh0m0ayO" role="2Oq$k0">
                                     <node concept="37vLTw" id="1Y8zh0m0ayP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1Y8zh0m0ayS" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCya" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="1Y8zh0m0ayQ" role="2OqNvi">
                                       <ref role="3Tt5mk" to="3whv:7RhjhI7$liY" resolve="interfaceRef" />
@@ -356,9 +356,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="1Y8zh0m0ayS" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpCya" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="1Y8zh0m0ayT" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpCyb" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
index ea666937a..db9a293ca 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
@@ -37,7 +37,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -57,7 +57,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -92,7 +92,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.plugin.mps
index 2b6f7cc89..8ba869932 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -28,7 +28,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -81,7 +81,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,7 +98,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -172,7 +172,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.structure.mps
index bb66df43d..c77f2dcb9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.structure.mps
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
index 829fea7b2..923db0c3a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
@@ -64,7 +64,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -76,6 +76,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -150,7 +151,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>
@@ -174,7 +175,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -252,7 +252,7 @@
                   <node concept="3clFbF" id="6FysnQMUwg3" role="3cqZAp">
                     <node concept="2OqwBi" id="6FysnQMUwg4" role="3clFbG">
                       <node concept="37vLTw" id="6FysnQMUwg5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6FysnQMUwg7" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCyc" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3TSGpjyNBWw" role="2OqNvi">
                         <ref role="37wK5l" to="g8ih:1Y8zh0lZmaU" resolve="getHazard" />
@@ -260,9 +260,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6FysnQMUwg7" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyc" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6FysnQMUwg8" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyd" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -379,7 +379,7 @@
                   <node concept="3clFbF" id="4i__4GxoqNz" role="3cqZAp">
                     <node concept="2OqwBi" id="4i__4GxoqN$" role="3clFbG">
                       <node concept="37vLTw" id="4i__4GxoqN_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4i__4GxoqNB" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCye" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="65LrkjiWUAU" role="2OqNvi">
                         <ref role="37wK5l" to="g8ih:65LrkjiWRoD" resolve="getRequirement" />
@@ -387,9 +387,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4i__4GxoqNB" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCye" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4i__4GxoqNC" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyf" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -527,7 +527,7 @@
                             <node concept="3clFbF" id="4MR8i$4hfC5" role="3cqZAp">
                               <node concept="2OqwBi" id="4MR8i$4hfC6" role="3clFbG">
                                 <node concept="37vLTw" id="4MR8i$4hfC7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4MR8i$4hfC9" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCyg" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4MR8i$4hfC8" role="2OqNvi">
                                   <ref role="37wK5l" to="g8ih:2RlaC$P6pDt" resolve="getComponent" />
@@ -535,9 +535,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4MR8i$4hfC9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36FpCyg" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4MR8i$4hfCa" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36FpCyh" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -578,7 +578,7 @@
                                 <node concept="2OqwBi" id="4MR8i$4hOLv" role="3clFbG">
                                   <node concept="2OqwBi" id="4MR8i$4hOLw" role="2Oq$k0">
                                     <node concept="37vLTw" id="4MR8i$4hOLx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4MR8i$4hOL$" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCyi" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4MR8i$4hOLy" role="2OqNvi">
                                       <ref role="3Tt5mk" to="3whv:7RhjhI7$liY" resolve="interfaceRef" />
@@ -590,9 +590,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4MR8i$4hOL$" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpCyi" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4MR8i$4hOL_" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpCyj" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -632,7 +632,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4MR8i$4ihAq" role="3uHU7B">
                                     <node concept="37vLTw" id="4MR8i$4ihAr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4MR8i$4ihAt" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpCyk" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="4MR8i$4ihAs" role="2OqNvi">
                                       <ref role="37wK5l" to="g8ih:2RlaC$P6pDt" resolve="getComponent" />
@@ -641,9 +641,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="4MR8i$4ihAt" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpCyk" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="4MR8i$4ihAu" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpCyl" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl
index 1a23dc90d..2a3d651a8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.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" />
@@ -72,7 +72,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -93,7 +92,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -116,7 +115,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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps
index 7ff9ac3cf..cdbaf05ed 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
index a61fdccd0..822bedb1f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
index 373612aa1..e5f03dc61 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.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" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,12 +98,13 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -143,7 +144,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -151,7 +152,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>
@@ -207,7 +207,7 @@
                         <node concept="13iPFW" id="79zp7ziepnU" role="3uHU7w" />
                         <node concept="2OqwBi" id="79zp7ziepnV" role="3uHU7B">
                           <node concept="37vLTw" id="79zp7ziepnW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="79zp7ziepnY" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCym" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="79zp7ziepnX" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -216,9 +216,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="79zp7ziepnY" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCym" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="79zp7ziepnZ" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyn" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -361,7 +361,7 @@
                         <node concept="17R0WA" id="4qaoH_Npdv" role="3clFbG">
                           <node concept="2OqwBi" id="4qaoH_Npdw" role="3uHU7B">
                             <node concept="37vLTw" id="4qaoH_Npdx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4qaoH_Npd$" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCyo" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4qaoH_Npdy" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -371,9 +371,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4qaoH_Npd$" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCyo" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4qaoH_Npd_" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCyp" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.constraints.mps
index 5456c8071..8a0ac50af 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.constraints.mps
@@ -28,7 +28,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
index 0c6f84a52..12ad3d2b8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
@@ -18,7 +18,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" />
@@ -51,7 +51,7 @@
       <concept id="1186415722038" name="jetbrains.mps.lang.editor.structure.FontSizeStyleClassItem" flags="ln" index="VSNWy">
         <property id="1221209241505" name="value" index="1lJzqX" />
       </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>
@@ -60,7 +60,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" />
@@ -70,7 +70,7 @@
         <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ngI" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
@@ -84,7 +84,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
index 5392b7553..06970e098 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
@@ -6,7 +6,7 @@
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
@@ -56,7 +56,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -65,7 +65,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" />
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps
index abfda8a95..9cebbb14b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -28,7 +28,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -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" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -91,7 +91,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
index baa405302..279412c9e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
@@ -60,7 +60,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
index 0cf851c22..8f0357707 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
@@ -48,6 +48,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -100,7 +101,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -109,7 +110,6 @@
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="18kY7G" id="4qaoH_Fr7h">
@@ -163,7 +163,7 @@
                       </node>
                       <node concept="2OqwBi" id="4qaoH_FFwY" role="3uHU7B">
                         <node concept="37vLTw" id="4qaoH_FFiB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4qaoH_FFeP" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCyq" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4qaoH_FIh0" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:3GRi4m$sIbL" resolve="source" />
@@ -172,9 +172,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4qaoH_FFeP" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyq" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4qaoH_FFeQ" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyr" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -229,7 +229,7 @@
                       </node>
                       <node concept="2OqwBi" id="4qaoH_IstT" role="3uHU7B">
                         <node concept="37vLTw" id="4qaoH_IstU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4qaoH_IstW" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCys" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4qaoH_IxM4" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -238,9 +238,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4qaoH_IstW" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCys" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4qaoH_IstX" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyt" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
index ab08f707d..d215e69af 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
@@ -37,7 +37,7 @@
         <language slang="l:990507d3-3527-4c54-bfe9-0ca3c9c6247a:com.dslfoundry.plaintextgen" version="0" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -82,7 +82,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -94,7 +93,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
index 4dc0a1a20..5f63879f7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
@@ -81,7 +81,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,7 +131,7 @@
       </concept>
       <concept id="1145195647826084325" name="com.dslfoundry.plaintextgen.structure.VerticalLines" flags="ng" index="356WMU" />
       <concept id="2847858303663881928" name="com.dslfoundry.plaintextgen.structure.tab" flags="ng" index="373pV1" />
-      <concept id="7214912913997260680" name="com.dslfoundry.plaintextgen.structure.IVerticalGroup" flags="ng" index="383Yap">
+      <concept id="7214912913997260680" name="com.dslfoundry.plaintextgen.structure.IVerticalGroup" flags="ngI" index="383Yap">
         <child id="7214912913997260696" name="lines" index="383Ya9" />
       </concept>
     </language>
@@ -167,7 +167,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
index 73b32278b..ba9c4a5fd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
@@ -92,7 +92,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>
@@ -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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -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>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/com.mbeddr.formal.safety.gsn.xml_gen.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/com.mbeddr.formal.safety.gsn.xml_gen.mpl
index 2eb883691..ad24444c8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/com.mbeddr.formal.safety.gsn.xml_gen.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/com.mbeddr.formal.safety.gsn.xml_gen.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" />
@@ -78,12 +78,11 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
index 26fd6ae0a..103ba64ce 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
@@ -33,7 +33,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>
@@ -75,7 +75,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_" />
@@ -142,7 +142,7 @@
         <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
         <property id="1341860900487648621" name="propertyId" index="P4ACc" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/models/com.mbeddr.formal.safety.gsn.xml_gen.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/models/com.mbeddr.formal.safety.gsn.xml_gen.structure.mps
index 79a7c9d62..6084e6f42 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/models/com.mbeddr.formal.safety.gsn.xml_gen.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/models/com.mbeddr.formal.safety.gsn.xml_gen.structure.mps
@@ -38,7 +38,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
index 340f43e04..fa89b855b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -39,7 +38,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -62,7 +61,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" />
@@ -109,7 +108,6 @@
     <module reference="c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)" version="0" />
     <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</extendedLanguage>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
index 52e32d88d..cda36f54e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
@@ -114,7 +114,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>
@@ -126,7 +126,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -144,6 +144,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -205,7 +206,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -231,7 +232,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="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -327,7 +327,7 @@
                         <node concept="13iPFW" id="6FysnQMUkbu" role="3uHU7w" />
                         <node concept="2OqwBi" id="6FysnQMUkbv" role="3uHU7B">
                           <node concept="37vLTw" id="6FysnQMUkbw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6FysnQMUkby" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyv" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6FysnQMUkbx" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -336,9 +336,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6FysnQMUkby" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyv" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6FysnQMUkbz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyw" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -357,7 +357,7 @@
                     <node concept="3clFbF" id="6FysnQMV5mJ" role="3cqZAp">
                       <node concept="2OqwBi" id="6FysnQMV5_w" role="3clFbG">
                         <node concept="37vLTw" id="6FysnQMV5mI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6FysnQMV5e_" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCyx" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6FysnQMV62L" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -365,9 +365,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6FysnQMV5e_" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyx" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6FysnQMV5eA" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyy" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -427,7 +427,7 @@
                         <node concept="13iPFW" id="4_dUcGNLknu" role="3uHU7w" />
                         <node concept="2OqwBi" id="4_dUcGNLknv" role="3uHU7B">
                           <node concept="37vLTw" id="4_dUcGNLknw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4_dUcGNLkny" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyz" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4_dUcGNLknx" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -436,9 +436,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4_dUcGNLkny" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyz" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4_dUcGNLknz" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCy$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -511,7 +511,7 @@
                         <node concept="13iPFW" id="71GfFl7iEIy" role="3uHU7w" />
                         <node concept="2OqwBi" id="71GfFl7iEIz" role="3uHU7B">
                           <node concept="37vLTw" id="71GfFl7iEI$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="71GfFl7iEIA" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCy_" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="71GfFl7iEI_" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -520,9 +520,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="71GfFl7iEIA" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCy_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="71GfFl7iEIB" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -583,7 +583,7 @@
                         <node concept="13iPFW" id="71GfFl7iFXz" role="3uHU7w" />
                         <node concept="2OqwBi" id="71GfFl7iFX$" role="3uHU7B">
                           <node concept="37vLTw" id="71GfFl7iFX_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="71GfFl7iFXB" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyB" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="71GfFl7iGOP" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -592,9 +592,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="71GfFl7iFXB" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyB" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="71GfFl7iFXC" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyC" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1750,7 +1750,7 @@
                     <node concept="22lmx$" id="3Px2xUV5tVd" role="3clFbG">
                       <node concept="2OqwBi" id="3Px2xUV5uEk" role="3uHU7w">
                         <node concept="37vLTw" id="3Px2xUV5ueu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3Px2xUV5pZq" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCyD" resolve="it" />
                         </node>
                         <node concept="2Zo12i" id="3Px2xUV5vIu" role="2OqNvi">
                           <node concept="chp4Y" id="3Px2xUV5vZv" role="2Zo12j">
@@ -1761,7 +1761,7 @@
                       <node concept="2OqwBi" id="3Px2xUV5seX" role="3uHU7B">
                         <node concept="2OqwBi" id="3Px2xUV5qQL" role="2Oq$k0">
                           <node concept="37vLTw" id="3Px2xUV5qqG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3Px2xUV5pZq" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyD" resolve="it" />
                           </node>
                           <node concept="3n3YKJ" id="3Px2xUV5rld" role="2OqNvi" />
                         </node>
@@ -1770,9 +1770,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="3Px2xUV5pZq" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyD" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="3Px2xUV5pZr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyE" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
index fd9e465b4..84a3d8c54 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.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>
@@ -89,6 +89,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" />
@@ -128,7 +129,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -136,7 +137,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="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
@@ -230,14 +230,14 @@
                             <ref role="3cqZAo" node="4q8AAJKL7G4" resolve="gs" />
                           </node>
                           <node concept="37vLTw" id="4q8AAJKM6J1" role="3uHU7B">
-                            <ref role="3cqZAo" node="4q8AAJKM6J2" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyF" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4q8AAJKM6J2" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCyF" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4q8AAJKM6J3" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCyG" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -259,7 +259,7 @@
                         <node concept="2OqwBi" id="4q8AAJKM9Si" role="3clFbG">
                           <node concept="2OqwBi" id="4q8AAJKM9Sj" role="2Oq$k0">
                             <node concept="37vLTw" id="4q8AAJKM9Sk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4q8AAJKM9Sz" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCyJ" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="4q8AAJKM9Sl" role="2OqNvi">
                               <node concept="1xMEDy" id="4q8AAJKM9Sm" role="1xVPHs">
@@ -276,7 +276,7 @@
                                   <node concept="2OqwBi" id="4q8AAJKM9Ss" role="3clFbG">
                                     <node concept="2OqwBi" id="4q8AAJKM9St" role="2Oq$k0">
                                       <node concept="37vLTw" id="4q8AAJKM9Su" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4q8AAJKM9Sx" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpCyH" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="4q8AAJKM9Sv" role="2OqNvi">
                                         <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
@@ -286,18 +286,18 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="4q8AAJKM9Sx" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36FpCyH" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4q8AAJKM9Sy" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36FpCyI" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="4q8AAJKM9Sz" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCyJ" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4q8AAJKM9S$" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCyK" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index af07ea7d7..180e1f191 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -62,7 +62,7 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -89,7 +89,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="4242538589859161874" name="jetbrains.mps.lang.editor.structure.ExplicitHintsSpecification" flags="ng" index="2w$q5c">
@@ -144,12 +144,12 @@
         <property id="1221209241505" name="value" index="1lJzqX" />
         <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="1182191800432" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeListFilter" flags="in" index="107P5z" />
@@ -184,10 +184,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="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="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ng" index="1rj3mw">
+      <concept id="7228435049763093185" name="jetbrains.mps.lang.editor.structure.FontFamilyContainer" flags="ngI" index="1rj3mw">
         <property id="7228435049763093186" name="family" index="1rj3mz" />
       </concept>
       <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
@@ -223,7 +223,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">
@@ -246,7 +246,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="7033942394256351208" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclarationReference" flags="ng" index="1PE4EZ">
@@ -289,7 +289,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_" />
@@ -345,7 +345,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" />
@@ -407,7 +407,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -431,7 +431,7 @@
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -482,6 +482,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" />
@@ -504,7 +505,7 @@
       </concept>
     </language>
     <language id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram">
-      <concept id="8433227566816385664" name="de.itemis.mps.editor.diagram.structure.ILayoutAlgorithm" flags="ng" index="35SPa">
+      <concept id="8433227566816385664" name="de.itemis.mps.editor.diagram.structure.ILayoutAlgorithm" flags="ngI" index="35SPa">
         <child id="2064429317493348220" name="config" index="3pGojU" />
       </concept>
       <concept id="6554619383003875357" name="de.itemis.mps.editor.diagram.structure.InlineEditorComponent" flags="ig" index="238au4" />
@@ -523,7 +524,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="621570459751239491" name="canSplit" index="KYgL9" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -545,7 +546,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="621570459751009499" name="de.itemis.mps.editor.diagram.structure.EdgeEditor_CanSplit" flags="ig" index="KXoZh" />
@@ -712,7 +713,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">
@@ -774,7 +775,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="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -3837,7 +3837,7 @@
                       <node concept="3fqX7Q" id="5uFV_KKTntC" role="3clFbG">
                         <node concept="2OqwBi" id="5uFV_KKTntD" role="3fr31v">
                           <node concept="37vLTw" id="5uFV_KKTntE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5uFV_KKTntH" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyL" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5uFV_KKTntF" role="2OqNvi">
                             <node concept="chp4Y" id="6OmQ$5rs7Pz" role="cj9EA">
@@ -3848,9 +3848,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5uFV_KKTntH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyL" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5uFV_KKTntI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyM" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -3886,7 +3886,7 @@
                             <ref role="37wK5l" node="2V4rzbp9t$s" resolve="getNeighbouringInboundElement" />
                             <ref role="1Pybhc" node="2V4rzbp94Pn" resolve="GoalStructureFilteredModelAccessCache" />
                             <node concept="37vLTw" id="6hlfxCKWuSF" role="37wK5m">
-                              <ref role="3cqZAo" node="71QF$$U0Ame" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCyN" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -3929,9 +3929,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="71QF$$U0Ame" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCyN" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="71QF$$U0Amf" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCyO" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -3958,7 +3958,7 @@
                             <ref role="3cqZAo" node="5uFV_KKTnlv" resolve="node" />
                           </node>
                           <node concept="37vLTw" id="71QF$$U1pUE" role="37wK5m">
-                            <ref role="3cqZAo" node="71QF$$U1maX" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyP" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="71QF$$U9m_m" role="3uHU7w">
@@ -3966,7 +3966,7 @@
                             <ref role="1Pybhc" node="2V4rzbp94Pn" resolve="GoalStructureFilteredModelAccessCache" />
                             <ref role="37wK5l" node="2V4rzbp9nJi" resolve="getNeighbouringOutboundElements" />
                             <node concept="37vLTw" id="71QF$$U9riT" role="37wK5m">
-                              <ref role="3cqZAo" node="71QF$$U1maX" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCyP" resolve="it" />
                             </node>
                           </node>
                           <node concept="3GX2aA" id="71QF$$U9qVn" role="2OqNvi" />
@@ -3974,9 +3974,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="71QF$$U1maX" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyP" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="71QF$$U1maY" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyQ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4070,7 +4070,7 @@
                       <node concept="3clFbC" id="6f7vJBUerfs" role="3clFbG">
                         <node concept="2OqwBi" id="6f7vJBUerft" role="3uHU7B">
                           <node concept="37vLTw" id="6f7vJBUerfu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6f7vJBUerfx" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyR" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6f7vJBUerfv" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -4082,9 +4082,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6f7vJBUerfx" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyR" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6f7vJBUerfy" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyS" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4097,7 +4097,7 @@
                       <ref role="37wK5l" node="6f7vJBUc0Br" resolve="deleteGsnElementBase" />
                       <node concept="2OqwBi" id="6f7vJBUetT1" role="37wK5m">
                         <node concept="37vLTw" id="6f7vJBUetIn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6f7vJBUerfE" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCyT" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6f7vJBUeubM" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -4111,15 +4111,15 @@
                   <node concept="3clFbF" id="6f7vJBUerfA" role="3cqZAp">
                     <node concept="2OqwBi" id="6f7vJBUerfB" role="3clFbG">
                       <node concept="37vLTw" id="6f7vJBUerfC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6f7vJBUerfE" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCyT" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6f7vJBUerfD" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6f7vJBUerfE" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyT" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6f7vJBUerfF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4141,7 +4141,7 @@
                         </node>
                         <node concept="2OqwBi" id="6f7vJBUesYK" role="3uHU7B">
                           <node concept="37vLTw" id="6f7vJBUesYL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6f7vJBUesYS" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCyV" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6f7vJBUesYM" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -4150,9 +4150,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6f7vJBUesYS" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCyV" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6f7vJBUesYT" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCyW" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4163,15 +4163,15 @@
                   <node concept="3clFbF" id="6f7vJBUesYX" role="3cqZAp">
                     <node concept="2OqwBi" id="6f7vJBUesYY" role="3clFbG">
                       <node concept="37vLTw" id="6f7vJBUesYZ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6f7vJBUesZ1" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCyX" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6f7vJBUesZ0" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6f7vJBUesZ1" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyX" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6f7vJBUesZ2" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCyY" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4687,15 +4687,15 @@
                   <node concept="3clFbF" id="68PMoq4jyTh" role="3cqZAp">
                     <node concept="2OqwBi" id="68PMoq4jyTi" role="3clFbG">
                       <node concept="37vLTw" id="68PMoq4jyTj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="68PMoq4jyTl" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCyZ" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="68PMoq4jyTk" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="68PMoq4jyTl" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCyZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="68PMoq4jyTm" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCz0" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -4717,15 +4717,15 @@
                   <node concept="3clFbF" id="68PMoq4jyTv" role="3cqZAp">
                     <node concept="2OqwBi" id="68PMoq4jyTw" role="3clFbG">
                       <node concept="37vLTw" id="68PMoq4jyTx" role="2Oq$k0">
-                        <ref role="3cqZAo" node="68PMoq4jyTz" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCz1" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="68PMoq4jyTy" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="68PMoq4jyTz" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCz1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="68PMoq4jyT$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCz2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5526,7 +5526,7 @@
                         <node concept="1Wc70l" id="696iakmhTo" role="3clFbG">
                           <node concept="2OqwBi" id="696iakmhTp" role="3uHU7B">
                             <node concept="37vLTw" id="696iakmhTq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="696iakkujT" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCz3" resolve="it" />
                             </node>
                             <node concept="liA8E" id="696iakmhTr" role="2OqNvi">
                               <ref role="37wK5l" to="nkm5:45TnPEuxBsF" resolve="isValidStart" />
@@ -5542,7 +5542,7 @@
                           </node>
                           <node concept="2OqwBi" id="696iakmhTv" role="3uHU7w">
                             <node concept="37vLTw" id="696iakmhTw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="696iakkujT" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCz3" resolve="it" />
                             </node>
                             <node concept="liA8E" id="696iakmhTx" role="2OqNvi">
                               <ref role="37wK5l" to="nkm5:7vufT$m7ARQ" resolve="canCreate" />
@@ -5562,9 +5562,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="696iakkujT" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCz3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="696iakkujU" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCz4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -5707,7 +5707,7 @@
                       <node concept="1Wc70l" id="696iakmsX3" role="3clFbG">
                         <node concept="2OqwBi" id="696iakmsX4" role="3uHU7B">
                           <node concept="37vLTw" id="696iakmsX5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="696iakmsXj" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCz5" resolve="it" />
                           </node>
                           <node concept="liA8E" id="696iakmsX6" role="2OqNvi">
                             <ref role="37wK5l" to="nkm5:45TnPEuxBsF" resolve="isValidStart" />
@@ -5718,7 +5718,7 @@
                         </node>
                         <node concept="2OqwBi" id="696iakmsXa" role="3uHU7w">
                           <node concept="37vLTw" id="696iakmsXb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="696iakmsXj" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCz5" resolve="it" />
                           </node>
                           <node concept="liA8E" id="696iakmsXc" role="2OqNvi">
                             <ref role="37wK5l" to="nkm5:7vufT$m7ARQ" resolve="canCreate" />
@@ -5735,9 +5735,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="696iakmsXj" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCz5" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="696iakmsXk" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCz6" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6112,15 +6112,15 @@
                         <node concept="3clFbF" id="71GfFl7iM7A" role="3cqZAp">
                           <node concept="2OqwBi" id="71GfFl7iMh2" role="3clFbG">
                             <node concept="37vLTw" id="71GfFl7iM7_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="71GfFl7iM0Y" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCz7" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="71GfFl7iMyI" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="71GfFl7iM0Y" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCz7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="71GfFl7iM0Z" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCz8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6140,15 +6140,15 @@
                         <node concept="3clFbF" id="71GfFl7iQQ9" role="3cqZAp">
                           <node concept="2OqwBi" id="71GfFl7iQUl" role="3clFbG">
                             <node concept="37vLTw" id="71GfFl7iQQ8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="71GfFl7iQJx" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCz9" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="71GfFl7iR51" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="71GfFl7iQJx" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCz9" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="71GfFl7iQJy" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCza" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -6424,7 +6424,7 @@
                       <node concept="3fqX7Q" id="5uFV_KKOTmu" role="3clFbG">
                         <node concept="2OqwBi" id="5uFV_KKOTmw" role="3fr31v">
                           <node concept="37vLTw" id="5uFV_KKOTmx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5uFV_KKOScH" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzb" resolve="it" />
                           </node>
                           <node concept="liA8E" id="5uFV_KKOTmy" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -6433,9 +6433,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5uFV_KKOScH" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzb" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5uFV_KKOScI" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzc" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -6986,7 +6986,7 @@
                       <node concept="3clFbF" id="6G8t3lLt2w$" role="3cqZAp">
                         <node concept="2OqwBi" id="6G8t3lLt2w_" role="3clFbG">
                           <node concept="37vLTw" id="6G8t3lLt2wA" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6G8t3lLt2wC" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzd" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6G8t3lLt2wB" role="2OqNvi">
                             <ref role="3TtcxE" to="py52:3GRi4m$sIHx" resolve="connections" />
@@ -6994,9 +6994,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6G8t3lLt2wC" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzd" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6G8t3lLt2wD" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCze" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7756,13 +7756,13 @@
                     <node concept="3clFbS" id="3uMEL0KuP6W" role="1bW5cS">
                       <node concept="3clFbF" id="3uMEL0KuP6X" role="3cqZAp">
                         <node concept="37vLTw" id="3uMEL0KuP6Y" role="3clFbG">
-                          <ref role="3cqZAo" node="3uMEL0KuP6Z" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCzf" resolve="it" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3uMEL0KuP6Z" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzf" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3uMEL0KuP70" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzg" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7899,7 +7899,7 @@
                         <node concept="3fqX7Q" id="3uMEL0Kw9ck" role="3clFbG">
                           <node concept="3EllGN" id="3uMEL0Kw9cl" role="3fr31v">
                             <node concept="37vLTw" id="3uMEL0Kw9cm" role="3ElVtu">
-                              <ref role="3cqZAo" node="3uMEL0Kw9co" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzh" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="3uMEL0Kw9cn" role="3ElQJh">
                               <ref role="3cqZAo" node="3uMEL0KvbDn" resolve="gseb2InfoAboutContainingString" />
@@ -7908,9 +7908,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3uMEL0Kw9co" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzh" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3uMEL0Kw9cp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzi" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -8070,7 +8070,7 @@
                           <node concept="2OqwBi" id="71QF$$U0O_A" role="3clFbG">
                             <node concept="2OqwBi" id="71QF$$U0O_B" role="2Oq$k0">
                               <node concept="37vLTw" id="71QF$$U0O_C" role="2Oq$k0">
-                                <ref role="3cqZAo" node="71QF$$U0O_G" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCzj" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="71QF$$U0O_D" role="2OqNvi">
                                 <ref role="37wK5l" to="w873:1r1mR59uH1f" resolve="asText" />
@@ -8085,9 +8085,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="71QF$$U0O_G" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCzj" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="71QF$$U0O_H" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCzk" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -8290,7 +8290,7 @@
                     <node concept="3clFbF" id="3uMEL0KvyLq" role="3cqZAp">
                       <node concept="3EllGN" id="3uMEL0Kvzft" role="3clFbG">
                         <node concept="37vLTw" id="3uMEL0Kvz$A" role="3ElVtu">
-                          <ref role="3cqZAo" node="3uMEL0Kvys3" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCzl" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="3uMEL0KvyLp" role="3ElQJh">
                           <ref role="3cqZAo" node="3uMEL0Kvgn6" resolve="gseb2InfoAboutContainingString" />
@@ -8298,9 +8298,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="3uMEL0Kvys3" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzl" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="3uMEL0Kvys4" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzm" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -10253,7 +10253,7 @@
                         <ref role="3cqZAo" node="6hlfxCL5ZKC" resolve="original" />
                       </node>
                       <node concept="37vLTw" id="6hlfxCL5ZJZ" role="37wK5m">
-                        <ref role="3cqZAo" node="6hlfxCL5ZKA" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCzn" resolve="it" />
                       </node>
                       <node concept="3clFbT" id="6hlfxCL5ZK0" role="37wK5m" />
                     </node>
@@ -10261,7 +10261,7 @@
                   <node concept="Jncv_" id="6hlfxCL5ZK1" role="3cqZAp">
                     <ref role="JncvD" to="py52:3$Xa1eBcsPD" resolve="ICanBeAwayGoalStructureElement" />
                     <node concept="37vLTw" id="6hlfxCL5ZK2" role="JncvB">
-                      <ref role="3cqZAo" node="6hlfxCL5ZKA" resolve="it" />
+                      <ref role="3cqZAo" node="2hED36FpCzn" resolve="it" />
                     </node>
                     <node concept="3clFbS" id="6hlfxCL5ZK3" role="Jncv$">
                       <node concept="3clFbJ" id="6hlfxCL5ZK4" role="3cqZAp">
@@ -10350,9 +10350,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6hlfxCL5ZKA" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzn" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6hlfxCL5ZKB" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCzo" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -11799,7 +11799,7 @@
                       </node>
                       <node concept="2OqwBi" id="2p23w$deMiK" role="3uHU7B">
                         <node concept="37vLTw" id="2p23w$deM2p" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2p23w$deLTq" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCzp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2p23w$deML9" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
@@ -11808,9 +11808,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2p23w$deLTq" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzp" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2p23w$deLTr" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCzq" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
index dd6026ccc..4db8f9ab5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
@@ -63,7 +63,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">
@@ -174,7 +174,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -195,7 +195,7 @@
         <child id="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">
@@ -228,6 +228,7 @@
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -344,7 +345,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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 id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -740,7 +740,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEcMyF" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEcMlB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4G_iuUEcMgE" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzr" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4G_iuUEcMBV" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -749,9 +749,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4G_iuUEcMgE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzr" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4G_iuUEcMgF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzs" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -762,7 +762,7 @@
                   <node concept="3clFbF" id="4G_iuUEcOdG" role="3cqZAp">
                     <node concept="2OqwBi" id="4G_iuUEcOj2" role="3clFbG">
                       <node concept="37vLTw" id="4G_iuUEcOdF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4G_iuUEcO9n" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCzt" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4G_iuUEcO_J" role="2OqNvi">
                         <ref role="37wK5l" to="89jy:4G_iuUEcCKJ" resolve="setDownstreamElement" />
@@ -773,9 +773,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4G_iuUEcO9n" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzt" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4G_iuUEcO9o" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCzu" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -1171,7 +1171,7 @@
                             <node concept="3JPx81" id="6fCPE$QM6F3" role="2OqNvi">
                               <node concept="2OqwBi" id="6fCPE$QM6F4" role="25WWJ7">
                                 <node concept="37vLTw" id="6fCPE$QM6F5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6fCPE$QM6F7" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCzv" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4G_iuUEcALF" role="2OqNvi">
                                   <ref role="37wK5l" to="89jy:4G_iuUEct$e" resolve="getUpstreamElement" />
@@ -1181,9 +1181,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6fCPE$QM6F7" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCzv" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6fCPE$QM6F8" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCzw" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1221,7 +1221,7 @@
                               <node concept="TSZUe" id="6fCPE$QM9YH" role="2OqNvi">
                                 <node concept="2OqwBi" id="6fCPE$QMav5" role="25WWJ7">
                                   <node concept="37vLTw" id="6fCPE$QMabn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6fCPE$QM8fe" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpCzx" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="4G_iuUEcBLl" role="2OqNvi">
                                     <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -1231,9 +1231,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6fCPE$QM8fe" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCzx" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6fCPE$QM8ff" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCzy" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1415,7 +1415,7 @@
                             <node concept="2OqwBi" id="5pJnDA9hrMF" role="3clFbG">
                               <node concept="2OqwBi" id="5pJnDA9hrMG" role="2Oq$k0">
                                 <node concept="37vLTw" id="5pJnDA9hrMH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5pJnDA9hrMQ" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpCzz" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5pJnDA9hrMI" role="2OqNvi">
                                   <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -1430,9 +1430,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5pJnDA9hrMQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpCzz" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5pJnDA9hrMR" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpCz$" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1804,7 +1804,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEdstB" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEdstC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4G_iuUEdstE" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCz_" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4G_iuUEdstD" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -1813,9 +1813,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4G_iuUEdstE" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCz_" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4G_iuUEdstF" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzA" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1826,7 +1826,7 @@
                   <node concept="3clFbF" id="4G_iuUEdstJ" role="3cqZAp">
                     <node concept="2OqwBi" id="4G_iuUEdstK" role="3clFbG">
                       <node concept="37vLTw" id="4G_iuUEdstL" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4G_iuUEdstO" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCzB" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4G_iuUEdstM" role="2OqNvi">
                         <ref role="37wK5l" to="89jy:4G_iuUEcCKJ" resolve="setDownstreamElement" />
@@ -1837,9 +1837,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="4G_iuUEdstO" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzB" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4G_iuUEdstP" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCzC" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2726,7 +2726,7 @@
                       <node concept="2OqwBi" id="47PB7GsQGep" role="3clFbG">
                         <node concept="2OqwBi" id="47PB7GsQAnX" role="2Oq$k0">
                           <node concept="37vLTw" id="47PB7GsQ_kS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="47PB7GsQz7K" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzD" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="47PB7GsQC7c" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
@@ -2736,9 +2736,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="47PB7GsQz7K" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzD" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="47PB7GsQz7L" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzE" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -4503,7 +4503,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="5l6J5csMeTd" role="3uHU7B">
                                             <node concept="37vLTw" id="5l6J5csMeTe" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5l6J5csMeTg" resolve="it" />
+                                              <ref role="3cqZAo" node="2hED36FpCzF" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="5l6J5csMeTf" role="2OqNvi">
                                               <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
@@ -4512,9 +4512,9 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Rh6nW" id="5l6J5csMeTg" role="1bW2Oz">
+                                    <node concept="gl6BB" id="2hED36FpCzF" role="1bW2Oz">
                                       <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5l6J5csMeTh" role="1tU5fm" />
+                                      <node concept="2jxLKc" id="2hED36FpCzG" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
index 9f2b0c7b0..94d2c1244 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.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" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
@@ -51,12 +51,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -93,7 +94,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -119,7 +120,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
     </language>
   </registry>
@@ -172,7 +172,7 @@
                         <node concept="2OqwBi" id="3Px2xUV1wT4" role="3clFbG">
                           <node concept="2OqwBi" id="3Px2xUV1v2r" role="2Oq$k0">
                             <node concept="37vLTw" id="3Px2xUV1uOV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3Px2xUV1uIa" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzH" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="3Px2xUV1vd9" role="2OqNvi">
                               <ref role="3TtcxE" to="py52:3Px2xUV1gzV" resolve="attributes" />
@@ -181,7 +181,7 @@
                           <node concept="X8dFx" id="3Px2xUV1_lZ" role="2OqNvi">
                             <node concept="2OqwBi" id="3Px2xUV1BJk" role="25WWJ7">
                               <node concept="37vLTw" id="3Px2xUV1AP5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3Px2xUV1uIa" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCzH" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="3Px2xUV1EIr" role="2OqNvi">
                                 <ref role="3TtcxE" to="py52:6dwPixfdDSe" resolve="attributes_old" />
@@ -191,9 +191,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3Px2xUV1uIa" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzH" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3Px2xUV1uIb" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzI" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
index 70aeb5293..e1f8fcaad 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
@@ -5,7 +5,7 @@
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" 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" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -60,7 +60,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -157,7 +157,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -183,7 +183,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" />
@@ -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="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -310,7 +311,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -337,7 +338,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
     </language>
@@ -3477,7 +3477,7 @@
                   <node concept="3clFbF" id="2QkJsC6vNlj" role="3cqZAp">
                     <node concept="2OqwBi" id="2QkJsC6vNyp" role="3clFbG">
                       <node concept="37vLTw" id="2QkJsC6vNli" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2QkJsC6vNcZ" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpCzJ" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2QkJsC6vNQP" role="2OqNvi">
                         <node concept="chp4Y" id="2p23w$d2Va7" role="cj9EA">
@@ -3487,9 +3487,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2QkJsC6vNcZ" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzJ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2QkJsC6vNd0" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpCzK" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
index f0ea8f703..daf070de4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
@@ -76,7 +76,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps
index 60d8575a6..c3eb5904e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.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" />
       </concept>
     </language>
@@ -70,7 +70,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
index 25ef8bbaa..7d758b61c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
@@ -83,7 +83,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,7 +98,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -110,7 +110,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
index fb613069e..dbe05ee04 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
index e02bc1138..39e73ec47 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
@@ -62,7 +62,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>
@@ -70,7 +70,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" />
@@ -98,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
index 95cb4dc1a..3c8536c70 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
@@ -13,7 +13,7 @@
     <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" 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" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
index 99b4919af..442ec0eb1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
@@ -38,7 +38,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -57,7 +57,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
index b45eff40d..f903ba3f4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
@@ -69,7 +69,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
index 5c307015d..969277145 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</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" />
@@ -46,7 +45,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.behavior.mps
index d5d8707cf..12357c49d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.behavior.mps
@@ -54,7 +54,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" />
@@ -72,7 +72,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
index 275d498b9..889b5c2d5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
@@ -46,7 +46,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -72,7 +72,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">
@@ -110,7 +110,7 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
@@ -155,7 +155,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
index 2d83a4f07..2b5b1a4af 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.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>
@@ -59,7 +59,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -68,7 +68,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -135,7 +135,7 @@
       <concept id="1215467301810" name="jetbrains.mps.lang.smodel.structure.Property_RemoveOperation" flags="nn" index="3ZvMEC" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
index dd3673059..ff0e7d0a1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
@@ -76,7 +76,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.typesystem.mps
index ad0c1d91b..c347ee991 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.typesystem.mps
@@ -100,7 +100,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl
index 0380ed32e..11195f731 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
@@ -78,7 +77,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -98,7 +97,7 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps
index f13029c70..a6ed69a06 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
index 0c4d9f9ef..c658a58e5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.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>
@@ -62,7 +62,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -71,12 +71,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>
@@ -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="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -239,7 +239,7 @@
                         <node concept="2OqwBi" id="6W1kQP6AX9n" role="3clFbG">
                           <node concept="2OqwBi" id="6W1kQP6AV5m" role="2Oq$k0">
                             <node concept="37vLTw" id="6W1kQP6AUVc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6W1kQP6AVmm" role="2OqNvi">
                               <ref role="3TtcxE" to="30zx:6W1kQP6AMYT" resolve="hazards" />
@@ -254,7 +254,7 @@
                                   <node concept="36biLy" id="6W1kQP6B1EQ" role="28nt2d">
                                     <node concept="2OqwBi" id="6W1kQP6B57A" role="36biLW">
                                       <node concept="37vLTw" id="6W1kQP6B4LH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6W1kQP6B5yC" role="2OqNvi">
                                         <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
@@ -272,7 +272,7 @@
                           <node concept="10Nm6u" id="6W1kQP6B8BP" role="37vLTx" />
                           <node concept="2OqwBi" id="6W1kQP6B6oN" role="37vLTJ">
                             <node concept="37vLTw" id="6W1kQP6B67N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6W1kQP6B6LU" role="2OqNvi">
                               <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
@@ -281,9 +281,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6W1kQP6AUOk" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzM" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6W1kQP6AUOl" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzN" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
index b9405f369..54517dc4e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
@@ -51,7 +51,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl
index badfe5f5f..83a446ff3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.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" />
@@ -65,7 +65,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
@@ -78,7 +77,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps
index 295219e09..8d92eff50 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
index 6eeb0731a..65347967a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
@@ -48,7 +48,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <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" />
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.constraints.mps
index ffaa4a479..bdf5a1de9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.constraints.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.editor.mps
index e4ab461e9..f88bdf46f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.editor.mps
@@ -43,7 +43,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -59,7 +59,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -99,7 +99,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
index e8335bd18..4521b8bf6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
@@ -44,7 +44,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
index b0cdce83d..65d7775e1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.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>
@@ -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: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:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
index fecb07ec1..d159ddd42 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
@@ -68,12 +68,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" />
@@ -128,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -140,7 +141,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -240,7 +240,7 @@
                           <node concept="13iPFW" id="7BYuSCFAt59" role="3uHU7w" />
                           <node concept="2OqwBi" id="7BYuSCFAsp5" role="3uHU7B">
                             <node concept="37vLTw" id="7BYuSCFAsal" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7BYuSCFArHo" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzP" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7BYuSCFAs$D" role="2OqNvi">
                               <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
@@ -249,9 +249,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7BYuSCFArHo" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzP" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7BYuSCFArHp" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzQ" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -262,7 +262,7 @@
                     <node concept="3clFbF" id="7BYuSCFAu8$" role="3cqZAp">
                       <node concept="2OqwBi" id="7BYuSCFAurb" role="3clFbG">
                         <node concept="37vLTw" id="7BYuSCFAu8z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7BYuSCFAtLd" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCzR" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="7BYuSCFAuFI" role="2OqNvi">
                           <ref role="3TtcxE" to="bewr:3Cm$$O2vdID" resolve="actions" />
@@ -270,9 +270,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="7BYuSCFAtLd" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzR" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="7BYuSCFAtLe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzS" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
index 62c9423e0..16f42b8c1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
@@ -51,7 +51,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -76,6 +76,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -112,7 +113,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -123,7 +124,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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -269,7 +269,7 @@
                             </node>
                             <node concept="2OqwBi" id="1JhvKLLOC48" role="3uHU7B">
                               <node concept="37vLTw" id="1JhvKLLOC49" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1JhvKLLOC4b" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpCzT" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1JhvKLLOC4a" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
@@ -278,9 +278,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1JhvKLLOC4b" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36FpCzT" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1JhvKLLOC4c" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36FpCzU" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -291,7 +291,7 @@
                       <node concept="3clFbF" id="1JhvKLLOC4g" role="3cqZAp">
                         <node concept="2OqwBi" id="1JhvKLLOC4h" role="3clFbG">
                           <node concept="37vLTw" id="1JhvKLLOC4i" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1JhvKLLOC4k" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzV" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="1JhvKLLOC4j" role="2OqNvi">
                             <ref role="3TtcxE" to="bewr:3Cm$$O2vdID" resolve="actions" />
@@ -299,9 +299,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1JhvKLLOC4k" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpCzV" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1JhvKLLOC4l" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpCzW" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
index 791701a6f..7eec0483b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
@@ -104,7 +104,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" />
@@ -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" />
@@ -153,7 +153,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_" />
@@ -243,7 +243,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -259,7 +259,7 @@
         <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">
@@ -315,7 +315,7 @@
         <child id="6347834999919257750" name="canChange" index="2eSEbq" />
       </concept>
       <concept id="6347834999921795736" name="de.itemis.mps.editor.diagram.structure.Parameter_changeOwner_elementNode" flags="ng" index="2femzk" />
-      <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="621570459751239491" name="canSplit" index="KYgL9" />
         <child id="2044706694575458564" name="labelCell" index="3kqczz" />
         <child id="8587703283523592228" name="endpointFrom" index="1PN8q7" />
@@ -334,7 +334,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="621570459751009499" name="de.itemis.mps.editor.diagram.structure.EdgeEditor_CanSplit" flags="ig" index="KXoZh" />
@@ -382,7 +382,7 @@
       <concept id="1397920687865064509" name="de.slisson.mps.tables.structure.ChildCollection" flags="ng" index="2reSl8">
         <reference id="1397920687864997201" name="linkDeclaration" index="2reCK$" />
       </concept>
-      <concept id="1397920687864865353" name="de.slisson.mps.tables.structure.ITableNode" flags="ng" index="2rf8GW">
+      <concept id="1397920687864865353" name="de.slisson.mps.tables.structure.ITableNode" flags="ngI" index="2rf8GW">
         <child id="8843513109888016181" name="condition" index="3NQet$" />
       </concept>
       <concept id="1397920687864864270" name="de.slisson.mps.tables.structure.StaticHeader" flags="ng" index="2rfbtV">
@@ -391,7 +391,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" />
@@ -454,7 +454,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
index 31ac7b2a4..3dbf23e91 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.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>
@@ -72,6 +72,7 @@
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -128,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -150,7 +151,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -273,7 +273,7 @@
                         <node concept="2Sf5sV" id="1FMyjUP59Ov" role="3uHU7w" />
                         <node concept="2OqwBi" id="1FMyjUP59Ow" role="3uHU7B">
                           <node concept="37vLTw" id="1FMyjUP59Ox" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FMyjUP59Oz" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpCzX" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1FMyjUP59Oy" role="2OqNvi">
                             <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
@@ -282,9 +282,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="1FMyjUP59Oz" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpCzX" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1FMyjUP59O$" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpCzY" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
index 2d857e785..d48e4ff08 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.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>
@@ -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>
@@ -87,12 +87,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" />
@@ -178,7 +179,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -204,7 +205,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
@@ -466,7 +466,7 @@
                             <node concept="2OqwBi" id="6vZMoXu0WK2" role="3clFbG">
                               <node concept="2OqwBi" id="6vZMoXu0W2N" role="2Oq$k0">
                                 <node concept="37vLTw" id="6vZMoXu0VPl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6vZMoXu0VHX" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$7" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6vZMoXu0Wnf" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -481,9 +481,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6vZMoXu0VHX" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$7" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6vZMoXu0VHY" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$8" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -583,15 +583,15 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIGJB" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BIGUd" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BI$y_" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$9" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ynKV3BI$y_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$9" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BI$yA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$a" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -700,15 +700,15 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIKZW" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BILa_" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BICbU" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$b" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ynKV3BICbU" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$b" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BICbV" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$c" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -817,15 +817,15 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIYVV" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BIZ6y" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BIUtw" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$d" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ynKV3BIUtw" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$d" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BIUtx" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$e" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -934,15 +934,15 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BJ1Yf" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BJ1Yg" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BJ1Yh" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$f" resolve="it" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2ynKV3BJ1Yh" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$f" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BJ1Yi" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$g" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
index a8397ce4c..cd70160be 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.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="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
@@ -28,7 +28,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -81,7 +81,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -97,7 +97,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -170,7 +170,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps
index f8a85e9b5..d8a4204e6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.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/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
index c64042d07..751248a05 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
@@ -69,7 +69,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,6 +89,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -201,7 +202,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>
@@ -228,7 +229,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -428,14 +428,14 @@
                           <ref role="1YBMHb" node="41_NtXJpd3j" resolve="iReferenceableActionDescription" />
                         </node>
                         <node concept="37vLTw" id="41_NtXJplb7" role="3uHU7B">
-                          <ref role="3cqZAo" node="41_NtXJplbg" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                         </node>
                       </node>
                       <node concept="1Wc70l" id="1TD_kqsQP9o" role="3uHU7B">
                         <node concept="2OqwBi" id="1TD_kqsQQeN" role="3uHU7B">
                           <node concept="2OqwBi" id="1TD_kqsQP_q" role="2Oq$k0">
                             <node concept="37vLTw" id="1TD_kqsQPmY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="41_NtXJplbg" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1TD_kqsQPNZ" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -446,7 +446,7 @@
                         <node concept="2OqwBi" id="41_NtXJplb8" role="3uHU7w">
                           <node concept="2OqwBi" id="41_NtXJplb9" role="2Oq$k0">
                             <node concept="37vLTw" id="41_NtXJplba" role="2Oq$k0">
-                              <ref role="3cqZAo" node="41_NtXJplbg" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="41_NtXJplbb" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -468,9 +468,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="41_NtXJplbg" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpCzZ" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="41_NtXJplbh" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpC$0" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -709,7 +709,7 @@
                       <node concept="2OqwBi" id="5KVldFlGMBA" role="3clFbG">
                         <node concept="2OqwBi" id="5KVldFlGMg5" role="2Oq$k0">
                           <node concept="37vLTw" id="5KVldFlGLYn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5KVldFlGK5g" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$1" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="5KVldFlGMwG" role="2OqNvi" />
                         </node>
@@ -721,9 +721,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5KVldFlGK5g" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$1" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5KVldFlGK5h" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$2" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -755,7 +755,7 @@
                   <node concept="3clFbF" id="1FMyjUPhRZ6" role="3cqZAp">
                     <node concept="2OqwBi" id="1FMyjUPhRZ7" role="3clFbG">
                       <node concept="37vLTw" id="1FMyjUPhRZ8" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1FMyjUPhRZa" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpC$3" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="1FMyjUPhRZ9" role="2OqNvi">
                         <ref role="3Tt5mk" to="bewr:1JhvKLLO0pZ" resolve="action" />
@@ -763,9 +763,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="1FMyjUPhRZa" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpC$3" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1FMyjUPhRZb" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpC$4" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -806,7 +806,7 @@
                       <node concept="3clFbF" id="1FMyjUPhXDU" role="3cqZAp">
                         <node concept="2OqwBi" id="1FMyjUPhXT5" role="3clFbG">
                           <node concept="37vLTw" id="1FMyjUPhXDT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FMyjUPhXBy" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$5" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1FMyjUPhY6a" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -814,9 +814,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="1FMyjUPhXBy" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpC$5" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1FMyjUPhXBz" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpC$6" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
index 577d382a7..20ea5ceb5 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.assurance.build" uuid="7301161d-854c-45d9-b0d7-121b4fb52625" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.assurance.build" uuid="7301161d-854c-45d9-b0d7-121b4fb52625" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index ba5d3dd70..2cae8471a 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -86,7 +86,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">
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -179,7 +179,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>
@@ -957,7 +956,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.lib" />
         <property role="3LESm3" value="71bb25aa-20fa-4c18-8954-1b176576f52d" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="6hyv0iVPlHB" role="3LF7KH">
           <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
           <node concept="2Ry0Ak" id="6hyv0iVPlUt" role="iGT6I">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/com.fasten.process.review.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/com.fasten.process.review.sandbox.msd
index 924493527..a5a4b16c1 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/com.fasten.process.review.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/com.fasten.process.review.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.process.review.sandbox" uuid="cbae18ac-1026-481d-ba2c-5164a52e6e3f" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.process.review.sandbox" uuid="cbae18ac-1026-481d-ba2c-5164a52e6e3f" moduleVersion="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:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:6d475058-7ea2-490d-87e7-0f7f46dccc66:com.fasten.process.review" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
index 7fde672c0..aa3a810e9 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
@@ -22,7 +22,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument_review.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument_review.mps
index c03dc605e..46c48c20c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument_review.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument_review.mps
@@ -31,7 +31,7 @@
       <concept id="6287902373160858065" name="com.fasten.process.review.structure.InProgress" flags="ng" index="2hPqKP" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/com.fasten.safety.bayesian_network.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/com.fasten.safety.bayesian_network.sandbox.msd
index 5bd688687..ccd618bd0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/com.fasten.safety.bayesian_network.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/com.fasten.safety.bayesian_network.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.bayesian_network.sandbox" uuid="1aefa4ab-0deb-47ba-a8cf-c6379d2aa127" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.bayesian_network.sandbox" uuid="1aefa4ab-0deb-47ba-a8cf-c6379d2aa127" moduleVersion="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:14289527-ae82-48f0-ab60-380cec6ac506:com.fasten.safety.bayesian_network" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps
index 0ec7df546..61fa76bfc 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps
@@ -11,7 +11,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
index 2dab5859e..981ea6f10 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.doc2word" uuid="e1b41d7d-269e-4a91-a7d8-91bd657028d7" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.fasten.safety.doc2word" uuid="e1b41d7d-269e-4a91-a7d8-91bd657028d7" moduleVersion="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">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
@@ -29,13 +28,13 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
index f083bd15a..e1eda8a4b 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -34,6 +34,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -56,7 +57,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -72,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">
@@ -133,7 +134,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>
@@ -146,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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -157,7 +158,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>
@@ -173,7 +174,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -340,6 +341,7 @@
   <node concept="sE7Ow" id="2w5Gq4UtlOH">
     <property role="TrG5h" value="SerializeDoc2Word" />
     <property role="2uzpH1" value="Serialize Doc to Word" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="2w5Gq4Utm4H" role="1NuT2Z">
       <property role="TrG5h" value="document" />
       <node concept="3Tm6S6" id="2w5Gq4Utm4I" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
index 64775792d..9b404baf3 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -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">
@@ -104,7 +104,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -126,7 +126,7 @@
         <child id="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">
@@ -147,6 +147,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" />
@@ -194,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">
@@ -228,7 +229,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -982,7 +982,7 @@
                               <node concept="2OqwBi" id="4ziKDEnfJIp" role="3clFbG">
                                 <node concept="2OqwBi" id="4ziKDEnfJIq" role="2Oq$k0">
                                   <node concept="37vLTw" id="4ziKDEnfJIr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4ziKDEnfJIu" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36FpC$h" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4ziKDEnfJIs" role="2OqNvi">
                                     <ref role="3Tt5mk" to="2c95:4E$PniRJOs_" resolve="text" />
@@ -994,9 +994,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="4ziKDEnfJIu" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36FpC$h" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="4ziKDEnfJIv" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36FpC$i" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
index bb644b352..a14581339 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
@@ -80,7 +80,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,7 +98,7 @@
       <concept id="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="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -122,7 +122,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/com.fasten.safety.fmea.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/com.fasten.safety.fmea.sandbox.msd
index a7755be99..394deb576 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/com.fasten.safety.fmea.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/com.fasten.safety.fmea.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.fmea.sandbox" uuid="000592db-6c17-494c-8195-a1023a2581a9" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.fmea.sandbox" uuid="000592db-6c17-494c-8195-a1023a2581a9" moduleVersion="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:b43c548b-f75f-46e2-ad24-de9edd93e95e:com.fasten.safety.fmea" version="0" />
     <language slang="l:dc773f77-cced-42c8-ba62-465140b810a5:com.fasten.safety.fmea.iso26262" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._010_smoke_dfmea.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._010_smoke_dfmea.mps
index a9c7c81a5..7ce9eac45 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._010_smoke_dfmea.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._010_smoke_dfmea.mps
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
index 9fb7d5fda..a02ef141f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd
index 375271f67..bc1c6370a 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.ft.pluginSolution" uuid="4dc47fba-0f4f-4162-820b-d2e1e306482d" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.fasten.safety.ft.pluginSolution" uuid="4dc47fba-0f4f-4162-820b-d2e1e306482d" moduleVersion="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">945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)</dependency>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/models/com.fasten.safety.ft.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/models/com.fasten.safety.ft.pluginSolution.plugin.mps
index 97e6a404f..85213ee9e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/models/com.fasten.safety.ft.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/models/com.fasten.safety.ft.pluginSolution.plugin.mps
@@ -25,7 +25,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd
index fdd904948..677bacd60 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.ft.sandbox" uuid="d1ec7b56-7ba6-4e2d-b536-3487502426c7" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.ft.sandbox" uuid="d1ec7b56-7ba6-4e2d-b536-3487502426c7" moduleVersion="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:ab274f70-5238-4883-adc7-02df7a757829:com.fasten.safety.ft" version="1" />
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
index 05edc2543..a6d739291 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
@@ -50,7 +50,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke_xfta.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke_xfta.mps
index d38598dde..61a62f352 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke_xfta.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke_xfta.mps
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
index 871503bc7..ab994e147 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.ft.xfta.pluginSolution" uuid="54912f5b-43b5-48a6-b710-8bbe3bcf9649" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.fasten.safety.ft.xfta.pluginSolution" uuid="54912f5b-43b5-48a6-b710-8bbe3bcf9649" moduleVersion="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">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -35,9 +34,9 @@
     <language slang="l:73c1a490-99fa-4d0d-8292-b8985697c74b:jetbrains.mps.execution.common" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l: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:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.genplan.mps
index 39e2eae63..dab9345de 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.genplan.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.genplan.mps
@@ -2,7 +2,7 @@
 <model ref="r:b4fa8dc5-5b96-46cc-9566-2009f7d35f9f(com.fasten.safety.ft.xfta.pluginSolution.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 />
   <registry>
@@ -10,11 +10,14 @@
       <concept id="3705377275350227759" name="jetbrains.mps.lang.generator.plan.structure.IncludePlan" flags="ng" index="NozSJ">
         <reference id="3705377275350227762" name="plan" index="NozSM" />
       </concept>
+      <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>
       <concept id="8296877263936070001" name="jetbrains.mps.lang.generator.plan.structure.ApplyGenerators" flags="ng" index="3uMcMo">
         <child id="8296877263936660572" name="generator" index="3uOsAP" />
@@ -34,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>
@@ -56,15 +59,19 @@
   <node concept="2VgMpV" id="75La0fJxByT">
     <property role="TrG5h" value="ignoredLanguages" />
     <node concept="2VgMA2" id="75La0fJxBz0" role="2VgMA7">
-      <node concept="2V$Bhx" id="75La0fJxBz4" role="1t_9vn">
-        <property role="2V$B1T" value="8ca79d43-eb45-4791-bdd4-0d6130ff895b" />
-        <property role="2V$B1Q" value="de.itemis.mps.editor.diagram.layout" />
+      <node concept="2Qf6Nf" id="2hED36FpCvq" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="75La0fJxBz4" role="2Qf6Ng">
+          <property role="2V$B1T" value="8ca79d43-eb45-4791-bdd4-0d6130ff895b" />
+          <property role="2V$B1Q" value="de.itemis.mps.editor.diagram.layout" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="75La0fJybdz" role="2VgMA7">
-      <node concept="2V$Bhx" id="75La0fJybdE" role="1t_9vn">
-        <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
-        <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+      <node concept="2Qf6Nf" id="2hED36FpCvr" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="75La0fJybdE" role="2Qf6Ng">
+          <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
+          <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
index e437e3075..7e85cf153 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
@@ -42,6 +42,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -78,7 +79,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -153,7 +154,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -165,7 +166,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" />
@@ -187,7 +188,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -205,7 +206,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -223,6 +224,7 @@
   <node concept="sE7Ow" id="7YOjUbFptrP">
     <property role="TrG5h" value="AnalyzeFaultTree" />
     <property role="2uzpH1" value="Analyze Fault Tree" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="72xocJVig2G" role="1NuT2Z">
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="72xocJVig2H" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
index 264515daf..11a661874 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.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>
@@ -127,7 +127,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">
@@ -159,7 +159,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
index f0c1ba118..569bc8892 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
@@ -2,7 +2,7 @@
 <model ref="r:290677b7-fc8c-4e0e-97a0-1ad54da16539(com.fasten.safety.ft.xfta.pluginSolution.ui)">
   <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
@@ -25,7 +25,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -93,7 +93,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
       </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="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
@@ -143,7 +143,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
index 252331849..6b4c8ddb1 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.hara.sandbox" uuid="1a3fdba9-d840-4870-b5aa-3104c026cb09" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.hara.sandbox" uuid="1a3fdba9-d840-4870-b5aa-3104c026cb09" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:17da266c-02d9-4bbd-b69b-8a656b49f45c:com.mbeddr.formal.safety.hara" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/models/com.fasten.safety.hara.sandbox.hazards_examples.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/models/com.fasten.safety.hara.sandbox.hazards_examples.mps
index d3cf99f49..befdfbda4 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/models/com.fasten.safety.hara.sandbox.hazards_examples.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/models/com.fasten.safety.hara.sandbox.hazards_examples.mps
@@ -15,16 +15,16 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd
index 1e79f842a..985e3c9ee 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.hazop.sandbox" uuid="f88997db-a96e-4a9b-8e7e-26d879867c92" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.hazop.sandbox" uuid="f88997db-a96e-4a9b-8e7e-26d879867c92" moduleVersion="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:7af989c3-8042-42ae-bf04-8bcfa8f9dbf9:com.fasten.safety.hazop" version="0" />
     <language slang="l:f610e51f-b05d-4ea8-a354-7ee51a81bcbc:com.fasten.safety.hazop.iso26262" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/models/com.fasten.safety.hazop.sandbox._010_hazop_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/models/com.fasten.safety.hazop.sandbox._010_hazop_smoke.mps
index 79c82846c..f897ffcdc 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/models/com.fasten.safety.hazop.sandbox._010_hazop_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/models/com.fasten.safety.hazop.sandbox._010_hazop_smoke.mps
@@ -18,10 +18,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -31,7 +31,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd
index 8a74343e2..c894ee6ec 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.hiphops.sandbox" uuid="f8a7f191-5e22-4df6-94e0-56afdc3dc6e2" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.hiphops.sandbox" uuid="f8a7f191-5e22-4df6-94e0-56afdc3dc6e2" moduleVersion="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:b43c548b-f75f-46e2-ad24-de9edd93e95e:com.fasten.safety.fmea" version="0" />
     <language slang="l:1110e3ef-a98e-444f-9748-1d61fe61c7f7:com.fasten.safety.fmea.arch" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
index 605a0d7dc..aceb7fef0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
@@ -112,7 +112,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
index 1c2351478..66443c223 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.rcp.pluginSolution" uuid="e541ff24-7ed7-40cb-a90e-8b708f547925" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.fasten.safety.rcp.pluginSolution" uuid="e541ff24-7ed7-40cb-a90e-8b708f547925" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
@@ -23,13 +22,13 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
index a99c23367..3329f7b50 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="1f1b4a81-113d-4b88-9b67-2bae3e4f8128" name="com.mbeddr.mpsutil.projectview" 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="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -154,7 +154,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>
@@ -170,7 +170,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -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>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
index 7344fa973..7a017e19d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.argument.modelquery.genplan" uuid="28c9d1d8-7af8-472d-8679-9b314648c201" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.argument.modelquery.genplan" uuid="28c9d1d8-7af8-472d-8679-9b314648c201" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,16 +10,15 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">43d5f6b1-f45e-44e8-8beb-2ef9aabefcbc(com.mbeddr.formal.safety.argument.modelquery.generator)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps
index 49e06ad97..53292bae6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.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="oss0" ref="r:3eeee193-9a86-4738-92ea-2f088663b913(com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator)" />
@@ -13,11 +13,14 @@
       <concept id="3705377275350227759" name="jetbrains.mps.lang.generator.plan.structure.IncludePlan" flags="ng" index="NozSJ">
         <reference id="3705377275350227762" name="plan" index="NozSM" />
       </concept>
+      <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>
       <concept id="8296877263936070001" name="jetbrains.mps.lang.generator.plan.structure.ApplyGenerators" flags="ng" index="3uMcMo">
         <child id="8296877263936660572" name="generator" index="3uOsAP" />
@@ -37,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -59,15 +62,19 @@
   <node concept="2VgMpV" id="75La0fJxByT">
     <property role="TrG5h" value="ignoredLanguages" />
     <node concept="2VgMA2" id="75La0fJxBz0" role="2VgMA7">
-      <node concept="2V$Bhx" id="75La0fJxBz4" role="1t_9vn">
-        <property role="2V$B1T" value="8ca79d43-eb45-4791-bdd4-0d6130ff895b" />
-        <property role="2V$B1Q" value="de.itemis.mps.editor.diagram.layout" />
+      <node concept="2Qf6Nf" id="2hED36FpCvs" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="75La0fJxBz4" role="2Qf6Ng">
+          <property role="2V$B1T" value="8ca79d43-eb45-4791-bdd4-0d6130ff895b" />
+          <property role="2V$B1Q" value="de.itemis.mps.editor.diagram.layout" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="75La0fJybdz" role="2VgMA7">
-      <node concept="2V$Bhx" id="75La0fJybdE" role="1t_9vn">
-        <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
-        <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+      <node concept="2Qf6Nf" id="2hED36FpCvt" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="75La0fJybdE" role="2Qf6Ng">
+          <property role="2V$B1T" value="92d2ea16-5a42-4fdf-a676-c7604efe3504" />
+          <property role="2V$B1Q" value="de.slisson.mps.richtext" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
index 583fcb9c1..769e9a0eb 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.argument.process.sandbox" uuid="eff87b86-68b7-40e7-aaaf-a3ef396b574c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.argument.process.sandbox" uuid="eff87b86-68b7-40e7-aaaf-a3ef396b574c" moduleVersion="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">b1743c9b-5a13-4d6d-9530-c307d7257206(com.mbeddr.formal.safety.stamp.sandbox)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
index a362fa91c..f2676945e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
@@ -46,7 +46,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
         <child id="1574221925581136309" name="description" index="UfucP" />
       </concept>
@@ -69,7 +69,7 @@
       <concept id="1639692281461243242" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.RoleDefinition" flags="ng" index="1vGMor" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
index abf07bd69..fbae0e90e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.argument.runtime.pluginSolution" uuid="81f324e1-38b1-44b1-85d2-19432dece3f6" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.argument.runtime.pluginSolution" uuid="81f324e1-38b1-44b1-85d2-19432dece3f6" moduleVersion="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">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
@@ -29,14 +28,14 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
index f39d852f9..02f357116 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
@@ -5,9 +5,9 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
@@ -37,6 +37,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -72,7 +73,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -145,14 +146,14 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -161,7 +162,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -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>
@@ -288,6 +289,7 @@
   <node concept="sE7Ow" id="7YOjUbFptrP">
     <property role="TrG5h" value="RuntimeAssuranceAction" />
     <property role="2uzpH1" value="Analyze Collected Runtime Data" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="72xocJVig2G" role="1NuT2Z">
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="72xocJVig2H" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.raw_runtime.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.raw_runtime.mps
index 707f59547..3a600a3f2 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.raw_runtime.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.raw_runtime.mps
@@ -74,7 +74,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -94,7 +94,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">
@@ -110,7 +110,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
index 17b0d39a7..235739b0e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
@@ -2,7 +2,7 @@
 <model ref="r:2766fc43-ebcb-436c-b5da-cd6cc6a3928e(com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui)">
   <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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
@@ -58,14 +58,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="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils.mps
index 9e3e9cf9a..eec3f2ad8 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils.mps
@@ -60,7 +60,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -71,7 +71,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" />
@@ -87,7 +87,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/com.mbeddr.formal.safety.argument.runtime.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/com.mbeddr.formal.safety.argument.runtime.sandbox.msd
index 1db1b2b23..c425687d9 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/com.mbeddr.formal.safety.argument.runtime.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/com.mbeddr.formal.safety.argument.runtime.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.argument.runtime.sandbox" uuid="ecb29e12-e3b9-4c60-b4ab-ffb1ba4095d5" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.argument.runtime.sandbox" uuid="ecb29e12-e3b9-4c60-b4ab-ffb1ba4095d5" moduleVersion="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:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/models/com.mbeddr.formal.safety.argument.runtime.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/models/com.mbeddr.formal.safety.argument.runtime.sandbox._010_smoke.mps
index 71b112abc..859c8c0d6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/models/com.mbeddr.formal.safety.argument.runtime.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/models/com.mbeddr.formal.safety.argument.runtime.sandbox._010_smoke.mps
@@ -30,7 +30,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd
index 434482197..4b94cb3f2 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.build" uuid="b4bbc0a5-248e-4db2-9ddc-4901a463c66c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.build" uuid="b4bbc0a5-248e-4db2-9ddc-4901a463c66c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index b554185f0..0b342df94 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -20,9 +20,7 @@
       <concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
         <reference id="4560297596904469363" name="module" index="22LTRN" />
       </concept>
-      <concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
-        <child id="3609768169816292377" name="jvmArgs" index="1psgkv" />
-      </concept>
+      <concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
       <concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
     </language>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -103,7 +101,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">
@@ -146,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="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -199,7 +197,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>
@@ -1022,7 +1019,6 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.lib" />
         <property role="3LESm3" value="71bb25aa-20fa-4c18-8954-1b176576f52d" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="7he_lUumABD" role="3LF7KH">
           <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
           <node concept="2Ry0Ak" id="7he_lUumABE" role="iGT6I">
@@ -7137,7 +7133,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66hf" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66hg" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-tree-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-tree-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -7156,7 +7152,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66hu" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66hv" role="2Ry0An">
-                      <property role="2Ry0Am" value="parboiled-java-1.3.0.jar" />
+                      <property role="2Ry0Am" value="parboiled-java-1.4.1.jar" />
                     </node>
                   </node>
                 </node>
@@ -7175,7 +7171,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66hH" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66hI" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -7194,7 +7190,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66hW" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66hX" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-analysis-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-analysis-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -7213,7 +7209,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66ib" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66ic" role="2Ry0An">
-                      <property role="2Ry0Am" value="asm-util-7.0.jar" />
+                      <property role="2Ry0Am" value="asm-util-9.2.jar" />
                     </node>
                   </node>
                 </node>
@@ -7232,7 +7228,7 @@
                   <node concept="2Ry0Ak" id="3mI4G9o66iq" role="2Ry0An">
                     <property role="2Ry0Am" value="lib" />
                     <node concept="2Ry0Ak" id="3mI4G9o66ir" role="2Ry0An">
-                      <property role="2Ry0Am" value="parboiled-core-1.3.0.jar" />
+                      <property role="2Ry0Am" value="parboiled-core-1.4.1.jar" />
                     </node>
                   </node>
                 </node>
@@ -12852,11 +12848,6 @@
           <ref role="3bR37D" to="90a9:PE3B26VOkn" resolve="de.itemis.mps.extensions.build" />
         </node>
       </node>
-      <node concept="1SiIV0" id="gYMUULBChG" role="3bR37C">
-        <node concept="3bR9La" id="gYMUULBChH" role="1SiIV1">
-          <ref role="3bR37D" node="5Xjjs0Nf2r4" resolve="com.mbeddr.formal.safety.build" />
-        </node>
-      </node>
       <node concept="1SiIV0" id="gYMUULBChI" role="3bR37C">
         <node concept="3bR9La" id="gYMUULBChJ" role="1SiIV1">
           <ref role="3bR37D" to="ffeo:78GwwOvB3tw" resolve="jetbrains.mps.ide.build" />
@@ -16040,6 +16031,7 @@
       <node concept="22LTRM" id="6ucyvMUDFj$" role="22LTRK">
         <ref role="22LTRN" node="6ucyvMUDFfZ" resolve="test.fasten.safety.hiphops" />
       </node>
+      <node concept="24cAiW" id="6ucyvMUDFeV" role="24cAkG" />
       <node concept="22LTRM" id="6ucyvMUMpYk" role="22LTRK">
         <ref role="22LTRN" node="6ucyvMUMpPI" resolve="test.mbeddr.formal.gsn" />
       </node>
@@ -16058,9 +16050,6 @@
       <node concept="22LTRM" id="y1G8y6b21U" role="22LTRK">
         <ref role="22LTRN" node="y1G8y6aWtw" resolve="test.mbeddr.formal.safety.argument.modelquery" />
       </node>
-      <node concept="24cAiW" id="6ucyvMUDFeV" role="24cAkG">
-        <node concept="NbPM2" id="1tYE378U5fR" role="1psgkv" />
-      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/com.mbeddr.formal.safety.cae.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/com.mbeddr.formal.safety.cae.sandbox.msd
index bcf417de1..63f02895e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/com.mbeddr.formal.safety.cae.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/com.mbeddr.formal.safety.cae.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.cae.sandbox" uuid="2411f636-a706-4302-a233-da8d88fac1c3" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.cae.sandbox" uuid="2411f636-a706-4302-a233-da8d88fac1c3" moduleVersion="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:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:6d475058-7ea2-490d-87e7-0f7f46dccc66:com.fasten.process.review" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._010_smoke.mps
index 6914a797a..734a71269 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._010_smoke.mps
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -45,7 +45,7 @@
       <concept id="2210355370893864968" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.URLEvidenceDocument" flags="ng" index="2Fbr9R">
         <property id="2210355370893864971" name="url" index="2Fbr9O" />
       </concept>
-      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ng" index="2Fbr9U">
+      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ngI" index="2Fbr9U">
         <child id="2210355370893974680" name="explanation" index="2FbXVB" />
       </concept>
       <concept id="4043927170651692617" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.ExternalEvidenceDocument" flags="ng" index="K87gv">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._020_argument_reuse.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._020_argument_reuse.mps
index 28e8a1942..a7eb9efa3 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._020_argument_reuse.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/models/com.mbeddr.formal.safety.cae.sandbox._020_argument_reuse.mps
@@ -11,7 +11,7 @@
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
       <concept id="9296093157844054" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryDefinition" flags="ng" index="1qmubD" />
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
       <concept id="1629165016568013909" name="com.mbeddr.formal.safety.gsn.ext.structure.PatternInstance" flags="ng" index="1VB52A">
@@ -43,7 +43,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
index 132b71bdc..9597c9fb3 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.cbd.pluginSolution" uuid="6eae6fbd-9940-4c94-855c-110c062b01e3" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.cbd.pluginSolution" uuid="6eae6fbd-9940-4c94-855c-110c062b01e3" moduleVersion="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">f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</dependency>
     <dependency reexport="false">692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)</dependency>
@@ -31,12 +30,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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
index f7e3ea9ed..31b3cb286 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
@@ -39,7 +39,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -109,7 +109,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
@@ -146,6 +146,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" />
@@ -182,7 +183,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +221,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
@@ -460,7 +460,7 @@
                           <node concept="3clFbF" id="3jaLROLvLcN" role="3cqZAp">
                             <node concept="2OqwBi" id="3jaLROLvLve" role="3clFbG">
                               <node concept="37vLTw" id="3jaLROLvLcM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3jaLROLvKSN" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36FpC$j" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3jaLROLvLZ1" role="2OqNvi">
                                 <ref role="37wK5l" to="4c75:7mSH3Wn4cMX" resolve="isSuccess" />
@@ -468,9 +468,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="3jaLROLvKSN" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$j" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="3jaLROLvKSO" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$k" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -751,7 +751,7 @@
                                   <node concept="2OqwBi" id="33qt4wr57ES" role="3uHU7B">
                                     <node concept="2OqwBi" id="33qt4wr57ET" role="2Oq$k0">
                                       <node concept="37vLTw" id="33qt4wr57EU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="33qt4wr57EX" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36FpC$l" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="33qt4wr57EV" role="2OqNvi">
                                         <ref role="3Tt5mk" to="vzqj:2l5A0OF7cx9" resolve="interfaceRef" />
@@ -764,9 +764,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="33qt4wr57EX" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36FpC$l" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="33qt4wr57EY" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36FpC$m" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
index 5678e0f7e..016b4f2b5 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:7103636c-5ad0-4a4a-8dbd-b914f38aa101(com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -36,6 +36,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
@@ -60,7 +61,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -105,7 +106,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -117,7 +118,7 @@
         <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" />
@@ -125,7 +126,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>
@@ -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>
@@ -173,6 +174,7 @@
   <node concept="sE7Ow" id="72xocJVibUN">
     <property role="TrG5h" value="CheckCBDBasedStrategy" />
     <property role="2uzpH1" value="Check Strategy" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="72xocJVig2G" role="1NuT2Z">
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="72xocJVig2H" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/com.mbeddr.formal.safety.gsn.patterns.lib.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/com.mbeddr.formal.safety.gsn.patterns.lib.msd
index fef98b68e..809ba069e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/com.mbeddr.formal.safety.gsn.patterns.lib.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/com.mbeddr.formal.safety.gsn.patterns.lib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.patterns.lib" uuid="676b5323-9c6d-4b8d-a4fc-5d159c3d8aed" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.patterns.lib" uuid="676b5323-9c6d-4b8d-a4fc-5d159c3d8aed" moduleVersion="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:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:6d475058-7ea2-490d-87e7-0f7f46dccc66:com.fasten.process.review" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
index 7b3b74ac6..a81fadc68 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
@@ -14,7 +14,7 @@
   <registry>
     <language id="6464626a-ab04-4051-908e-5e8dc75acd78" name="com.mbeddr.formal.safety.gsn.ext">
       <concept id="2392944874759792240" name="com.mbeddr.formal.safety.gsn.ext.structure.SupportedByConnectionPattern" flags="ng" index="1a4Pjv" />
-      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ng" index="1a7XsH">
+      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ngI" index="1a7XsH">
         <property id="2392944874759792243" name="max" index="1a4Pjs" />
         <property id="2392944874759792241" name="min" index="1a4Pju" />
       </concept>
@@ -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/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/com.mbeddr.formal.safety.gsn.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/com.mbeddr.formal.safety.gsn.pluginSolution.msd
index abc080e2e..45d5d2b9d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/com.mbeddr.formal.safety.gsn.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/com.mbeddr.formal.safety.gsn.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.pluginSolution" uuid="51fb6274-410b-4585-802e-ffc783ce3996" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.pluginSolution" uuid="51fb6274-410b-4585-802e-ffc783ce3996" moduleVersion="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">945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/models/com.mbeddr.formal.safety.gsn.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/models/com.mbeddr.formal.safety.gsn.pluginSolution.plugin.mps
index 98ca05488..94a0f5dd8 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/models/com.mbeddr.formal.safety.gsn.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/models/com.mbeddr.formal.safety.gsn.pluginSolution.plugin.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/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
index 7b6fe6758..19721f995 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.sandbox" uuid="4405c79a-2cec-40b3-b09e-a2a5fd99a7f6" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.sandbox" uuid="4405c79a-2cec-40b3-b09e-a2a5fd99a7f6" moduleVersion="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">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -72,7 +71,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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
index be1c29817..a9226701d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
@@ -29,7 +29,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>
@@ -66,11 +66,11 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
         <property id="3731513482755309878" name="idPrefix" index="3dZJUb" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
index d55a1a749..54b312c88 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
@@ -20,7 +20,7 @@
         <reference id="5879905612006349279" name="elem" index="lVOrv" />
       </concept>
       <concept id="2392944874759792240" name="com.mbeddr.formal.safety.gsn.ext.structure.SupportedByConnectionPattern" flags="ng" index="1a4Pjv" />
-      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ng" index="1a7XsH">
+      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ngI" index="1a7XsH">
         <property id="2392944874759792243" name="max" index="1a4Pjs" />
         <property id="2392944874759792241" name="min" index="1a4Pju" />
       </concept>
@@ -28,7 +28,7 @@
       <concept id="8790599356044273577" name="com.mbeddr.formal.safety.gsn.ext.structure.OrEntity" flags="ng" index="1idpKz" />
       <concept id="9296093157844055" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryGoalRef" flags="ng" index="1qmubC" />
       <concept id="9296093157844054" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryDefinition" flags="ng" index="1qmubD" />
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
       <concept id="1629165016568013909" name="com.mbeddr.formal.safety.gsn.ext.structure.PatternInstance" flags="ng" index="1VB52A">
@@ -49,10 +49,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -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>
@@ -74,7 +74,7 @@
       <concept id="2210355370893864968" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.URLEvidenceDocument" flags="ng" index="2Fbr9R">
         <property id="2210355370893864971" name="url" index="2Fbr9O" />
       </concept>
-      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ng" index="2Fbr9U">
+      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ngI" index="2Fbr9U">
         <child id="2210355370893974680" name="explanation" index="2FbXVB" />
       </concept>
     </language>
@@ -122,17 +122,17 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
         <property id="3731513482755309878" name="idPrefix" index="3dZJUb" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._030_gsn_external_evidence.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._030_gsn_external_evidence.mps
index 35cdbb75b..1a254f3a6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._030_gsn_external_evidence.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._030_gsn_external_evidence.mps
@@ -26,7 +26,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -34,7 +34,7 @@
       <concept id="2210355370893864968" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.URLEvidenceDocument" flags="ng" index="2Fbr9R">
         <property id="2210355370893864971" name="url" index="2Fbr9O" />
       </concept>
-      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ng" index="2Fbr9U">
+      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ngI" index="2Fbr9U">
         <child id="2210355370893974680" name="explanation" index="2FbXVB" />
       </concept>
       <concept id="4043927170651692617" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.ExternalEvidenceDocument" flags="ng" index="K87gv">
@@ -85,7 +85,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140922055" name="dateLong" index="1_P5yc" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._100_gsn_and_reqs.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._100_gsn_and_reqs.mps
index b3d81a210..606ca251a 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._100_gsn_and_reqs.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._100_gsn_and_reqs.mps
@@ -155,7 +155,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -233,7 +233,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
index 8edeaeac3..682c784c7 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
@@ -97,10 +97,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -117,7 +117,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>
@@ -154,7 +154,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
index b8d63dfe1..a6f478c33 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
@@ -46,7 +46,7 @@
       <concept id="5285453794051997733" name="com.mbeddr.formal.spin.structure.PromelaModel" flags="ng" index="2mr7gt">
         <child id="5285453794051997738" name="content" index="2mr7gi" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -193,7 +193,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._400_gsn_confidence_dempster_schafer.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._400_gsn_confidence_dempster_schafer.mps
index 180e3e54f..589d9f7ab 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._400_gsn_confidence_dempster_schafer.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._400_gsn_confidence_dempster_schafer.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>
@@ -75,11 +75,11 @@
       <concept id="79421622115107638" name="com.mbeddr.formal.safety.gsn.smv.structure.SmvResultsSolution" flags="ng" index="1$GyEX" />
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
         <property id="3731513482755309878" name="idPrefix" index="3dZJUb" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._410_gsn_confidence_acp.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._410_gsn_confidence_acp.mps
index c49b9c46a..312ad2fec 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._410_gsn_confidence_acp.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._410_gsn_confidence_acp.mps
@@ -33,7 +33,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
index 1b335bce2..de440d590 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
@@ -33,7 +33,7 @@
       <concept id="5785245534400277706" name="com.mbeddr.doc.structure.TextBlockTableCell" flags="ng" index="C7FVz">
         <child id="5785245534400277707" name="text" index="C7FVy" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -83,7 +83,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -129,7 +129,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._510_gsn_process.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._510_gsn_process.mps
index 6e594af08..d4ffefd31 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._510_gsn_process.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._510_gsn_process.mps
@@ -21,7 +21,7 @@
       <concept id="3731513482756195661" name="com.mbeddr.formal.safety.argument.process.structure.Standard" flags="ng" index="3dyRFK">
         <child id="3731513482756244090" name="clauses" index="3dzbR7" />
       </concept>
-      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ng" index="3dyRFN">
+      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ngI" index="3dyRFN">
         <property id="3731513482756243948" name="publicationYear" index="3dzbTh" />
         <property id="3731513482756243946" name="longTitle" index="3dzbTn" />
       </concept>
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -83,13 +83,13 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
index 015d382b7..5d64d089c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
@@ -71,7 +71,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -105,10 +105,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -158,7 +158,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
index 33e156b2f..20a0d6dac 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.smv.pluginSolution" uuid="7deddb2c-6152-400d-b886-3520afdc89b1" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.smv.pluginSolution" uuid="7deddb2c-6152-400d-b886-3520afdc89b1" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
@@ -32,12 +31,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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
index 25d98f1c9..a194cb953 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
@@ -44,7 +44,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -126,7 +126,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -221,7 +221,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
index 089f305a5..4ebaffd6d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
@@ -2,13 +2,13 @@
 <model ref="r:2f83b5ad-2ce0-4f90-b7aa-45fc12b36f39(com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
@@ -53,6 +53,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" />
@@ -78,7 +79,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -96,7 +97,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -171,7 +172,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>
@@ -187,7 +188,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,6 +204,7 @@
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -210,7 +212,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>
@@ -250,7 +252,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -262,7 +264,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
   </registry>
@@ -284,6 +285,7 @@
   <node concept="sE7Ow" id="6NmtaR23THu">
     <property role="TrG5h" value="RunNUSMVOnSmvSpecGoal" />
     <property role="2uzpH1" value="Check Goal with NuSMV" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6NmtaR23THv" role="tncku">
       <node concept="3clFbS" id="6NmtaR23THw" role="2VODD2">
         <node concept="3cpWs8" id="CmOUmcdfCH" role="3cqZAp">
@@ -431,7 +433,7 @@
                   <node concept="3clFbF" id="6xNJt7lKWd8" role="3cqZAp">
                     <node concept="2OqwBi" id="6xNJt7lKZv2" role="3clFbG">
                       <node concept="37vLTw" id="6xNJt7lKZ6o" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6xNJt7lKVUw" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36FpC$n" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6xNJt7lL0Am" role="2OqNvi">
                         <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
@@ -439,9 +441,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6xNJt7lKVUw" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpC$n" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6xNJt7lKVUx" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpC$o" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -948,6 +950,7 @@
   <node concept="sE7Ow" id="4qaoH_RDdo">
     <property role="TrG5h" value="RunNUSMVOnSmvTestsGoal" />
     <property role="2uzpH1" value="Check Goal with NuSMV" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4qaoH_RDdp" role="tncku">
       <node concept="3clFbS" id="4qaoH_RDdq" role="2VODD2">
         <node concept="3cpWs8" id="CmOUmcd_2S" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
index 31e4aa5ba..60be5190f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.spin.pluginSolution" uuid="6341c6a5-9840-4a80-b3ed-d5236d1e80de" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.spin.pluginSolution" uuid="6341c6a5-9840-4a80-b3ed-d5236d1e80de" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -25,11 +24,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
index 744673e62..dd3c4f788 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.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="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" 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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
@@ -34,6 +34,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -57,7 +58,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -124,7 +125,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -135,7 +136,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" />
@@ -146,7 +147,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>
@@ -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>
@@ -268,6 +269,7 @@
   <node concept="sE7Ow" id="6NmtaR23THu">
     <property role="TrG5h" value="RunSpinOnODDFormalContext" />
     <property role="2uzpH1" value="Check Context with Spin" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6NmtaR23THv" role="tncku">
       <node concept="3clFbS" id="6NmtaR23THw" role="2VODD2">
         <node concept="3cpWs8" id="6HIPWY0cDZq" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
index 80d79798a..868e1ce13 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.web.rt" uuid="f762e964-9110-40bd-ac0a-9fbf8a051755" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.web.rt" uuid="f762e964-9110-40bd-ac0a-9fbf8a051755" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
@@ -30,22 +29,23 @@
     <dependency reexport="false">31b0df10-2d1f-4744-8de7-461666d7c2d1(com.mbeddr.formal.safety.gsn.web#01)</dependency>
     <dependency reexport="false">7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)</dependency>
     <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
+    <dependency reexport="false">f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" 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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
     <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-    <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: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" />
@@ -82,6 +82,7 @@
     <module reference="339c3a3d-4c7f-4727-bc4f-f1abb19286a3(jetbrains.mps.ide.httpsupport.nodeaccess)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan)" version="0" />
+    <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.genutil.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.genutil.mps
index 824912cb3..f5934afe0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.genutil.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.genutil.mps
@@ -20,7 +20,6 @@
     <import index="i30" ref="r:ab837574-aa54-4b18-9762-b783ef089263(jetbrains.mps.generator.impl)" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
@@ -29,6 +28,7 @@
     <import index="tft2" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator.impl.plan(MPS.Generator/)" />
     <import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
     <import index="ao3" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text(MPS.TextGen/)" />
+    <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -47,7 +47,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">
@@ -126,7 +126,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -205,7 +205,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -281,10 +281,10 @@
                 <node concept="37vLTI" id="2vFU1cKu5H3" role="3clFbG">
                   <node concept="2ShNRf" id="2vFU1cKu5KW" role="37vLTx">
                     <node concept="1pGfFk" id="2vFU1cKugV0" role="2ShVmc">
-                      <ref role="37wK5l" to="et5u:~LogHandler.&lt;init&gt;(org.apache.log4j.Logger)" resolve="LogHandler" />
+                      <ref role="37wK5l" to="et5u:~LogHandler.&lt;init&gt;(jetbrains.mps.logging.Logger)" resolve="LogHandler" />
                       <node concept="2YIFZM" id="2vFU1cKuhmY" role="37wK5m">
-                        <ref role="1Pybhc" to="q7tw:~Logger" resolve="Logger" />
-                        <ref role="37wK5l" to="q7tw:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
+                        <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+                        <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
                         <node concept="3VsKOn" id="2vFU1cKuhu7" role="37wK5m">
                           <ref role="3VsUkX" node="2vFU1cKulFm" resolve="CustomMessageHandler" />
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
index b99fa2ae1..5cfc190c3 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
@@ -2,7 +2,7 @@
 <model ref="r:b79595f7-8350-4c32-8b59-20629b485a08(com.mbeddr.formal.safety.gsn.web.rt.gsn_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="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
@@ -10,11 +10,14 @@
   </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="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen">
@@ -27,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>
@@ -35,10 +38,12 @@
   <node concept="2VgMpV" id="kPkqqqMHTt">
     <property role="TrG5h" value="generateGSNGenplan" />
     <node concept="2Pg1uL" id="kPkqqqMW0U" role="2VgMA7">
-      <node concept="2Pgd6e" id="kPkqqqMW0V" role="1t_9vn" />
       <node concept="3Vl8EG" id="kPkqqqMW0W" role="3VlUeB">
         <ref role="3Vl8EH" to="hbry:5pJnDA9aQRy" resolve="gsn2html_main" />
       </node>
+      <node concept="2Qf6Nf" id="2hED36FpCvu" role="2Qf7GQ">
+        <node concept="2Pgd6e" id="kPkqqqMW0V" role="2Qf6Ng" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
index b7a295d79..9daaa7475 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
@@ -3,14 +3,14 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="289fcc83-6543-41e8-a5ca-768235715ce4" name="jetbrains.mps.lang.generator.generationParameters" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="817e4e70-961e-4a95-98a1-15e9f32231f1" name="jetbrains.mps.ide.httpsupport" 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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -49,6 +49,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
@@ -70,7 +71,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -170,7 +171,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>
@@ -196,7 +197,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">
@@ -225,6 +226,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 +234,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -311,7 +313,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -339,7 +341,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -970,6 +971,7 @@
   <node concept="sE7Ow" id="5pJnDA9eKhW">
     <property role="TrG5h" value="OpenDiagramInBrowser" />
     <property role="2uzpH1" value="Open Argument in Browser" />
+    <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="5pJnDA9eKhX" role="tncku">
       <node concept="3clFbS" id="5pJnDA9eKhY" role="2VODD2">
         <node concept="3clFbF" id="5pJnDA9fcoU" role="3cqZAp">
@@ -1143,7 +1145,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9inXQ" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9inGW" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9imJg" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5pJnDA9imBb" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpC$p" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9io9L" role="2OqNvi">
@@ -1163,9 +1165,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5pJnDA9imBb" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$p" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5pJnDA9imBc" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$q" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1687,7 +1689,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9kC5x" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9kC5y" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9kC5z" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5pJnDA9kC5C" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpC$r" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9kC5$" role="2OqNvi">
@@ -1707,9 +1709,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5pJnDA9kC5C" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$r" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5pJnDA9kC5D" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$s" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1747,7 +1749,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9kCtf" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9kCtg" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9kCth" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5pJnDA9kCtm" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpC$t" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9kCti" role="2OqNvi">
@@ -1767,9 +1769,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5pJnDA9kCtm" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$t" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5pJnDA9kCtn" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$u" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1968,7 +1970,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9ln21" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9ln22" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9ln23" role="2JrQYb">
-                                      <ref role="3cqZAo" node="5pJnDA9ln28" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpC$v" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9ln24" role="2OqNvi">
@@ -1988,9 +1990,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5pJnDA9ln28" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$v" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5pJnDA9ln29" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$w" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -2138,7 +2140,7 @@
                                 <node concept="2OqwBi" id="2SMJEPn9Tq5" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="2SMJEPn9Tq6" role="2Oq$k0">
                                     <node concept="37vLTw" id="2SMJEPn9Tq7" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2SMJEPn9Tqc" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36FpC$x" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="2SMJEPn9Tq8" role="2OqNvi">
@@ -2158,9 +2160,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="2SMJEPn9Tqc" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$x" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2SMJEPn9Tqd" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$y" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/com.mbeddr.formal.safety.gsn.web.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/com.mbeddr.formal.safety.gsn.web.sandbox.msd
index e6e65e117..eef871f59 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/com.mbeddr.formal.safety.gsn.web.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/com.mbeddr.formal.safety.gsn.web.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.gsn.web.sandbox" uuid="9781f05b-f21a-4f29-9db4-a44a95ba0f2b" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.gsn.web.sandbox" uuid="9781f05b-f21a-4f29-9db4-a44a95ba0f2b" moduleVersion="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:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/models/com.mbeddr.formal.safety.gsn.web.sandbox._010_simple_arguments.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/models/com.mbeddr.formal.safety.gsn.web.sandbox._010_simple_arguments.mps
index 72e08133f..def3729c1 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/models/com.mbeddr.formal.safety.gsn.web.sandbox._010_simple_arguments.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/models/com.mbeddr.formal.safety.gsn.web.sandbox._010_simple_arguments.mps
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
index c9408a198..aee53e824 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.stamp.pluginSolution" uuid="29225a93-74b7-4dc0-b3c5-36b7e42fa0f0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.stamp.pluginSolution" uuid="29225a93-74b7-4dc0-b3c5-36b7e42fa0f0" moduleVersion="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">945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)</dependency>
     <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
@@ -21,7 +20,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/models/com.mbeddr.formal.safety.stamp.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/models/com.mbeddr.formal.safety.stamp.pluginSolution.plugin.mps
index 6a2c57112..3881f742b 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/models/com.mbeddr.formal.safety.stamp.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/models/com.mbeddr.formal.safety.stamp.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:b7b6bd74-059d-44f8-a914-742bcb784075(com.mbeddr.formal.safety.stamp.pluginSolution.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
@@ -25,7 +25,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/com.mbeddr.formal.safety.stamp.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/com.mbeddr.formal.safety.stamp.sandbox.msd
index fd92ff343..7e703106e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/com.mbeddr.formal.safety.stamp.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/com.mbeddr.formal.safety.stamp.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.stamp.sandbox" uuid="b1743c9b-5a13-4d6d-9530-c307d7257206" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.stamp.sandbox" uuid="b1743c9b-5a13-4d6d-9530-c307d7257206" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:e8a04d94-4307-4f88-95a2-25f7c4f39437:com.mbeddr.formal.safety.gsn" version="3" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/_020_stamp_ext_sandbox.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/_020_stamp_ext_sandbox.mps
index cc3e60df5..99d924b58 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/_020_stamp_ext_sandbox.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/_020_stamp_ext_sandbox.mps
@@ -49,7 +49,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/com.mbeddr.formal.safety.stamp.sandbox._010_sandbox.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/com.mbeddr.formal.safety.stamp.sandbox._010_sandbox.mps
index 30747a099..50082287c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/com.mbeddr.formal.safety.stamp.sandbox._010_sandbox.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/models/com.mbeddr.formal.safety.stamp.sandbox._010_sandbox.mps
@@ -80,10 +80,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -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/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
index eaa0ab85a..6db5af13f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
@@ -9,7 +9,7 @@
     <use id="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="0" />
     <use id="546ac349-3106-438d-b92b-7d2ebfa2ade8" name="com.mbeddr.formal.safety.argument.runtime" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
@@ -69,7 +69,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke_testdata.mps b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke_testdata.mps
index 9467206db..9fa6beb43 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke_testdata.mps
@@ -33,7 +33,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
index 40e774e00..eae93232a 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.safety.argument.runtime" uuid="1cdcf8bf-1992-44e7-8edd-65fdea10e4a4" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.safety.argument.runtime" uuid="1cdcf8bf-1992-44e7-8edd-65fdea10e4a4" moduleVersion="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">81f324e1-38b1-44b1-85d2-19432dece3f6(com.mbeddr.formal.safety.argument.runtime.pluginSolution)</dependency>
     <dependency reexport="false">546ac349-3106-438d-b92b-7d2ebfa2ade8(com.mbeddr.formal.safety.argument.runtime)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_testdata.mps
index 663feae65..1d4c64fe9 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_testdata.mps
@@ -23,7 +23,7 @@
       <concept id="5785245534400277706" name="com.mbeddr.doc.structure.TextBlockTableCell" flags="ng" index="C7FVz">
         <child id="5785245534400277707" name="text" index="C7FVy" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -71,7 +71,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -103,7 +103,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
index c7fef76e7..b9659b01e 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
@@ -148,7 +148,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -164,7 +164,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">
@@ -186,6 +186,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" />
@@ -242,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>
@@ -258,7 +259,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="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -1293,7 +1293,7 @@
                       <node concept="2OqwBi" id="4ziKDEn8xuG" role="3clFbG">
                         <node concept="2OqwBi" id="4ziKDEn8xuH" role="2Oq$k0">
                           <node concept="37vLTw" id="4ziKDEn8xuI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ziKDEn8xuM" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$z" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4ziKDEn8xuJ" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1308,9 +1308,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4ziKDEn8xuM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$z" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ziKDEn8xuN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$$" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
index 49727123a..abeb2b0f6 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="6464626a-ab04-4051-908e-5e8dc75acd78" name="com.mbeddr.formal.safety.gsn.ext">
       <concept id="2392944874759792240" name="com.mbeddr.formal.safety.gsn.ext.structure.SupportedByConnectionPattern" flags="ng" index="1a4Pjv" />
-      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ng" index="1a7XsH">
+      <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ngI" index="1a7XsH">
         <property id="2392944874759792243" name="max" index="1a4Pjs" />
         <property id="2392944874759792241" name="min" index="1a4Pju" />
       </concept>
@@ -28,7 +28,7 @@
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="4317007310193476045" name="com.mbeddr.doc.structure.ScaleDownNotUp100" flags="ng" index="2bctqb" />
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -55,7 +55,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -87,7 +87,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
index 8aed904ed..734099b49 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.fasten.safety.doc2word" uuid="33d1eaee-a08d-42ff-8ccd-0532d513467d" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.fasten.safety.doc2word" uuid="33d1eaee-a08d-42ff-8ccd-0532d513467d" moduleVersion="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">fdd69818-de3d-4ebf-9ec6-17ea152db151(com.mpsbasics.docx4j.core)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -47,7 +46,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft.mps
index 88b7e880e..628b5c5ac 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft.mps
@@ -32,7 +32,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
index c4da0e01f..cb030c2af 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
@@ -68,12 +68,13 @@
       </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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -115,7 +116,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -129,7 +130,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -199,7 +199,7 @@
                         <node concept="2OqwBi" id="2XVAqcw0c37" role="3clFbG">
                           <node concept="2OqwBi" id="2XVAqcw0c38" role="2Oq$k0">
                             <node concept="37vLTw" id="2XVAqcw0c39" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2XVAqcw0c3d" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpC$_" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2XVAqcw0c3a" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -214,9 +214,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="2XVAqcw0c3d" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpC$_" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2XVAqcw0c3e" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpC$A" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -305,7 +305,7 @@
                         <node concept="2OqwBi" id="5sUzoS9G9Gr" role="3clFbG">
                           <node concept="2OqwBi" id="5sUzoS9G9Gs" role="2Oq$k0">
                             <node concept="37vLTw" id="5sUzoS9G9Gt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5sUzoS9G9Gx" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36FpC$B" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="5sUzoS9G9Gu" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -320,9 +320,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5sUzoS9G9Gx" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpC$B" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5sUzoS9G9Gy" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpC$C" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
index 3fce1efea..771dc44d9 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.fasten.safety.ft.xfta" uuid="82b16819-a621-494e-8797-872ebe7f4433" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.fasten.safety.ft.xfta" uuid="82b16819-a621-494e-8797-872ebe7f4433" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._010_checking_rules_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._010_checking_rules_tests@tests.mps
index c0714ba70..d7f4dc80b 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._010_checking_rules_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._010_checking_rules_tests@tests.mps
@@ -21,7 +21,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -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/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
index 8621634b0..320729c52 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
@@ -7,7 +7,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="ab274f70-5238-4883-adc7-02df7a757829" name="com.fasten.safety.ft" version="1" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,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" />
@@ -173,7 +174,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -220,7 +221,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="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" />
@@ -1109,7 +1109,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7lHQ" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7kTF" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7kxC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4dyd$$w7kuc" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$D" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7llx" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1124,9 +1124,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4dyd$$w7kuc" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$D" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4dyd$$w7kud" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$E" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1157,7 +1157,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7rI0" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7rI1" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7rI2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4dyd$$w7rI6" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$F" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7rI3" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1172,9 +1172,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4dyd$$w7rI6" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$F" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4dyd$$w7rI7" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$G" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1205,7 +1205,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7m_M" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7m_N" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7m_O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4dyd$$w7m_S" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$H" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7m_P" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1220,9 +1220,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4dyd$$w7m_S" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$H" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4dyd$$w7m_T" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$I" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -1253,7 +1253,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7sfZ" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7sg0" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7sg1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4dyd$$w7sg5" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$J" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7sg2" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1268,9 +1268,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4dyd$$w7sg5" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$J" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4dyd$$w7sg6" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$K" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._030_modularized_tree_propagation_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._030_modularized_tree_propagation_testdata.mps
index 5a6b45500..b764c7d37 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._030_modularized_tree_propagation_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._030_modularized_tree_propagation_testdata.mps
@@ -27,7 +27,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
index 841fbffe5..571e03689 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.fasten.safety.ft" uuid="6e248481-1e6c-406d-9f02-c27ea5429a61" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.fasten.safety.ft" uuid="6e248481-1e6c-406d-9f02-c27ea5429a61" moduleVersion="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">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -46,7 +45,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/models/test.com.mbeddr.formal.safety.stamp._010_uca_consistency@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/models/test.com.mbeddr.formal.safety.stamp._010_uca_consistency@tests.mps
index 5030250b4..e92a36617 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/models/test.com.mbeddr.formal.safety.stamp._010_uca_consistency@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/models/test.com.mbeddr.formal.safety.stamp._010_uca_consistency@tests.mps
@@ -24,7 +24,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" />
@@ -76,7 +76,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
index 48e901ff2..aa40f1266 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.safety.stamp" uuid="ee83f675-925e-4829-ac73-32c7bec10bfc" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.safety.stamp" uuid="ee83f675-925e-4829-ac73-32c7bec10bfc" moduleVersion="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">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
index b05a09e55..bcae78603 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
@@ -119,7 +119,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
index c141cecc2..2649fcae4 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
@@ -86,7 +86,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,6 +112,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,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>
@@ -192,7 +193,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,7 +236,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="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -382,7 +382,7 @@
                       <node concept="3clFbF" id="3bh1RFvFUac" role="3cqZAp">
                         <node concept="2OqwBi" id="3bh1RFvFUad" role="3clFbG">
                           <node concept="37vLTw" id="3bh1RFvFUae" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3bh1RFvFUag" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$L" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3bh1RFvFUaf" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -390,9 +390,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="3bh1RFvFUag" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36FpC$L" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3bh1RFvFUah" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36FpC$M" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
index 78747ef33..1e15addff 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
@@ -96,7 +96,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>
@@ -105,6 +105,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -139,7 +140,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>
@@ -169,7 +170,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -209,7 +210,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>
@@ -286,7 +286,7 @@
                       <node concept="2OqwBi" id="5g1NREKPZnz" role="3clFbG">
                         <node concept="2OqwBi" id="5g1NREKPZn$" role="2Oq$k0">
                           <node concept="37vLTw" id="5g1NREKPZn_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5g1NREKPZnD" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$N" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5g1NREKPZnA" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -301,9 +301,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5g1NREKPZnD" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$N" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5g1NREKPZnE" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$O" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -460,7 +460,7 @@
                       <node concept="2OqwBi" id="5g1NREKQ5Pp" role="3clFbG">
                         <node concept="2OqwBi" id="5g1NREKQ5Pq" role="2Oq$k0">
                           <node concept="37vLTw" id="5g1NREKQ5Pr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5g1NREKQ5Pv" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$P" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5g1NREKQ5Ps" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -475,9 +475,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5g1NREKQ5Pv" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$P" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5g1NREKQ5Pw" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$Q" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
index 96c889b4a..776ea5b73 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.fasten.safety.hiphops" uuid="555c2c92-d935-4aeb-8601-ca48a9d254b1" moduleVersion="0" compileInMPS="true">
+<solution name="test.fasten.safety.hiphops" uuid="555c2c92-d935-4aeb-8601-ca48a9d254b1" moduleVersion="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">c6d7e8a3-3d80-479a-8799-a11fe1902b1c(com.fasten.safety.hiphops)</dependency>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
@@ -41,7 +40,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._010_requirements_pattern@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._010_requirements_pattern@tests.mps
index 4d0ae8951..ea49319ed 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._010_requirements_pattern@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._010_requirements_pattern@tests.mps
@@ -52,7 +52,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
index 1841f60b9..5ffe5dff6 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
@@ -25,7 +25,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -57,10 +57,10 @@
       <concept id="8278132229936590137" name="com.mbeddr.formal.safety.gsn.patterns.structure.ArgumentOverHazardsStrategy" flags="ng" index="FXfxu" />
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -77,7 +77,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
index df4536cb5..0379b1668 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
@@ -87,7 +87,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,6 +103,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -166,7 +167,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -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="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" />
@@ -2367,7 +2367,7 @@
                     <node concept="2OqwBi" id="6K99IwmrL_R" role="3clFbG">
                       <node concept="2OqwBi" id="6K99IwmrL_S" role="2Oq$k0">
                         <node concept="37vLTw" id="6K99IwmrL_T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6K99IwmrL_X" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36FpC$R" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6K99IwmrL_U" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2382,9 +2382,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6K99IwmrL_X" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36FpC$R" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6K99IwmrL_Y" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36FpC$S" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2444,7 +2444,7 @@
                       <node concept="2OqwBi" id="6K99Iwms4pV" role="3clFbG">
                         <node concept="2OqwBi" id="6K99Iwms4pW" role="2Oq$k0">
                           <node concept="37vLTw" id="6K99Iwms4pX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6K99Iwms4q1" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$T" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6K99Iwms4pY" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2459,9 +2459,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6K99Iwms4q1" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$T" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6K99Iwms4q2" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$U" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout_testdata.mps
index a5855f45f..136a3ed29 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout_testdata.mps
@@ -27,7 +27,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
index 5c88f4466..c7b6443ff 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.gsn.patterns" uuid="7b6c8ca6-a1af-41c8-8f20-5581cca1b013" moduleVersion="0" compileInMPS="true">
+<solution name="test.mbeddr.formal.gsn.patterns" uuid="7b6c8ca6-a1af-41c8-8f20-5581cca1b013" moduleVersion="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">f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</dependency>
     <dependency reexport="false">6464626a-ab04-4051-908e-5e8dc75acd78(com.mbeddr.formal.safety.gsn.ext)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_utility_models.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_utility_models.mps
index e6424566e..9b26e0b05 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_utility_models.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_utility_models.mps
@@ -21,7 +21,7 @@
       <concept id="6447909589225766051" name="com.mbeddr.formal.nusmv.structure.EmptySystemContent" flags="ng" index="2SQmWS" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_testcode.mps
index 69e651ad9..671ea3e56 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_testcode.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_testcode.mps
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -57,7 +57,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
index 7fa8efeef..f932dc886 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
@@ -69,7 +69,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -78,6 +78,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -85,7 +86,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" />
@@ -140,7 +141,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -148,7 +149,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -274,7 +274,7 @@
                       <node concept="2OqwBi" id="2gpUZARgSS_" role="3clFbG">
                         <node concept="2OqwBi" id="2gpUZARgSSA" role="2Oq$k0">
                           <node concept="37vLTw" id="2gpUZARgSSB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2gpUZARgSSF" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36FpC$V" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2gpUZARgSSC" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -289,9 +289,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2gpUZARgSSF" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36FpC$V" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2gpUZARgSSG" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36FpC$W" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_testcode.mps
index 771e7ac60..305a9f158 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_testcode.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_testcode.mps
@@ -117,7 +117,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -197,7 +197,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
index ff699048f..faaecc90a 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
@@ -132,7 +132,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -156,7 +156,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -181,6 +181,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -248,7 +249,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -259,7 +260,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -568,7 +568,7 @@
                             <node concept="2OqwBi" id="6XKrTzkry3F" role="3clFbG">
                               <node concept="2OqwBi" id="6XKrTzkry3G" role="2Oq$k0">
                                 <node concept="37vLTw" id="6XKrTzkry3H" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6XKrTzkry3L" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$X" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6XKrTzkry3I" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -583,9 +583,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6XKrTzkry3L" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$X" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6XKrTzkry3M" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC$Y" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -617,7 +617,7 @@
                             <node concept="2OqwBi" id="6XKrTzkry40" role="3clFbG">
                               <node concept="2OqwBi" id="6XKrTzkry41" role="2Oq$k0">
                                 <node concept="37vLTw" id="6XKrTzkry42" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6XKrTzkry46" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC$Z" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6XKrTzkry43" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -632,9 +632,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6XKrTzkry46" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC$Z" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6XKrTzkry47" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_testcode.mps
index aa0cdb885..6ebc3e25a 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_testcode.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_testcode.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>
@@ -157,7 +157,7 @@
       <concept id="79421622115107638" name="com.mbeddr.formal.safety.gsn.smv.structure.SmvResultsSolution" flags="ng" index="1$GyEX" />
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
@@ -202,7 +202,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
index 23f70134c..38f49e5d4 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
@@ -130,7 +130,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -153,7 +153,7 @@
         <child id="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">
@@ -169,6 +169,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" />
@@ -195,7 +196,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>
@@ -228,7 +229,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -247,7 +248,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="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -423,7 +423,7 @@
                             <node concept="2OqwBi" id="1xpXAu11Hey" role="3clFbG">
                               <node concept="2OqwBi" id="1xpXAu11HeA" role="2Oq$k0">
                                 <node concept="37vLTw" id="1xpXAu11HeE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1xpXAu11Heb" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_1" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="1xpXAu11HeF" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -438,9 +438,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1xpXAu11Heb" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_1" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1xpXAu11Her" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_2" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -472,7 +472,7 @@
                             <node concept="2OqwBi" id="1xpXAu11Hez" role="3clFbG">
                               <node concept="2OqwBi" id="1xpXAu11HeC" role="2Oq$k0">
                                 <node concept="37vLTw" id="1xpXAu11HeH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1xpXAu11Heg" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_3" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="1xpXAu11HeI" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -487,9 +487,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="1xpXAu11Heg" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_3" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="1xpXAu11Het" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_4" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
index e73b56f5a..88c477c02 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
@@ -58,7 +58,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
index b771718f0..5f0b6d667 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
@@ -127,7 +127,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -146,7 +146,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">
@@ -162,6 +162,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" />
@@ -229,7 +230,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -247,7 +248,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -447,7 +447,7 @@
                             <node concept="2OqwBi" id="4Q$F1bo1DAr" role="3clFbG">
                               <node concept="2OqwBi" id="4Q$F1bo1DAs" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Q$F1bo1DAt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4Q$F1bo1DAx" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_5" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4Q$F1bo1DAu" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -462,9 +462,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4Q$F1bo1DAx" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_5" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4Q$F1bo1DAy" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_6" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -496,7 +496,7 @@
                             <node concept="2OqwBi" id="4Q$F1bo1DAK" role="3clFbG">
                               <node concept="2OqwBi" id="4Q$F1bo1DAL" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Q$F1bo1DAM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4Q$F1bo1DAQ" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_7" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4Q$F1bo1DAN" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -511,9 +511,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4Q$F1bo1DAQ" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_7" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4Q$F1bo1DAR" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_8" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps
index 20ff9253b..25b832b57 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps
@@ -45,7 +45,7 @@
       <concept id="5285453794051997733" name="com.mbeddr.formal.spin.structure.PromelaModel" flags="ng" index="2mr7gt">
         <child id="5285453794051997738" name="content" index="2mr7gi" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -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>
@@ -117,7 +117,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_testcode.mps
index b20c0583e..79eadbaff 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_testcode.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_testcode.mps
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -56,7 +56,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
index 0146868fa..7d046a829 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
@@ -33,7 +33,7 @@
       <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
         <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
       </concept>
-      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
+      <concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
         <reference id="8333855927540250453" name="declaration" index="39XzEq" />
       </concept>
       <concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
@@ -105,7 +105,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,6 +131,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" />
@@ -194,7 +195,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -222,7 +223,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
@@ -230,7 +231,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="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn">
@@ -800,7 +800,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq04u" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq04v" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq04w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5WyjFZRq04$" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_9" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq04x" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -815,9 +815,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5WyjFZRq04$" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_9" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5WyjFZRq04_" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_a" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -846,7 +846,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq04M" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq04N" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq04O" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5WyjFZRq04S" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_b" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq04P" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -861,9 +861,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5WyjFZRq04S" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_b" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5WyjFZRq04T" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_c" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -983,7 +983,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq3$G" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq3$H" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq3$I" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5WyjFZRq3$M" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_d" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq3$J" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -998,9 +998,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5WyjFZRq3$M" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_d" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5WyjFZRq3$N" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_e" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -1029,7 +1029,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq3_0" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq3_1" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq3_2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5WyjFZRq3_6" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36FpC_f" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq3_3" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1044,9 +1044,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5WyjFZRq3_6" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36FpC_f" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5WyjFZRq3_7" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36FpC_g" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
index 6a2687ea2..23d343e2c 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.gsn" uuid="6988fbc3-c4bb-4258-b65b-4ff9985f8674" moduleVersion="0" compileInMPS="true">
+<solution name="test.mbeddr.formal.gsn" uuid="6988fbc3-c4bb-4258-b65b-4ff9985f8674" 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">692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)</dependency>
     <dependency reexport="false">7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)</dependency>
@@ -69,7 +68,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-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: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" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps
index 52d123665..9ba6cf728 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps
@@ -9,7 +9,7 @@
     <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
     <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="57ecebe4-dfb8-4fef-9175-0008e04a3684" name="com.mbeddr.formal.safety.argument.modelquery" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
@@ -69,7 +69,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -103,10 +103,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
@@ -157,7 +157,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
index 744a6da47..4bc002011 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
@@ -8,7 +8,7 @@
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="434b2bfb-bd7a-47c9-bced-b445035e6d96" name="com.mbeddr.formal.safety.req" version="1" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" 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="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" name="com.mbeddr.formal.req.base" version="0" />
     <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
@@ -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>
@@ -114,7 +114,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd
index 83b15d2c9..a9a627855 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.safety.argument.modelquery" uuid="a43c42e8-d5f9-419e-85a1-3b718a11b44b" moduleVersion="0" compileInMPS="true">
+<solution name="test.mbeddr.formal.safety.argument.modelquery" uuid="a43c42e8-d5f9-419e-85a1-3b718a11b44b" moduleVersion="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">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/.mps/migration.xml b/code/languages/com.mbeddr.formal.smt/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.mbeddr.formal.smt/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.smt/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
index 19e41147b..6646f1d38 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
@@ -34,7 +34,7 @@
         <language slang="l:bf6758cd-1d80-487a-8750-bda80ddbed16:com.mbeddr.formal.smtlib.synthesis" 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" />
@@ -67,7 +67,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">9e54e509-552a-4f20-9b96-12a273367cff(com.mbeddr.formal.smtlib)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -83,7 +82,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -105,7 +104,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
index e63a7b35f..4e76d867a 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
@@ -50,7 +50,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -233,7 +233,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/behavior.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/behavior.mps
index 8404b35c9..cbca64119 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/behavior.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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -63,7 +63,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
index f9851a9fb..3b4a9e575 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
@@ -39,14 +39,14 @@
       </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>
       <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" />
@@ -62,7 +62,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -107,7 +107,7 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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" />
@@ -161,7 +162,7 @@
         <child id="8155811638124638369" name="groupHeader" index="18hjfo" />
         <child id="8155811638124638371" name="childHeaders" index="18hjfq" />
       </concept>
-      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ng" index="1g0I81">
+      <concept id="5662204344885760731" name="de.slisson.mps.tables.structure.IStylable" flags="ngI" index="1g0I81">
         <child id="5662204344887343006" name="style" index="1geGt4" />
       </concept>
       <concept id="5662204344885763446" name="de.slisson.mps.tables.structure.TableStyle" flags="ng" index="1g0IQG">
@@ -204,7 +205,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
@@ -385,7 +385,7 @@
                             <node concept="3clFbF" id="43FRfGK5l5f" role="3cqZAp">
                               <node concept="2OqwBi" id="43FRfGK5lsa" role="3clFbG">
                                 <node concept="37vLTw" id="43FRfGK5l5e" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="43FRfGK5kO9" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36Gak9s" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="43FRfGK5m9_" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -393,9 +393,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="43FRfGK5kO9" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36Gak9s" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="43FRfGK5kOa" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36Gak9t" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -444,7 +444,7 @@
                             <node concept="3clFbF" id="104dc5EfDns" role="3cqZAp">
                               <node concept="2OqwBi" id="104dc5EfDnt" role="3clFbG">
                                 <node concept="37vLTw" id="104dc5EfDnu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="104dc5EfDnw" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36Gak9u" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="104dc5EfDnv" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -452,9 +452,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="104dc5EfDnw" role="1bW2Oz">
+                          <node concept="gl6BB" id="2hED36Gak9u" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="104dc5EfDnx" role="1tU5fm" />
+                            <node concept="2jxLKc" id="2hED36Gak9v" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/intentions.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/intentions.mps
index 4fc47e74b..8b641c48c 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/intentions.mps
@@ -43,7 +43,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -70,7 +70,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/plugin.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/plugin.mps
index db191fe87..088141597 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -38,7 +38,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" />
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/structure.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/structure.mps
index 380695314..6dbf126f6 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/structure.mps
@@ -35,7 +35,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps
index f19a47c5a..f7caac5c7 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.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="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -86,7 +86,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>
@@ -104,7 +104,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">
@@ -165,7 +165,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
index 9c29f2d4f..6e755e3dc 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
@@ -5,7 +5,7 @@
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" 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" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -107,7 +107,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -123,7 +123,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">
@@ -213,7 +213,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl
index b624ed467..f2f35fb82 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.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" />
@@ -59,7 +59,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
@@ -73,7 +72,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l: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" />
@@ -95,7 +94,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/generator/template/main@generator.mps
index 8767f8ad5..38d624f61 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/generator/template/main@generator.mps
@@ -12,7 +12,7 @@
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/constraints.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/constraints.mps
index 57d64623a..07ed7521b 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/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/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
index 350e89886..a98c31291 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
@@ -57,7 +57,7 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
@@ -76,7 +76,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -115,7 +115,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">
@@ -162,7 +162,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/intentions.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/intentions.mps
index 8dc9773c3..99fc90186 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/intentions.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/intentions.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>
@@ -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/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/plugin.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/plugin.mps
index af1248028..348e42cf2 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/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="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
@@ -27,7 +27,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/structure.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/structure.mps
index 288c305a6..11444c494 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/structure.mps
@@ -56,7 +56,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/textGen.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/textGen.mps
index fc109860f..a4780d3a9 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/textGen.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/textGen.mps
@@ -73,7 +73,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.lib/com.mbeddr.formal.smtlib.z3.lib.msd b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.lib/com.mbeddr.formal.smtlib.z3.lib.msd
index faea567e5..1db1bf59b 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.lib/com.mbeddr.formal.smtlib.z3.lib.msd
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.lib/com.mbeddr.formal.smtlib.z3.lib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.smtlib.z3.lib" uuid="f7821750-33bf-489c-8f64-0850d86d540d" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.smtlib.z3.lib" uuid="f7821750-33bf-489c-8f64-0850d86d540d" 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/com.microsoft.z3.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/com.microsoft.z3.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
index f86f413c5..13b1b2c1a 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.smtlib.z3.rt" uuid="03458680-b827-4dcd-a8ca-ad82e7bdf60e" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.smtlib.z3.rt" uuid="03458680-b827-4dcd-a8ca-ad82e7bdf60e" moduleVersion="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">f7821750-33bf-489c-8f64-0850d86d540d(com.mbeddr.formal.smtlib.z3.lib)</dependency>
     <dependency reexport="false">9e54e509-552a-4f20-9b96-12a273367cff(com.mbeddr.formal.smtlib)</dependency>
@@ -24,7 +23,7 @@
     <language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
index 7c549dbff..1ef8e8e68 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
@@ -32,7 +32,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -117,7 +117,7 @@
       </concept>
       <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>
@@ -141,7 +141,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -168,7 +168,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
index bdd2f53a8..cb6eddb96 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
@@ -117,7 +117,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>
@@ -139,7 +139,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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -172,6 +172,7 @@
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="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">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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">
@@ -260,7 +261,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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">
@@ -522,7 +522,7 @@
                                     <ref role="37wK5l" node="104dc5E55WC" resolve="typeConverter" />
                                     <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                     <node concept="37vLTw" id="6cjunGy_X8q" role="37wK5m">
-                                      <ref role="3cqZAo" node="6cjunGy$bhp" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36Gak9w" resolve="it" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGy_X8r" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4Rwf" resolve="ctx" />
@@ -533,9 +533,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="6cjunGy$bhp" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36Gak9w" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="6cjunGy$bhq" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36Gak9x" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -649,7 +649,7 @@
                                     <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                     <node concept="2OqwBi" id="1MFSGJpa2$U" role="37wK5m">
                                       <node concept="37vLTw" id="1MFSGJpa1EP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1MFSGJpa1ES" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36Gak9y" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="1MFSGJpa35O" role="2OqNvi">
                                         <ref role="3Tt5mk" to="d9cz:6cjunGyy0m8" resolve="tpe" />
@@ -664,9 +664,9 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1MFSGJpa1ES" role="1bW2Oz">
+                              <node concept="gl6BB" id="2hED36Gak9y" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1MFSGJpa1ET" role="1tU5fm" />
+                                <node concept="2jxLKc" id="2hED36Gak9z" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -880,7 +880,7 @@
                                                 <ref role="37wK5l" to="f7eu:~Context.mkSymbol(java.lang.String)" resolve="mkSymbol" />
                                                 <node concept="2OqwBi" id="6MrCApUsxdN" role="37wK5m">
                                                   <node concept="37vLTw" id="6MrCApUsxdO" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="6MrCApUsxdQ" resolve="sd" />
+                                                    <ref role="3cqZAo" node="2hED36Gak9$" resolve="sd" />
                                                   </node>
                                                   <node concept="3TrcHB" id="6MrCApUsxdP" role="2OqNvi">
                                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -890,9 +890,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="6MrCApUsxdQ" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2hED36Gak9$" role="1bW2Oz">
                                           <property role="TrG5h" value="sd" />
-                                          <node concept="2jxLKc" id="6MrCApUsxdR" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2hED36Gak9_" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -928,7 +928,7 @@
                                               <ref role="37wK5l" node="104dc5E55WC" resolve="typeConverter" />
                                               <node concept="2OqwBi" id="7xXCuh1x53J" role="37wK5m">
                                                 <node concept="37vLTw" id="7xXCuh1x53K" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6MrCApUszhO" resolve="sd" />
+                                                  <ref role="3cqZAo" node="2hED36Gak9A" resolve="sd" />
                                                 </node>
                                                 <node concept="3TrEf2" id="7xXCuh1x53L" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="d9cz:2l5A0OF69t$" resolve="sort" />
@@ -943,9 +943,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="6MrCApUszhO" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2hED36Gak9A" role="1bW2Oz">
                                           <property role="TrG5h" value="sd" />
-                                          <node concept="2jxLKc" id="6MrCApUszhP" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2hED36Gak9B" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -1356,7 +1356,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxlJX" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxlJY" role="37wK5m">
-                                      <ref role="3cqZAo" node="104dc5EhBkr" resolve="exp" />
+                                      <ref role="3cqZAo" node="2hED36Gak9C" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxlJZ" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -1374,9 +1374,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="104dc5EhBkr" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9C" role="1bW2Oz">
                               <property role="TrG5h" value="exp" />
-                              <node concept="2jxLKc" id="104dc5EhBks" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9D" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1433,7 +1433,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxsz8" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxsz9" role="37wK5m">
-                                      <ref role="3cqZAo" node="104dc5EhL66" resolve="exp" />
+                                      <ref role="3cqZAo" node="2hED36Gak9E" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxsza" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -1451,9 +1451,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="104dc5EhL66" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9E" role="1bW2Oz">
                               <property role="TrG5h" value="exp" />
-                              <node concept="2jxLKc" id="104dc5EhL67" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9F" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2121,7 +2121,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxaae" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxaaf" role="37wK5m">
-                                      <ref role="3cqZAo" node="6cjunGyvvjn" resolve="exp" />
+                                      <ref role="3cqZAo" node="2hED36Gak9G" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxaag" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2139,9 +2139,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6cjunGyvvjn" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9G" role="1bW2Oz">
                               <property role="TrG5h" value="exp" />
-                              <node concept="2jxLKc" id="6cjunGyvvjo" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9H" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2284,7 +2284,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxvO1" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxvO2" role="37wK5m">
-                                      <ref role="3cqZAo" node="6cjunGyvIC6" resolve="exp" />
+                                      <ref role="3cqZAo" node="2hED36Gak9I" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxvO3" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2302,9 +2302,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6cjunGyvIC6" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9I" role="1bW2Oz">
                               <property role="TrG5h" value="exp" />
-                              <node concept="2jxLKc" id="6cjunGyvIC7" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9J" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2766,7 +2766,7 @@
                                       <node concept="1rXfSq" id="6MrCApUtAYL" role="3clFbG">
                                         <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                         <node concept="37vLTw" id="6MrCApUtAYM" role="37wK5m">
-                                          <ref role="3cqZAo" node="6MrCApUtAYP" resolve="par" />
+                                          <ref role="3cqZAo" node="2hED36Gak9K" resolve="par" />
                                         </node>
                                         <node concept="37vLTw" id="6MrCApUtAYN" role="37wK5m">
                                           <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2780,9 +2780,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="6MrCApUtAYP" role="1bW2Oz">
+                                  <node concept="gl6BB" id="2hED36Gak9K" role="1bW2Oz">
                                     <property role="TrG5h" value="par" />
-                                    <node concept="2jxLKc" id="6MrCApUtAYQ" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="2hED36Gak9L" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -3315,7 +3315,7 @@
                                   <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                   <node concept="2OqwBi" id="7xXCuh1AqNn" role="37wK5m">
                                     <node concept="37vLTw" id="7xXCuh1AqNo" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7xXCuh1AqNs" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36Gak9M" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7xXCuh1AqNp" role="2OqNvi">
                                       <ref role="3Tt5mk" to="d9cz:6cjunGyy0m8" resolve="tpe" />
@@ -3330,9 +3330,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7xXCuh1AqNs" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9M" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7xXCuh1AqNt" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9N" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -3369,7 +3369,7 @@
                                     <ref role="37wK5l" to="f7eu:~Context.mkSymbol(java.lang.String)" resolve="mkSymbol" />
                                     <node concept="2OqwBi" id="7xXCuh1AyEH" role="37wK5m">
                                       <node concept="37vLTw" id="7xXCuh1Aypx" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="7xXCuh1Avv8" resolve="it" />
+                                        <ref role="3cqZAo" node="2hED36Gak9O" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="7xXCuh1AyVC" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3379,9 +3379,9 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="7xXCuh1Avv8" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36Gak9O" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="7xXCuh1Avv9" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36Gak9P" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
index fe8d83f5a..56513c1cb 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
@@ -80,7 +80,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -98,13 +98,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="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <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" />
@@ -126,7 +127,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -142,7 +143,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>
@@ -179,7 +179,7 @@
                       <node concept="2OqwBi" id="6cjunGyDMQG" role="3clFbG">
                         <node concept="2OqwBi" id="6cjunGyDMQH" role="2Oq$k0">
                           <node concept="37vLTw" id="6cjunGyDMQI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6cjunGyDMQM" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36Gak9Q" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6cjunGyDMQJ" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -194,9 +194,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6cjunGyDMQM" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36Gak9Q" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6cjunGyDMQN" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36Gak9R" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
index 44c776ee7..0ef22eba2 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
@@ -90,7 +90,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -118,6 +118,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" />
@@ -166,7 +167,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>
@@ -196,7 +197,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -232,15 +232,15 @@
                   <node concept="3clFbF" id="104dc5E5Xn5" role="3cqZAp">
                     <node concept="2OqwBi" id="104dc5E5Xv3" role="3clFbG">
                       <node concept="37vLTw" id="104dc5E5Xn4" role="2Oq$k0">
-                        <ref role="3cqZAo" node="104dc5E5Xjf" resolve="it" />
+                        <ref role="3cqZAo" node="2hED36Gak9S" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="104dc5E5XP4" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="104dc5E5Xjf" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36Gak9S" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="104dc5E5Xjg" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36Gak9T" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -310,7 +310,7 @@
                           <node concept="2OqwBi" id="104dc5E680t" role="3clFbG">
                             <node concept="2OqwBi" id="104dc5E680u" role="2Oq$k0">
                               <node concept="37vLTw" id="104dc5E680v" role="2Oq$k0">
-                                <ref role="3cqZAo" node="104dc5E680B" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36Gak9U" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="104dc5E680w" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -335,9 +335,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="104dc5E680B" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36Gak9U" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="104dc5E680C" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36Gak9V" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_input.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_input.mps
index 100d89ef7..daf39ca17 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_input.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_input.mps
@@ -30,7 +30,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
index a141048c6..f7c57f4f2 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_smoke_synthethise_test@tests.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_smoke_synthethise_test@tests.mps
index f1c801639..dcda93e78 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_smoke_synthethise_test@tests.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_smoke_synthethise_test@tests.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/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
index b05c19999..814d76a3e 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.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/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/test.com.mbeddr.formal.smtlib.synthesis.msd b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/test.com.mbeddr.formal.smtlib.synthesis.msd
index 34ffadadd..e8b4a8b8d 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/test.com.mbeddr.formal.smtlib.synthesis.msd
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/test.com.mbeddr.formal.smtlib.synthesis.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.smtlib.synthesis" uuid="a33f7432-6f60-4ed5-a363-998ede3a1319" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.smtlib.synthesis" uuid="a33f7432-6f60-4ed5-a363-998ede3a1319" 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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
index c890d117d..1291f8bc2 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke_tests@tests.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke_tests@tests.mps
index 0f1a15138..13b5534be 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke_tests@tests.mps
@@ -63,7 +63,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -73,7 +73,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" />
@@ -103,7 +103,7 @@
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/test.com.mbeddr.formal.smtlib.msd b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/test.com.mbeddr.formal.smtlib.msd
index ea24e3105..c21f849fe 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/test.com.mbeddr.formal.smtlib.msd
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/test.com.mbeddr.formal.smtlib.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.com.mbeddr.formal.smtlib" uuid="3c346bff-621e-4c77-8efd-938607161129" moduleVersion="0" compileInMPS="true">
+<solution name="test.com.mbeddr.formal.smtlib" uuid="3c346bff-621e-4c77-8efd-938607161129" 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">03458680-b827-4dcd-a8ca-ad82e7bdf60e(com.mbeddr.formal.smtlib.z3.rt)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/.mps/migration.xml b/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
index 1710be715..a2e96ad57 100644
--- a/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
@@ -10,6 +10,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/com.mbeddr.formal.spin.analyses.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/com.mbeddr.formal.spin.analyses.mpl
index 35b3996de..28729e281 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/com.mbeddr.formal.spin.analyses.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/com.mbeddr.formal.spin.analyses.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">810b1f0c-97b8-4211-8a3c-55a39bac8bee(com.mbeddr.formal.base.analyses)</dependency>
     <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
@@ -23,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/behavior.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/behavior.mps
index 8bea1b294..91454ea11 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/behavior.mps
@@ -51,7 +51,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -59,13 +59,13 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/structure.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/structure.mps
index 5261b6ff8..d61cf2b4d 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/models/structure.mps
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
index 55c0eabf9..8fb5de756 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
@@ -26,7 +25,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/behavior.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/behavior.mps
index e41b4b21b..3d95ff3df 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/behavior.mps
@@ -75,14 +75,14 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -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/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/constraints.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/constraints.mps
index f23224b9f..612d623ff 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/constraints.mps
@@ -70,7 +70,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -84,7 +84,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">
@@ -166,7 +166,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
index 18f369af4..a7adde8a0 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
@@ -63,7 +63,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>
@@ -76,7 +76,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,13 +96,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="7980428675268276156" name="jetbrains.mps.lang.editor.structure.TransformationMenuSection" flags="ng" index="1Qtc8_">
@@ -152,7 +152,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -207,7 +207,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/structure.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/structure.mps
index 30be23bcc..0ea3e2989 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/structure.mps
@@ -63,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>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/typesystem.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/typesystem.mps
index f3742412b..c57b29270 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/typesystem.mps
@@ -66,7 +66,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/com.mbeddr.formal.spin.ext.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/com.mbeddr.formal.spin.ext.mpl
index 0061b741c..1b1457032 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/com.mbeddr.formal.spin.ext.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/com.mbeddr.formal.spin.ext.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: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" />
@@ -92,7 +92,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</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:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/com.mbeddr.formal.spin.ext.generator.utils.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/com.mbeddr.formal.spin.ext.generator.utils.mps
index 6032392c0..0f4ee2200 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/com.mbeddr.formal.spin.ext.generator.utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/com.mbeddr.formal.spin.ext.generator.utils.mps
@@ -71,7 +71,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -85,7 +85,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" />
@@ -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/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/spin_ext_main@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/spin_ext_main@generator.mps
index 0823559f0..d9ae6dfb4 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/spin_ext_main@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/generator/template/spin_ext_main@generator.mps
@@ -55,7 +55,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -74,10 +74,10 @@
       </concept>
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -119,7 +119,7 @@
       <concept id="4613921340551921915" name="com.mbeddr.formal.spin.structure.ExpressionStatement" flags="ng" index="XdJ7S">
         <child id="4613921340551921928" name="exp" index="XdJ0b" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968618360712" name="com.mbeddr.formal.spin.structure.CDecl" flags="ng" index="1a5m5k">
@@ -152,7 +152,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="1021062414717307707" name="jetbrains.mps.lang.generator.structure.WeavingAnchorQuery" flags="ig" index="O$s7w" />
@@ -251,7 +251,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>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -263,7 +263,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/editor.mps
index 55e138b09..843b77f54 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/editor.mps
@@ -31,7 +31,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
@@ -44,7 +44,7 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/structure.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/structure.mps
index a64c20116..b5074c574 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/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/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/typesystem.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/typesystem.mps
index 1b91c1461..c161938c0 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/models/typesystem.mps
@@ -85,7 +85,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
index 6d5b30acc..88a841d4a 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.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" />
@@ -138,7 +138,6 @@
       </mapping-priorities>
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
@@ -163,7 +162,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -190,7 +189,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_010_spin_hdl_high_prio@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_010_spin_hdl_high_prio@generator.mps
index ed561ef79..9bb27ad50 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_010_spin_hdl_high_prio@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_010_spin_hdl_high_prio@generator.mps
@@ -66,7 +66,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -113,13 +113,13 @@
       </concept>
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -223,7 +223,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
index 19d6475e7..7ab32b48f 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
@@ -112,7 +112,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -211,10 +211,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
@@ -268,7 +268,7 @@
       <concept id="4613921340552550723" name="com.mbeddr.formal.spin.structure.AtomicBlock" flags="ng" index="Xfmx0">
         <child id="4613921340552550736" name="stmts" index="Xfmxj" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616790990" name="com.mbeddr.formal.spin.structure.NotExpression" flags="ng" index="1a3nki" />
@@ -322,7 +322,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">
@@ -418,6 +418,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" />
@@ -549,12 +550,12 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
@@ -577,7 +578,6 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
@@ -1346,7 +1346,7 @@
                         <node concept="3clFbF" id="78yKT8PMPVl" role="3cqZAp">
                           <node concept="2OqwBi" id="78yKT8PMQaL" role="3clFbG">
                             <node concept="37vLTw" id="78yKT8PMPVk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="78yKT8PMPIi" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EYkSx" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="78yKT8PMRGE" role="2OqNvi">
                               <ref role="3Tt5mk" to="vshk:26dfgZlSsP9" resolve="suv" />
@@ -1354,9 +1354,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="78yKT8PMPIi" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36EYkSx" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="78yKT8PMPIj" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36EYkSy" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1383,7 +1383,7 @@
                           <node concept="2OqwBi" id="78yKT8PNKoR" role="3clFbG">
                             <node concept="2OqwBi" id="78yKT8PNwCB" role="2Oq$k0">
                               <node concept="37vLTw" id="78yKT8PNwmQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="78yKT8PNw2x" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36EYkSz" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="78yKT8PNxas" role="2OqNvi">
                                 <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -1398,9 +1398,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="78yKT8PNw2x" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36EYkSz" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="78yKT8PNw2y" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36EYkS$" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1482,7 +1482,7 @@
                         <node concept="3clFbF" id="5SGsxw7OBb9" role="3cqZAp">
                           <node concept="2OqwBi" id="5SGsxw7OBwd" role="3clFbG">
                             <node concept="37vLTw" id="5SGsxw7OBb8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5SGsxw7OAVk" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EYkS_" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="5SGsxw7OC8J" role="2OqNvi">
                               <ref role="3TtcxE" to="y6ji:1ZejHLlNgv5" resolve="decls" />
@@ -1490,9 +1490,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5SGsxw7OAVk" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36EYkS_" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5SGsxw7OAVl" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36EYkSA" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -1523,7 +1523,7 @@
                         <node concept="3fqX7Q" id="5SGsxw7Ohgx" role="3clFbG">
                           <node concept="2OqwBi" id="5SGsxw7OhLm" role="3fr31v">
                             <node concept="37vLTw" id="5SGsxw7OhrR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5SGsxw7OgRU" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EYkSB" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5SGsxw7Ojio" role="2OqNvi">
                               <node concept="chp4Y" id="5SGsxw7OjvU" role="cj9EA">
@@ -1534,9 +1534,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="5SGsxw7OgRU" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EYkSB" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="5SGsxw7OgRV" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EYkSC" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1645,7 +1645,7 @@
                                     <node concept="2OqwBi" id="7M$OvLQeVs6" role="3clFbG">
                                       <node concept="2OqwBi" id="7M$OvLQeVs7" role="2Oq$k0">
                                         <node concept="37vLTw" id="7M$OvLQeVs8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7M$OvLQeVsb" resolve="it" />
+                                          <ref role="3cqZAo" node="2hED36EYkSD" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7M$OvLQeVs9" role="2OqNvi">
                                           <ref role="3Tt5mk" to="vshk:26dfgZlSsP9" resolve="suv" />
@@ -1657,9 +1657,9 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="Rh6nW" id="7M$OvLQeVsb" role="1bW2Oz">
+                                <node concept="gl6BB" id="2hED36EYkSD" role="1bW2Oz">
                                   <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7M$OvLQeVsc" role="1tU5fm" />
+                                  <node concept="2jxLKc" id="2hED36EYkSE" role="1tU5fm" />
                                 </node>
                               </node>
                             </node>
@@ -3878,15 +3878,15 @@
                         <node concept="3clFbF" id="5SGsxw7COHp" role="3cqZAp">
                           <node concept="2OqwBi" id="5SGsxw7COHq" role="3clFbG">
                             <node concept="37vLTw" id="5SGsxw7COHr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5SGsxw7COHt" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36EYkSF" resolve="it" />
                             </node>
                             <node concept="2Rxl7S" id="5SGsxw7COHs" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="5SGsxw7COHt" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36EYkSF" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="5SGsxw7COHu" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36EYkSG" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/com.mbeddr.formal.spin.hdl.utils.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/com.mbeddr.formal.spin.hdl.utils.mps
index 524e94983..1cf3305ac 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/com.mbeddr.formal.spin.hdl.utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/com.mbeddr.formal.spin.hdl.utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -48,7 +48,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="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -61,7 +61,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" />
@@ -95,7 +95,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/constraints.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/constraints.mps
index c28977e92..162e587ee 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/constraints.mps
@@ -59,7 +59,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>
@@ -73,7 +73,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">
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
index bc7b15442..1e0cf9760 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
@@ -54,14 +54,14 @@
       </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>
       <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="5266818545798688928" name="jetbrains.mps.lang.editor.structure.ShowBoundariesInStyleClassItem" flags="lg" index="1fO$WK" />
-      <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" />
@@ -79,7 +79,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -117,7 +117,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>
@@ -155,7 +155,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
index 301b75c7e..987f2d967 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/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="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -130,7 +130,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -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">
@@ -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" />
@@ -261,7 +262,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -297,7 +298,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
@@ -769,13 +769,13 @@
                             <node concept="3clFbS" id="26dfgZm0BNs" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0BNt" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0BNu" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0BNv" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSn" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0BNv" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSn" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0BNw" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSo" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -792,13 +792,13 @@
                               <node concept="1daRAt" id="26dfgZm0BNB" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0BNC" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0BND" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSp" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0BND" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSp" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0BNE" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSq" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -994,13 +994,13 @@
                             <node concept="3clFbS" id="6fYDdj_aR1k" role="1bW5cS">
                               <node concept="1daRAt" id="6fYDdj_aRh2" role="3cqZAp">
                                 <node concept="37vLTw" id="6fYDdj_aRp_" role="1daK9t">
-                                  <ref role="3cqZAo" node="6fYDdj_aR1l" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSr" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6fYDdj_aR1l" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSr" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6fYDdj_aR1m" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSs" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1017,13 +1017,13 @@
                               <node concept="1daRAt" id="6fYDdj_aVga" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="6fYDdj_aVoN" role="1daK9t">
-                                  <ref role="3cqZAo" node="6fYDdj_aV0n" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSt" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6fYDdj_aV0n" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSt" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6fYDdj_aV0o" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSu" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1511,7 +1511,7 @@
                       </node>
                       <node concept="2OqwBi" id="6kOHW5ftKVm" role="3uHU7B">
                         <node concept="37vLTw" id="6kOHW5ftMMd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6kOHW5ftKQj" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36EYkSv" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6kOHW5ftKVo" role="2OqNvi">
                           <ref role="37wK5l" to="guwi:~File.lastModified()" resolve="lastModified" />
@@ -1520,9 +1520,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6kOHW5ftKQj" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36EYkSv" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6kOHW5ftKQk" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36EYkSw" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/structure.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/structure.mps
index c9f75b684..5de5a7e36 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/structure.mps
@@ -57,7 +57,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
index e7d3ac197..a51bd752e 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
@@ -33,7 +33,7 @@
         <language slang="l:ad8d48af-022b-40dc-8979-2b76074fb438:com.mbeddr.formal.spin" 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" />
@@ -67,7 +67,6 @@
       <mapping-priorities />
     </generator>
   </generators>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
@@ -90,7 +89,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l: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,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
index eced67ade..0c1e60e57 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
@@ -44,7 +44,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" 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">
@@ -62,7 +62,7 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -86,7 +86,7 @@
       <concept id="4613921340551921915" name="com.mbeddr.formal.spin.structure.ExpressionStatement" flags="ng" index="XdJ7S">
         <child id="4613921340551921928" name="exp" index="XdJ0b" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968618030330" name="com.mbeddr.formal.spin.structure.ProcRef" flags="ng" index="1a66CA">
@@ -165,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>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -182,7 +182,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
index d4f66bd62..b652462f8 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
@@ -104,7 +104,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <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="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -124,6 +124,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" />
@@ -202,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>
@@ -214,7 +215,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
     </language>
@@ -997,7 +997,7 @@
                     <node concept="3clFbF" id="5uFV_KLwU8Q" role="3cqZAp">
                       <node concept="2OqwBi" id="5uFV_KLwU8R" role="3clFbG">
                         <node concept="37vLTw" id="5uFV_KLwU8S" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5uFV_KLwU8X" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36EYkSH" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="5uFV_KLwU8T" role="2OqNvi">
                           <node concept="1xMEDy" id="5uFV_KLwU8U" role="1xVPHs">
@@ -1010,9 +1010,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5uFV_KLwU8X" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EYkSH" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5uFV_KLwU8Y" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EYkSI" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/constraints.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/constraints.mps
index da4ac3ffa..a7acc9dc0 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/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>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
index f43dc7534..13cf5b857 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
@@ -58,7 +58,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>
@@ -70,7 +70,7 @@
       <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
@@ -97,7 +97,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -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>
@@ -211,7 +211,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
index 48bfb1f98..08c7fbb2f 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/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="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
@@ -194,7 +194,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>
@@ -223,7 +223,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -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" />
@@ -337,7 +338,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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" />
@@ -377,7 +378,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -623,14 +623,14 @@
                                 <property role="3cmrfH" value="0" />
                               </node>
                               <node concept="37vLTw" id="4_pH3zvrs6I" role="1LFl5Q">
-                                <ref role="3cqZAo" node="4_pH3zvrs6J" resolve="it" />
+                                <ref role="3cqZAo" node="2hED36EYkSJ" resolve="it" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4_pH3zvrs6J" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EYkSJ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4_pH3zvrs6K" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EYkSK" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -990,13 +990,13 @@
                             <node concept="3clFbS" id="26dfgZm0BNs" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0BNt" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0BNu" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0BNv" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSL" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0BNv" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSL" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0BNw" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSM" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1013,13 +1013,13 @@
                               <node concept="1daRAt" id="26dfgZm0BNB" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0BNC" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0BND" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSN" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0BND" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSN" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0BNE" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSO" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1178,13 +1178,13 @@
                             <node concept="3clFbS" id="26dfgZm0Vir" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0Vis" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0Vit" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0Viu" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSP" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0Viu" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSP" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0Viv" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSQ" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -1201,13 +1201,13 @@
                               <node concept="1daRAt" id="26dfgZm0ViA" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0ViB" role="1daK9t">
-                                  <ref role="3cqZAo" node="26dfgZm0ViC" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSR" resolve="it" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="26dfgZm0ViC" role="1bW2Oz">
+                            <node concept="gl6BB" id="2hED36EYkSR" role="1bW2Oz">
                               <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="26dfgZm0ViD" role="1tU5fm" />
+                              <node concept="2jxLKc" id="2hED36EYkSS" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
@@ -2108,7 +2108,7 @@
                       <node concept="TSZUe" id="6fYDdj_7vxU" role="2OqNvi">
                         <node concept="2OqwBi" id="6fYDdj_7wtO" role="25WWJ7">
                           <node concept="37vLTw" id="6fYDdj_7vJc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6fYDdj_7sBE" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EYkST" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6fYDdj_7wQG" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -2118,9 +2118,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6fYDdj_7sBE" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36EYkST" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6fYDdj_7sBF" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36EYkSU" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -2142,7 +2142,7 @@
                       <node concept="TSZUe" id="6fYDdj_7y0v" role="2OqNvi">
                         <node concept="2OqwBi" id="6fYDdj_7y0w" role="25WWJ7">
                           <node concept="37vLTw" id="6fYDdj_7y0x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6fYDdj_7y0z" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EYkSV" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6fYDdj_7y0y" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -2152,9 +2152,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6fYDdj_7y0z" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36EYkSV" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6fYDdj_7y0$" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36EYkSW" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/structure.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/structure.mps
index 563771632..e1a25301f 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/structure.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/structure.mps
@@ -85,7 +85,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/textGen.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/textGen.mps
index b41084c96..aa25c1bd9 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/textGen.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/textGen.mps
@@ -45,7 +45,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" 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>
@@ -98,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/typesystem.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/typesystem.mps
index 00e26c7b6..834b171dd 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/typesystem.mps
@@ -38,7 +38,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -115,7 +115,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
index 91c1b5186..5d2aec487 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.spin.genplan" uuid="8fa6837b-ded6-4b1e-a190-ce0b2256e987" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.spin.genplan" uuid="8fa6837b-ded6-4b1e-a190-ce0b2256e987" moduleVersion="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">8ffff4a3-5838-458b-8c6d-7143a3c423b7(com.mbeddr.formal.spin.hdl#2291855968617432607)</dependency>
   </dependencies>
@@ -18,9 +17,9 @@
     <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="1" />
+    <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps
index de13c487f..dc220e2de 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@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" />
     <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
@@ -12,11 +12,14 @@
   </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>
       <concept id="6257322641293267918" name="jetbrains.mps.lang.generator.plan.structure.CheckpointDeclaration" flags="ng" index="19BiC4" />
     </language>
@@ -27,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>
@@ -35,46 +38,62 @@
   <node concept="2VgMpV" id="4sMKqP$UuE8">
     <property role="TrG5h" value="Spin and MDCC generator plan" />
     <node concept="2VgMA2" id="4sMKqP$UuEd" role="2VgMA7">
-      <node concept="2V$Bhx" id="4sMKqP$UuEk" role="1t_9vn">
-        <property role="2V$B1T" value="628c1bba-6b54-4c71-927c-3cff044349e4" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.spin.hdl" />
+      <node concept="2Qf6Nf" id="2hED36EYkSa" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4sMKqP$UuEk" role="2Qf6Ng">
+          <property role="2V$B1T" value="628c1bba-6b54-4c71-927c-3cff044349e4" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.spin.hdl" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="4sMKqP$UuEu" role="2VgMA7">
-      <node concept="2V$Bhx" id="4sMKqP$UuED" role="1t_9vn">
-        <property role="2V$B1T" value="bd54ef69-17ec-411b-8f49-485702e74565" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.spin.ext" />
+      <node concept="2Qf6Nf" id="2hED36EYkSb" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4sMKqP$UuED" role="2Qf6Ng">
+          <property role="2V$B1T" value="bd54ef69-17ec-411b-8f49-485702e74565" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.spin.ext" />
+        </node>
       </node>
     </node>
     <node concept="19BiC4" id="5mKzygLUqsp" role="2VgMA7">
       <property role="TrG5h" value="reached_standard_promela" />
     </node>
     <node concept="2VgMA2" id="4sMKqP$UuER" role="2VgMA7">
-      <node concept="2V$Bhx" id="4sMKqP$UuF6" role="1t_9vn">
-        <property role="2V$B1T" value="ef89f137-f966-4966-a202-ab9ea26e79fe" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.spin.c.core" />
+      <node concept="2Qf6Nf" id="2hED36EYkSc" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="4sMKqP$UuF6" role="2Qf6Ng">
+          <property role="2V$B1T" value="ef89f137-f966-4966-a202-ab9ea26e79fe" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.spin.c.core" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5mKzygLUquG" role="1t_9vn">
-        <property role="2V$B1T" value="80ea7e60-3c36-4583-be96-3e7d3ad3504e" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.spin.analyses" />
+      <node concept="2Qf6Nf" id="2hED36EYkSd" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5mKzygLUquG" role="2Qf6Ng">
+          <property role="2V$B1T" value="80ea7e60-3c36-4583-be96-3e7d3ad3504e" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.spin.analyses" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5mKzygLUqsO" role="1t_9vn">
-        <property role="2V$B1T" value="ad8d48af-022b-40dc-8979-2b76074fb438" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.spin" />
+      <node concept="2Qf6Nf" id="2hED36EYkSe" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5mKzygLUqsO" role="2Qf6Ng">
+          <property role="2V$B1T" value="ad8d48af-022b-40dc-8979-2b76074fb438" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.spin" />
+        </node>
       </node>
     </node>
     <node concept="2VgMA2" id="5mKzygLUqv8" role="2VgMA7">
-      <node concept="2V$Bhx" id="5mKzygLUqx7" role="1t_9vn">
-        <property role="2V$B1T" value="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.base.expressions" />
+      <node concept="2Qf6Nf" id="2hED36EYkSf" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5mKzygLUqx7" role="2Qf6Ng">
+          <property role="2V$B1T" value="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.base.expressions" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5mKzygLUqxj" role="1t_9vn">
-        <property role="2V$B1T" value="810b1f0c-97b8-4211-8a3c-55a39bac8bee" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.base.analyses" />
+      <node concept="2Qf6Nf" id="2hED36EYkSg" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5mKzygLUqxj" role="2Qf6Ng">
+          <property role="2V$B1T" value="810b1f0c-97b8-4211-8a3c-55a39bac8bee" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.base.analyses" />
+        </node>
       </node>
-      <node concept="2V$Bhx" id="5mKzygLUqvx" role="1t_9vn">
-        <property role="2V$B1T" value="83ed2dfe-f724-46cc-852a-dce086daee3f" />
-        <property role="2V$B1Q" value="com.mbeddr.formal.base" />
+      <node concept="2Qf6Nf" id="2hED36EYkSh" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="5mKzygLUqvx" role="2Qf6Ng">
+          <property role="2V$B1T" value="83ed2dfe-f724-46cc-852a-dce086daee3f" />
+          <property role="2V$B1Q" value="com.mbeddr.formal.base" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
index 676eba514..9298c52c6 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.spin.pluginSolution" uuid="9ce94094-51d9-4013-bdfc-e4db03298f9f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.formal.spin.pluginSolution" uuid="9ce94094-51d9-4013-bdfc-e4db03298f9f" moduleVersion="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">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
@@ -27,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -35,7 +34,7 @@
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps
index 2b5194d48..e169221eb 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.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="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -108,7 +108,7 @@
       </concept>
       <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <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>
@@ -125,7 +125,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">
@@ -150,7 +150,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
index 4a8690cdc..0762209ee 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -67,7 +67,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">
@@ -196,7 +196,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -224,7 +224,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">
@@ -266,6 +266,7 @@
       </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -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>
@@ -369,7 +370,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="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" />
@@ -1962,7 +1962,7 @@
                                           <node concept="3clFbF" id="71901EGHmYO" role="3cqZAp">
                                             <node concept="2OqwBi" id="71901EGHmYP" role="3clFbG">
                                               <node concept="37vLTw" id="71901EGHmYQ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="71901EGHmYT" resolve="it" />
+                                                <ref role="3cqZAo" node="2hED36EYkT5" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="71901EGHmYR" role="2OqNvi">
                                                 <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -1973,9 +1973,9 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="71901EGHmYT" role="1bW2Oz">
+                                        <node concept="gl6BB" id="2hED36EYkT5" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="71901EGHmYU" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="2hED36EYkT6" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -3262,7 +3262,7 @@
                               <node concept="2OqwBi" id="2lN4cj_OeKR" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="2lN4cj_OeKS" role="2Oq$k0">
                                   <node concept="37vLTw" id="2lN4cj_OeKT" role="2JrQYb">
-                                    <ref role="3cqZAo" node="2lN4cj_OeKY" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36EYkT7" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="2lN4cj_OeKU" role="2OqNvi">
@@ -3282,9 +3282,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="2lN4cj_OeKY" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36EYkT7" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2lN4cj_OeKZ" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36EYkT8" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -3610,7 +3610,7 @@
                         </node>
                         <node concept="2OqwBi" id="2yuIwRziJfm" role="3uHU7B">
                           <node concept="37vLTw" id="2yuIwRziJfn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2yuIwRziJfp" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EYkT9" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2yuIwRziJfo" role="2OqNvi">
                             <ref role="3Tt5mk" to="9yqz:4_pH3zvo$xG" resolve="env" />
@@ -3619,9 +3619,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="2yuIwRziJfp" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EYkT9" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2yuIwRziJfq" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EYkTa" role="1tU5fm" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps
index be9f75e8d..a3b1b4959 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.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>
@@ -119,7 +119,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" />
@@ -154,7 +154,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
index 5c583063d..a6d0edd00 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
@@ -44,7 +44,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -124,7 +124,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>
@@ -148,7 +148,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">
@@ -169,6 +169,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" />
@@ -183,7 +184,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>
@@ -217,7 +218,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -232,7 +233,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="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" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -331,7 +331,7 @@
                             <node concept="2OqwBi" id="4QGaVz5sUXf" role="3clFbG">
                               <node concept="2OqwBi" id="4QGaVz5sUXg" role="2Oq$k0">
                                 <node concept="37vLTw" id="4QGaVz5sUXh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4QGaVz5sUXl" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkSX" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4QGaVz5sUXi" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -346,9 +346,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4QGaVz5sUXl" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EYkSX" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4QGaVz5sUXm" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EYkSY" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -553,7 +553,7 @@
                               <node concept="2OqwBi" id="5yxSA$IRT3c" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5yxSA$IRT3d" role="2Oq$k0">
                                   <node concept="37vLTw" id="5yxSA$IRT3e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5yxSA$IRT3j" resolve="it" />
+                                    <ref role="3cqZAo" node="2hED36EYkSZ" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5yxSA$IRT3f" role="2OqNvi">
                                     <ref role="3Tt5mk" to="9yqz:4_pH3zvo$xG" resolve="env" />
@@ -572,9 +572,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="5yxSA$IRT3j" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EYkSZ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="5yxSA$IRT3k" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EYkT0" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -801,7 +801,7 @@
                       <node concept="2OqwBi" id="63QgsF$OKWU" role="3clFbG">
                         <node concept="2OqwBi" id="63QgsF$OKWV" role="2Oq$k0">
                           <node concept="37vLTw" id="63QgsF$OKWW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="63QgsF$OKX0" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36EYkT1" resolve="it" />
                           </node>
                           <node concept="liA8E" id="63QgsF$OKWX" role="2OqNvi">
                             <ref role="37wK5l" to="imq8:7XCY$_raaAL" resolve="getUserFriendlyMessage" />
@@ -816,9 +816,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="63QgsF$OKX0" role="1bW2Oz">
+                  <node concept="gl6BB" id="2hED36EYkT1" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="63QgsF$OKX1" role="1tU5fm" />
+                    <node concept="2jxLKc" id="2hED36EYkT2" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -884,7 +884,7 @@
                             <node concept="3cpWs3" id="63QgsF$OQF9" role="37wK5m">
                               <node concept="2OqwBi" id="63QgsF$ORCn" role="3uHU7w">
                                 <node concept="37vLTw" id="63QgsF$ORol" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="63QgsF$OQ5y" resolve="it" />
+                                  <ref role="3cqZAo" node="2hED36EYkT3" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="63QgsF$ORTO" role="2OqNvi">
                                   <ref role="37wK5l" to="imq8:7XCY$_raaAL" resolve="getUserFriendlyMessage" />
@@ -898,9 +898,9 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="63QgsF$OQ5y" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36EYkT3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="63QgsF$OQ5z" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36EYkT4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
index 02014512e..3c4955edd 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
@@ -39,7 +39,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -148,7 +148,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>
@@ -176,7 +176,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
@@ -215,7 +215,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
index d8874c659..9a4ef7931 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
@@ -60,7 +60,7 @@
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
@@ -77,7 +77,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
index 136370e7c..4cd24de59 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
@@ -5,10 +5,10 @@
     <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="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" 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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
@@ -56,6 +56,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" />
@@ -99,7 +100,7 @@
       <concept id="471625927503601927" name="jetbrains.mps.lang.plugin.structure.NumberToolShortcut" flags="ng" index="15feLf">
         <property id="471625927503601955" name="number" index="15feLF" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -111,7 +112,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>
@@ -138,7 +139,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -233,7 +234,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -250,7 +251,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="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
@@ -272,7 +273,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -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>
@@ -352,6 +353,7 @@
   <node concept="sE7Ow" id="EVDykUC7Si">
     <property role="TrG5h" value="SpinCheckAction" />
     <property role="2uzpH1" value="Verify Model (Run Pan)" />
+    <property role="1rBW0U" value="true" />
     <node concept="2ScWuX" id="Rd$2EC5$hT" role="tmbBb">
       <node concept="3clFbS" id="Rd$2EC5$hU" role="2VODD2">
         <node concept="3clFbF" id="Rd$2EC5$y$" role="3cqZAp">
@@ -959,6 +961,7 @@
   <node concept="sE7Ow" id="3lXW7OZ6Pmf">
     <property role="TrG5h" value="SpinVerifyAnalysisConfigurationAction" />
     <property role="2uzpH1" value="Verify Analysis Configuration" />
+    <property role="1rBW0U" value="true" />
     <node concept="1DS2jV" id="3lXW7OZ6Pmg" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/com.mbeddr.formal.spin.sandbox.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/com.mbeddr.formal.spin.sandbox.msd
index 08090d0ac..cffc7f983 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/com.mbeddr.formal.spin.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/com.mbeddr.formal.spin.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.spin.sandbox" uuid="65ecbe01-69b9-478b-969c-8c3c97f27e81" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.spin.sandbox" uuid="65ecbe01-69b9-478b-969c-8c3c97f27e81" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:810b1f0c-97b8-4211-8a3c-55a39bac8bee:com.mbeddr.formal.base.analyses" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._010_smoke.mps
index 07ec38b4d..af76daf91 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._010_smoke.mps
@@ -21,10 +21,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052993580" name="com.mbeddr.formal.spin.structure.IntType" flags="ng" index="2m7kok" />
@@ -83,7 +83,7 @@
       <concept id="4613921340552550723" name="com.mbeddr.formal.spin.structure.AtomicBlock" flags="ng" index="Xfmx0">
         <child id="4613921340552550736" name="stmts" index="Xfmxj" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968617711762" name="com.mbeddr.formal.spin.structure.Select" flags="ng" index="1a7Kpe">
@@ -132,7 +132,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._020_spin_verification_examples.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._020_spin_verification_examples.mps
index 64dbff8dc..40737ab25 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._020_spin_verification_examples.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._020_spin_verification_examples.mps
@@ -25,10 +25,10 @@
       <concept id="5285453794052877370" name="com.mbeddr.formal.spin.structure.ArgumentRef" flags="ng" index="2m6Dw2" />
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052621232" name="com.mbeddr.formal.spin.structure.ArgumentDeclaration" flags="ng" index="2mpJu8">
@@ -83,7 +83,7 @@
       <concept id="4613921340552550723" name="com.mbeddr.formal.spin.structure.AtomicBlock" flags="ng" index="Xfmx0">
         <child id="4613921340552550736" name="stmts" index="Xfmxj" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="1112787102640204567" name="com.mbeddr.formal.spin.structure.ChoiceStatement" flags="ng" index="1kW0bI" />
@@ -123,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>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._030_components_encoding.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._030_components_encoding.mps
index fb161b42a..4980b9880 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._030_components_encoding.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._030_components_encoding.mps
@@ -16,10 +16,10 @@
       <concept id="5285453794052877370" name="com.mbeddr.formal.spin.structure.ArgumentRef" flags="ng" index="2m6Dw2" />
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052621232" name="com.mbeddr.formal.spin.structure.ArgumentDeclaration" flags="ng" index="2mpJu8" />
@@ -55,7 +55,7 @@
         <reference id="4613921340552778838" name="proc" index="Xeull" />
         <child id="4613921340552778841" name="args" index="Xeulq" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="1112787102640204567" name="com.mbeddr.formal.spin.structure.ChoiceStatement" flags="ng" index="1kW0bI" />
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._040_sm_encoding.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._040_sm_encoding.mps
index 133a9d437..1a39f20ee 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._040_sm_encoding.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/models/com.mbeddr.formal.spin.sandbox._040_sm_encoding.mps
@@ -15,10 +15,10 @@
       <concept id="5285453794052877370" name="com.mbeddr.formal.spin.structure.ArgumentRef" flags="ng" index="2m6Dw2" />
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052993580" name="com.mbeddr.formal.spin.structure.IntType" flags="ng" index="2m7kok" />
@@ -73,7 +73,7 @@
         <reference id="4613921340552778838" name="proc" index="Xeull" />
         <child id="4613921340552778841" name="args" index="Xeulq" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616524582" name="com.mbeddr.formal.spin.structure.SkipStatement" flags="ng" index="1asmnU" />
@@ -122,7 +122,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_000_arbitrary_text_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_000_arbitrary_text_testcode.mps
index c86cc7371..9e63a9586 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_000_arbitrary_text_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_000_arbitrary_text_testcode.mps
@@ -24,7 +24,7 @@
         <child id="3050019586772588595" name="exp" index="2xKS2k" />
       </concept>
       <concept id="4613921340550954664" name="com.mbeddr.formal.spin.structure.ByteType" flags="ng" index="X9sYF" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968618750592" name="com.mbeddr.formal.spin.structure.PromelaArbitraryText" flags="ng" index="1abQLs" />
@@ -35,12 +35,12 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_010_statements_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_010_statements_testcode.mps
index 508c80927..559d1682f 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_010_statements_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_010_statements_testcode.mps
@@ -15,10 +15,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052621232" name="com.mbeddr.formal.spin.structure.ArgumentDeclaration" flags="ng" index="2mpJu8" />
@@ -74,7 +74,7 @@
         <reference id="4613921340552778838" name="proc" index="Xeull" />
         <child id="4613921340552778841" name="args" index="Xeulq" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968617711762" name="com.mbeddr.formal.spin.structure.Select" flags="ng" index="1a7Kpe">
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_100_c_code_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_100_c_code_testcode.mps
index c1437f25e..f3bd24f3d 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_100_c_code_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_100_c_code_testcode.mps
@@ -57,10 +57,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
@@ -116,7 +116,7 @@
       <concept id="4060527691668782219" name="com.mbeddr.formal.spin.structure.AssertCStatement" flags="ng" index="YP1zB">
         <child id="4060527691668782273" name="exp" index="YP1yH" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968618360712" name="com.mbeddr.formal.spin.structure.CDecl" flags="ng" index="1a5m5k">
@@ -165,12 +165,12 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ng" index="1af34u">
+      <concept id="2291855968619888578" name="com.mbeddr.formal.base.structure.IArbitraryText" flags="ngI" index="1af34u">
         <property id="2291855968619888582" name="text" index="1af34q" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
index 85a0b7bda..d27ca29a1 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
@@ -76,7 +76,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -86,7 +86,7 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -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/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_ext_010_statements_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_ext_010_statements_testcode.mps
index 867aa22ee..04bf05058 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_ext_010_statements_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_ext_010_statements_testcode.mps
@@ -12,10 +12,10 @@
       </concept>
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -53,7 +53,7 @@
       <concept id="4613921340551921915" name="com.mbeddr.formal.spin.structure.ExpressionStatement" flags="ng" index="XdJ7S">
         <child id="4613921340551921928" name="exp" index="XdJ0b" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968617711762" name="com.mbeddr.formal.spin.structure.Select" flags="ng" index="1a7Kpe">
@@ -93,7 +93,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
index 76e4ce459..29b80b40b 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -91,7 +91,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -112,6 +112,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" />
@@ -168,7 +169,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -179,7 +180,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -719,7 +719,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4ZxQD5y5Ddv" role="1m5AlR">
                                     <node concept="37vLTw" id="4ZxQD5y5Ddw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4ZxQD5y5Dd_" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36EYkTb" resolve="it" />
                                     </node>
                                     <node concept="2Rxl7S" id="4ZxQD5y5Ddx" role="2OqNvi" />
                                   </node>
@@ -737,9 +737,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4ZxQD5y5Dd_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EYkTb" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4ZxQD5y5DdA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EYkTc" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
index dd985ffdc..07fc5335e 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
   <imports>
@@ -64,7 +64,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -93,7 +93,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_000_logger_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_000_logger_testcode.mps
index 45ede914d..53e46e1c4 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_000_logger_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_000_logger_testcode.mps
@@ -54,11 +54,11 @@
       <concept id="5285453794053229581" name="com.mbeddr.formal.spin.structure.StringLiteral" flags="ng" index="2m4jwP">
         <property id="5285453794053229582" name="value" index="2m4jwQ" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -77,7 +77,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_010_nondet_assign_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_010_nondet_assign_testcode.mps
index fb4f30341..cc5796613 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_010_nondet_assign_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_010_nondet_assign_testcode.mps
@@ -45,15 +45,15 @@
       <concept id="1714872972660411054" name="com.mbeddr.formal.spin.structure.CharLiteral" flags="ng" index="lAZ_c">
         <property id="1714872972660411076" name="value" index="lAZ$A" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="3050019586774684052" name="com.mbeddr.formal.spin.structure.LessExpression" flags="ng" index="2xSS$N" />
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_015_random_assign_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_015_random_assign_testcode.mps
index 2fabb55e6..195fae620 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_015_random_assign_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_015_random_assign_testcode.mps
@@ -49,10 +49,10 @@
       <concept id="1714872972660411054" name="com.mbeddr.formal.spin.structure.CharLiteral" flags="ng" index="lAZ_c">
         <property id="1714872972660411076" name="value" index="lAZ$A" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="3050019586774684052" name="com.mbeddr.formal.spin.structure.LessExpression" flags="ng" index="2xSS$N" />
@@ -60,7 +60,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -83,7 +83,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_020_assume_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_020_assume_testcode.mps
index fd7ee5a36..2bce6bfa0 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_020_assume_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_020_assume_testcode.mps
@@ -39,15 +39,15 @@
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
       <concept id="1714872972675815455" name="com.mbeddr.formal.spin.structure.AndExpression" flags="ng" index="kzIJX" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="3050019586774684052" name="com.mbeddr.formal.spin.structure.LessExpression" flags="ng" index="2xSS$N" />
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -75,7 +75,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_030_loops_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_030_loops_testcode.mps
index 828e8b836..6dda479be 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_030_loops_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_030_loops_testcode.mps
@@ -75,11 +75,11 @@
       </concept>
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -102,7 +102,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_040_nondet_choice_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_040_nondet_choice_testcode.mps
index 1ca52b906..edb6730f8 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_040_nondet_choice_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_040_nondet_choice_testcode.mps
@@ -59,7 +59,7 @@
       <concept id="1714872972660411054" name="com.mbeddr.formal.spin.structure.CharLiteral" flags="ng" index="lAZ_c">
         <property id="1714872972660411076" name="value" index="lAZ$A" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774684045" name="com.mbeddr.formal.spin.structure.GreaterEqualsExpression" flags="ng" index="2xSS$E" />
@@ -68,7 +68,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -87,7 +87,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_050_when_do_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_050_when_do_testcode.mps
index 8de1997bf..fd4eb12ab 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_050_when_do_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_050_when_do_testcode.mps
@@ -43,12 +43,12 @@
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
       <concept id="1714872972675815455" name="com.mbeddr.formal.spin.structure.AndExpression" flags="ng" index="kzIJX" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774684031" name="com.mbeddr.formal.spin.structure.EqualsExpression" flags="ng" index="2xSSBo" />
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616790990" name="com.mbeddr.formal.spin.structure.NotExpression" flags="ng" index="1a3nki" />
@@ -67,7 +67,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_100_combinatorial_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_100_combinatorial_testcode.mps
index 9f8df2a70..fd0cf5ec4 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_100_combinatorial_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_100_combinatorial_testcode.mps
@@ -50,14 +50,14 @@
       <concept id="5285453794053229581" name="com.mbeddr.formal.spin.structure.StringLiteral" flags="ng" index="2m4jwP">
         <property id="5285453794053229582" name="value" index="2m4jwQ" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774684031" name="com.mbeddr.formal.spin.structure.EqualsExpression" flags="ng" index="2xSSBo" />
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616790990" name="com.mbeddr.formal.spin.structure.NotExpression" flags="ng" index="1a3nki" />
@@ -90,7 +90,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
index db2077018..c0c4bad2d 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" 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" />
@@ -100,7 +100,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -114,7 +114,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -131,6 +131,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" />
@@ -187,7 +188,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,7 +199,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -2325,7 +2325,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4ZxQD5y5Ddv" role="1m5AlR">
                                     <node concept="37vLTw" id="4ZxQD5y5Ddw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4ZxQD5y5Dd_" resolve="it" />
+                                      <ref role="3cqZAo" node="2hED36EYkTd" resolve="it" />
                                     </node>
                                     <node concept="2Rxl7S" id="4ZxQD5y5Ddx" role="2OqNvi" />
                                   </node>
@@ -2343,9 +2343,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="4ZxQD5y5Dd_" role="1bW2Oz">
+                        <node concept="gl6BB" id="2hED36EYkTd" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4ZxQD5y5DdA" role="1tU5fm" />
+                          <node concept="2jxLKc" id="2hED36EYkTe" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
index 42a1009ce..1343701a8 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
   </languages>
   <imports>
@@ -66,7 +66,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -95,7 +95,7 @@
       <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_testcode.mps
index c51743301..a1d35fd40 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_testcode.mps
@@ -93,10 +93,10 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -106,7 +106,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -147,7 +147,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_tests@tests.mps
index 04c609273..06ae277aa 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_110_hdl_external_c_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@@ -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" />
       </concept>
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_005_basic_constructs_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_005_basic_constructs_testcode.mps
index 868cb2c38..75c6badce 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_005_basic_constructs_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_005_basic_constructs_testcode.mps
@@ -11,10 +11,10 @@
       <concept id="1714872972675815456" name="com.mbeddr.formal.spin.structure.OrExpression" flags="ng" index="kzIJ2" />
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -73,7 +73,7 @@
         <child id="70889840698433512" name="arguments" index="XY4o7" />
         <child id="70889840698406176" name="body" index="XYeNf" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2291855968616524582" name="com.mbeddr.formal.spin.structure.SkipStatement" flags="ng" index="1asmnU" />
@@ -105,7 +105,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_050_specs_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_050_specs_testcode.mps
index 778a62c2c..40a2880c0 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_050_specs_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_050_specs_testcode.mps
@@ -12,10 +12,10 @@
         <child id="5285453794052877280" name="lhs" index="2m6DZo" />
         <child id="5285453794052877282" name="rhs" index="2m6DZq" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="7611646782271350980" name="init" index="3WDmyJ" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -60,7 +60,7 @@
       <concept id="4613921340552550723" name="com.mbeddr.formal.spin.structure.AtomicBlock" flags="ng" index="Xfmx0">
         <child id="4613921340552550736" name="stmts" index="Xfmxj" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="6785924186075445303" name="com.mbeddr.formal.spin.structure.AssignmentExpression" flags="ng" index="1pV$CJ" />
@@ -90,7 +90,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_500_default_witness_testcode.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_500_default_witness_testcode.mps
index 7364d45ac..9ce8d9735 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_500_default_witness_testcode.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/test.mbeddr.formal.spin._010_promela_500_default_witness_testcode.mps
@@ -9,7 +9,7 @@
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
       <concept id="5285453794052877353" name="com.mbeddr.formal.spin.structure.LocalVarRef" flags="ng" index="2m6Dwh" />
       <concept id="5285453794052877159" name="com.mbeddr.formal.spin.structure.PromelaLocalVariableDeclaration" flags="ng" index="2m6DXv" />
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -46,7 +46,7 @@
       <concept id="4613921340552778828" name="com.mbeddr.formal.spin.structure.RunOperator" flags="ng" index="Xeulf">
         <reference id="4613921340552778838" name="proc" index="Xeull" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="1112787102640204567" name="com.mbeddr.formal.spin.structure.ChoiceStatement" flags="ng" index="1kW0bI" />
@@ -62,7 +62,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
index f528bdfd0..955edb4da 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.mbeddr.formal.spin" uuid="e426e4c3-de55-4827-bb52-c2b0700e1554" moduleVersion="0" compileInMPS="true">
+<solution name="test.mbeddr.formal.spin" uuid="e426e4c3-de55-4827-bb52-c2b0700e1554" 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">9ce94094-51d9-4013-bdfc-e4db03298f9f(com.mbeddr.formal.spin.pluginSolution)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -38,7 +37,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mpsbasics/.mps/migration.xml b/code/languages/com.mpsbasics/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/languages/com.mpsbasics/.mps/migration.xml
+++ b/code/languages/com.mpsbasics/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/com.mpsbasics.build.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/com.mpsbasics.build.msd
index 8c830e2eb..30932c7fb 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/com.mpsbasics.build.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/com.mpsbasics.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.build" uuid="ff2a102e-f030-4756-a6c9-02da709c686f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mpsbasics.build" uuid="ff2a102e-f030-4756-a6c9-02da709c686f" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
   </dependencies>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps
index 0120ff839..14b605d18 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps
@@ -64,7 +64,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" />
@@ -80,7 +80,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd
index c924ac382..431dc6750 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.docx4j.core" uuid="fdd69818-de3d-4ebf-9ec6-17ea152db151" moduleVersion="0" compileInMPS="true">
+<solution name="com.mpsbasics.docx4j.core" uuid="fdd69818-de3d-4ebf-9ec6-17ea152db151" moduleVersion="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">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.paths.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.paths.mps
index 9f5343cd6..fbd5f5fae 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.paths.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.paths.mps
@@ -74,7 +74,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -89,7 +89,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">
@@ -101,7 +101,7 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.registry.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.registry.mps
index 8103af368..44afc5d1a 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.registry.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.registry.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="5zxs" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging.packages(com.mpsbasics.docx4j.lib/)" />
@@ -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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -76,7 +76,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.test_utils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.test_utils.mps
index 179ca1268..d5287e6d6 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.test_utils.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.test_utils.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -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>
@@ -125,7 +125,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">
@@ -138,7 +138,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
index 48eca90a3..b89c597a0 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
@@ -91,7 +91,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -212,7 +212,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -248,7 +248,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -292,6 +292,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" />
@@ -367,7 +368,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>
@@ -402,7 +403,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="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
         <child id="4611582986551314344" name="requestedType" index="UnYnz" />
       </concept>
@@ -3621,7 +3621,7 @@
                       </node>
                       <node concept="2OqwBi" id="7SQqK0Fk5KA" role="33vP2m">
                         <node concept="37vLTw" id="7SQqK0Fk5KB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7SQqK0Fdk4V" resolve="it" />
+                          <ref role="3cqZAo" node="2hED36CAms1" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7SQqK0Fk5KC" role="2OqNvi">
                           <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent()" resolve="getComponent" />
@@ -3709,9 +3709,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="7SQqK0Fdk4V" role="1bW2Oz">
+                <node concept="gl6BB" id="2hED36CAms1" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7SQqK0Fdk4W" role="1tU5fm" />
+                  <node concept="2jxLKc" id="2hED36CAms2" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -5946,14 +5946,14 @@
                         <node concept="1rXfSq" id="38aFq1jl25G" role="3clFbG">
                           <ref role="37wK5l" node="38aFq1jlbBT" resolve="doCheckCanComputeString4DefaultEditor" />
                           <node concept="37vLTw" id="38aFq1jl25H" role="37wK5m">
-                            <ref role="3cqZAo" node="38aFq1jl25I" resolve="it" />
+                            <ref role="3cqZAo" node="2hED36CAms3" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="38aFq1jl25I" role="1bW2Oz">
+                    <node concept="gl6BB" id="2hED36CAms3" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="38aFq1jl25J" role="1tU5fm" />
+                      <node concept="2jxLKc" id="2hED36CAms4" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd
index 7176a20c9..ccc9ba5ef 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.docx4j.lib" uuid="71bb25aa-20fa-4c18-8954-1b176576f52d" moduleVersion="0" compileInMPS="true">
+<solution name="com.mpsbasics.docx4j.lib" uuid="71bb25aa-20fa-4c18-8954-1b176576f52d" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="docx4j-JAXB-MOXy-11.4.5.jar" />
       <sourceRoot location="org.eclipse.persistence.asm-9.1.0.jar" />
       <sourceRoot location="org.eclipse.persistence.core-3.0.2.jar" />
       <sourceRoot location="org.eclipse.persistence.moxy-3.0.2.jar" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="antlr-2.7.7.jar" />
       <sourceRoot location="antlr-runtime-3.5.2.jar" />
       <sourceRoot location="checker-qual-2.8.1.jar" />
@@ -40,49 +40,46 @@
       <sourceRoot location="xmlgraphics-commons-2.7.jar" />
       <sourceRoot location="docx4j-diffx-11.4.7.jar" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="docx4j-diffx-11.4.7.jar" />
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="no">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
+      <library location="${module}/lib/antlr-2.7.7.jar" />
+      <library location="${module}/lib/antlr-runtime-3.5.2.jar" />
+      <library location="${module}/lib/checker-qual-2.8.1.jar" />
+      <library location="${module}/lib/commons-codec-1.12.jar" />
+      <library location="${module}/lib/commons-compress-1.21.jar" />
+      <library location="${module}/lib/commons-io-2.7.jar" />
+      <library location="${module}/lib/commons-lang3-3.9.jar" />
+      <library location="${module}/lib/docx4j-core-11.4.5.jar" />
+      <library location="${module}/lib/docx4j-JAXB-MOXy-11.4.5.jar" />
+      <library location="${module}/lib/docx4j-openxml-objects-11.4.5.jar" />
+      <library location="${module}/lib/docx4j-openxml-objects-pml-11.4.5.jar" />
+      <library location="${module}/lib/docx4j-openxml-objects-sml-11.4.5.jar" />
+      <library location="${module}/lib/error_prone_annotations-2.3.3.jar" />
+      <library location="${module}/lib/fontbox-2.0.24.jar" />
+      <library location="${module}/lib/jakarta.activation-2.0.1.jar" />
+      <library location="${module}/lib/jakarta.mail-2.0.1.jar" />
+      <library location="${module}/lib/jakarta.xml.bind-api-3.0.1.jar" />
+      <library location="${module}/lib/jaxb-svg11-11.4.0.jar" />
+      <library location="${module}/lib/jcl-over-slf4j-2.0.0-alpha5.jar" />
+      <library location="${module}/lib/mbassador-1.3.2.jar" />
+      <library location="${module}/lib/org.eclipse.persistence.asm-9.1.0.jar" />
+      <library location="${module}/lib/org.eclipse.persistence.core-3.0.2.jar" />
+      <library location="${module}/lib/org.eclipse.persistence.moxy-3.0.2.jar" />
+      <library location="${module}/lib/qdox-1.12.jar" />
+      <library location="${module}/lib/slf4j-api-2.0.0-alpha6.jar" />
+      <library location="${module}/lib/stringtemplate-3.2.1.jar" />
+      <library location="${module}/lib/wmf2svg-0.9.8.jar" />
+      <library location="${module}/lib/xalan-interpretive-11.0.0.jar" />
+      <library location="${module}/lib/xalan-serializer-11.0.0.jar" />
+      <library location="${module}/lib/xmlgraphics-commons-2.7.jar" />
+      <library location="${module}/lib/docx4j-diffx-11.4.7.jar" />
     </facet>
   </facets>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/antlr-2.7.7.jar" />
-    <stubModelEntry path="${module}/lib/antlr-runtime-3.5.2.jar" />
-    <stubModelEntry path="${module}/lib/checker-qual-2.8.1.jar" />
-    <stubModelEntry path="${module}/lib/commons-codec-1.12.jar" />
-    <stubModelEntry path="${module}/lib/commons-compress-1.21.jar" />
-    <stubModelEntry path="${module}/lib/commons-io-2.7.jar" />
-    <stubModelEntry path="${module}/lib/commons-lang3-3.9.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-core-11.4.5.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-JAXB-MOXy-11.4.5.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-openxml-objects-11.4.5.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-openxml-objects-pml-11.4.5.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-openxml-objects-sml-11.4.5.jar" />
-    <stubModelEntry path="${module}/lib/error_prone_annotations-2.3.3.jar" />
-    <stubModelEntry path="${module}/lib/fontbox-2.0.24.jar" />
-    <stubModelEntry path="${module}/lib/jakarta.activation-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jakarta.mail-2.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jakarta.xml.bind-api-3.0.1.jar" />
-    <stubModelEntry path="${module}/lib/jaxb-svg11-11.4.0.jar" />
-    <stubModelEntry path="${module}/lib/jcl-over-slf4j-2.0.0-alpha5.jar" />
-    <stubModelEntry path="${module}/lib/mbassador-1.3.2.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.persistence.asm-9.1.0.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.persistence.core-3.0.2.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.persistence.moxy-3.0.2.jar" />
-    <stubModelEntry path="${module}/lib/qdox-1.12.jar" />
-    <stubModelEntry path="${module}/lib/slf4j-api-2.0.0-alpha6.jar" />
-    <stubModelEntry path="${module}/lib/stringtemplate-3.2.1.jar" />
-    <stubModelEntry path="${module}/lib/wmf2svg-0.9.8.jar" />
-    <stubModelEntry path="${module}/lib/xalan-interpretive-11.0.0.jar" />
-    <stubModelEntry path="${module}/lib/xalan-serializer-11.0.0.jar" />
-    <stubModelEntry path="${module}/lib/xmlgraphics-commons-2.7.jar" />
-    <stubModelEntry path="${module}/lib/docx4j-diffx-11.4.7.jar" />
-  </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">b55d8dfc-0d9d-43d5-886d-c644e7083bff(jetbrains.mps.java.stub)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd
index d70e67252..07ffb6314 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.docx4j.sandbox" uuid="4873b1ba-f6ea-47dc-9bbb-d06832e5ce7a" moduleVersion="0" pluginKind="PLUGIN_EDITOR" compileInMPS="true">
+<solution name="com.mpsbasics.docx4j.sandbox" uuid="4873b1ba-f6ea-47dc-9bbb-d06832e5ce7a" moduleVersion="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">fdd69818-de3d-4ebf-9ec6-17ea152db151(com.mpsbasics.docx4j.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -23,11 +22,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.java_baselanguage_serializers.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.java_baselanguage_serializers.mps
index 6b148729d..6f2befeaa 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.java_baselanguage_serializers.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.java_baselanguage_serializers.mps
@@ -30,7 +30,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -79,7 +79,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -100,7 +100,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">
@@ -140,7 +140,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.plugin.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.plugin.mps
index f4f5811dd..06208c085 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.plugin.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/models/com.mpsbasics.docx4j.sandbox.plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:d8811685-26fc-4ee1-a838-59d76f2ff5b8(com.mpsbasics.docx4j.sandbox.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
@@ -29,6 +29,7 @@
       </concept>
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="4692598989365753297" name="updateInBackground" index="1rBW0U" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
         <child id="8976425910813834639" name="icon" index="3Uehp1" />
@@ -51,7 +52,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -110,7 +111,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>
@@ -118,14 +119,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="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -141,7 +142,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -171,6 +172,7 @@
   <node concept="sE7Ow" id="2w5Gq4UtlOH">
     <property role="TrG5h" value="SerializeJava2Word" />
     <property role="2uzpH1" value="Serialize Java Class to Word" />
+    <property role="1rBW0U" value="true" />
     <node concept="2S4$dB" id="2w5Gq4Utm4H" role="1NuT2Z">
       <property role="TrG5h" value="node" />
       <node concept="3Tm6S6" id="2w5Gq4Utm4I" role="1B3o_S" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/com.mpsbasics.snode.utils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/com.mpsbasics.snode.utils.msd
index 1195f3e47..6a27f4722 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/com.mpsbasics.snode.utils.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/com.mpsbasics.snode.utils.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.snode.utils" uuid="8da51702-0e05-44c8-96db-8f11d1457c0c" moduleVersion="0" compileInMPS="true">
+<solution name="com.mpsbasics.snode.utils" uuid="8da51702-0e05-44c8-96db-8f11d1457c0c" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -10,7 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
index 1ec56e6ae..c438b232c 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
@@ -85,7 +85,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -102,7 +102,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -117,6 +117,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" />
@@ -131,7 +132,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>
@@ -148,7 +149,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
     </language>
   </registry>
   <node concept="312cEu" id="62$$j6uTSaU">
@@ -279,7 +279,7 @@
                           <node concept="1rXfSq" id="62$$j6uV7TK" role="3clFbG">
                             <ref role="37wK5l" node="62$$j6uU1iZ" resolve="doComputeHashCode" />
                             <node concept="37vLTw" id="62$$j6uV8FS" role="37wK5m">
-                              <ref role="3cqZAo" node="62$$j6uV7On" resolve="it" />
+                              <ref role="3cqZAo" node="2hED36CAms5" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="62$$j6uV8Mi" role="37wK5m">
                               <ref role="3cqZAo" node="62$$j6uV34i" resolve="builder" />
@@ -287,9 +287,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="62$$j6uV7On" role="1bW2Oz">
+                      <node concept="gl6BB" id="2hED36CAms5" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="62$$j6uV7Oo" role="1tU5fm" />
+                        <node concept="2jxLKc" id="2hED36CAms6" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd b/code/languages/repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
index 6280df613..0e6e0194c 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.meta.linters" uuid="97efeb54-e757-4c3b-b175-aa20f7476a23" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.meta.linters" uuid="97efeb54-e757-4c3b-b175-aa20f7476a23" moduleVersion="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">a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9(org.mpsqa.lint.generic.linters_library)</dependency>
     <dependency reexport="false">12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)</dependency>
@@ -18,7 +17,7 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
index 6e32f868e..1b5836fa1 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -13,7 +13,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -23,7 +23,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
index 3cf9d2555..8e7c57f50 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
@@ -13,7 +13,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -23,7 +23,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
index 5a9011dcc..b182b029c 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
@@ -13,7 +13,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -23,7 +23,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
index dcaebdf1e..196660d84 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
@@ -13,7 +13,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -23,7 +23,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
index 2413f0360..b61171427 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
@@ -12,7 +12,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -22,7 +22,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
index f67c9abdd..6170e021a 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
@@ -12,7 +12,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -22,7 +22,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
index 41585a172..bccadde13 100644
--- a/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
+++ b/code/languages/repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
@@ -13,7 +13,7 @@
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
-      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ng" index="2j1LY6">
+      <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
       </concept>
       <concept id="7741759128795045754" name="org.mpsqa.lint.generic.structure.CheckableScriptParameterRef" flags="ng" index="2j1LYi">
@@ -23,7 +23,7 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ng" index="2oM2l5">
+      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
         <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
       </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
diff --git a/code/tutorial-mdcc/.mps/migration.xml b/code/tutorial-mdcc/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/tutorial-mdcc/.mps/migration.xml
+++ b/code/tutorial-mdcc/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/com.mbeddr.formal.mdcc.tutorial.msd b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/com.mbeddr.formal.mdcc.tutorial.msd
index 927ec3617..bf420fea7 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/com.mbeddr.formal.mdcc.tutorial.msd
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/com.mbeddr.formal.mdcc.tutorial.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.mdcc.tutorial" uuid="bf49e807-bee9-4ef9-ba45-6c8d19acf71f" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.mdcc.tutorial" uuid="bf49e807-bee9-4ef9-ba45-6c8d19acf71f" moduleVersion="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:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:810b1f0c-97b8-4211-8a3c-55a39bac8bee:com.mbeddr.formal.base.analyses" version="0" />
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_010_lesson_01.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_010_lesson_01.mps
index 28924d52b..81392c69e 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_010_lesson_01.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_010_lesson_01.mps
@@ -64,14 +64,14 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -99,7 +99,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_020_lesson_02.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_020_lesson_02.mps
index 4aecb954c..b8a906fb8 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_020_lesson_02.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_020_lesson_02.mps
@@ -53,17 +53,17 @@
       <concept id="5285453794053229581" name="com.mbeddr.formal.spin.structure.StringLiteral" flags="ng" index="2m4jwP">
         <property id="5285453794053229582" name="value" index="2m4jwQ" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -92,7 +92,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_030_lesson_03.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_030_lesson_03.mps
index 5fade6c06..361ddbad6 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_030_lesson_03.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_030_lesson_03.mps
@@ -88,10 +88,10 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
-      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ng" index="2m6DZR">
+      <concept id="5285453794052877263" name="com.mbeddr.formal.spin.structure.IVariableDeclaration" flags="ngI" index="2m6DZR">
         <child id="2417655713193036543" name="postfixTypeQualifier" index="3RBrvK" />
       </concept>
       <concept id="5285453794052597017" name="com.mbeddr.formal.spin.structure.StatementsList" flags="ng" index="2mpP4x">
@@ -102,7 +102,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
       <concept id="2417655713193036564" name="com.mbeddr.formal.spin.structure.ArrayQualifier" flags="ng" index="3RBror">
@@ -141,7 +141,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_040_lesson_04.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_040_lesson_04.mps
index 8aa40806e..08faa0222 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_040_lesson_04.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_040_lesson_04.mps
@@ -70,7 +70,7 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774684038" name="com.mbeddr.formal.spin.structure.GreaterExpression" flags="ng" index="2xSS$x" />
@@ -78,7 +78,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -122,7 +122,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_050_lesson_05.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_050_lesson_05.mps
index 17a6efeda..9d6f6e5b8 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_050_lesson_05.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_050_lesson_05.mps
@@ -81,14 +81,14 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -121,7 +121,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_060_lesson_06.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_060_lesson_06.mps
index d6b4f4945..4085a4265 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_060_lesson_06.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_060_lesson_06.mps
@@ -88,7 +88,7 @@
       <concept id="4764496254763748531" name="com.mbeddr.formal.spin.hdl.structure.HDLCommentLine" flags="ng" index="3GKqyE" />
     </language>
     <language id="ad8d48af-022b-40dc-8979-2b76074fb438" name="com.mbeddr.formal.spin">
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774684031" name="com.mbeddr.formal.spin.structure.EqualsExpression" flags="ng" index="2xSSBo" />
@@ -96,7 +96,7 @@
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -129,7 +129,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_070_lesson_07.mps b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_070_lesson_07.mps
index f6b6e1d86..b79f31cc1 100644
--- a/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_070_lesson_07.mps
+++ b/code/tutorial-mdcc/solutions/com.mbeddr.formal.mdcc.tutorial/models/_070_lesson_07.mps
@@ -73,14 +73,14 @@
       <concept id="1714872972660411054" name="com.mbeddr.formal.spin.structure.CharLiteral" flags="ng" index="lAZ_c">
         <property id="1714872972660411076" name="value" index="lAZ$A" />
       </concept>
-      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ng" index="2m6DZO">
+      <concept id="5285453794052877260" name="com.mbeddr.formal.spin.structure.IVariableReference" flags="ngI" index="2m6DZO">
         <reference id="5285453794052877261" name="var" index="2m6DZP" />
       </concept>
       <concept id="3050019586774688801" name="com.mbeddr.formal.spin.structure.NotEqualsExpression" flags="ng" index="2xSVM6" />
       <concept id="5430620409972500087" name="com.mbeddr.formal.spin.structure.CommentLine" flags="ng" index="Pedoa">
         <property id="5430620409972500140" name="text" index="Pedrh" />
       </concept>
-      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ng" index="1a0DGj">
+      <concept id="2291855968617420239" name="com.mbeddr.formal.spin.structure.ITyped" flags="ngI" index="1a0DGj">
         <child id="2291855968617420240" name="tpe" index="1a0DGc" />
       </concept>
     </language>
@@ -111,7 +111,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/.mps/migration.xml b/code/tutorial-safety/.mps/migration.xml
index 1c00245e0..d62e30e57 100644
--- a/code/tutorial-safety/.mps/migration.xml
+++ b/code/tutorial-safety/.mps/migration.xml
@@ -9,6 +9,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
index b0f853cbc..22a45be3e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.tutorial" uuid="7a642ffb-bd05-4e8c-b81a-08fde9a204ba" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.tutorial" uuid="7a642ffb-bd05-4e8c-b81a-08fde9a204ba" moduleVersion="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">676b5323-9c6d-4b8d-a4fc-5d159c3d8aed(com.mbeddr.formal.safety.gsn.patterns.lib)</dependency>
     <dependency reexport="false">d873c9ba-1199-4310-897d-5fa1a905f179(com.mbeddr.formal.safety.users_guide)</dependency>
@@ -84,7 +83,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:1839bec5-cea6-41df-b9e0-c405ff35c41e:jetbrains.mps.lang.editor.imageGen" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
index 81ca56d98..7d7fb9a47 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
@@ -9,10 +9,10 @@
   <imports />
   <registry>
     <language id="5ff577d1-1817-495b-9d6c-ff7b52c68609" name="com.mbeddr.formal.req.tl_patterns">
-      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ng" index="Sxolh">
+      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ngI" index="Sxolh">
         <child id="7632099376746146980" name="time" index="Sxolm" />
       </concept>
-      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ng" index="SB3Yt">
+      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ngI" index="SB3Yt">
         <child id="7632099376746632816" name="probability" index="SB3Y2" />
       </concept>
       <concept id="7632099376746544950" name="com.mbeddr.formal.req.tl_patterns.structure.HighProbabilityBound" flags="ng" index="SBTr4" />
@@ -53,7 +53,7 @@
       <concept id="2184270308345955043" name="com.mbeddr.formal.req.tl_patterns.structure.Time" flags="ng" index="3gddiA">
         <child id="2184270308345955380" name="unit" index="3gdd9L" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
       <concept id="6544290145033328590" name="com.mbeddr.formal.req.tl_patterns.structure.TextualExpression" flags="ng" index="3z7eFS">
@@ -279,7 +279,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -335,7 +335,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423290" name="com.mbeddr.formal.base.arch.structure.ComponentAssembly" flags="ng" index="3Ug1$x">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis.mps
index 1f48ea3cd..9bfbdfe71 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis.mps
@@ -71,10 +71,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -95,7 +95,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._030_safety_requirements.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._030_safety_requirements.mps
index 39ebfb735..05f1951ef 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._030_safety_requirements.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._030_safety_requirements.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/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
index 1ddb2e215..49944e5c3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
@@ -148,7 +148,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1239,28 +1239,28 @@
           <property role="TrG5h" value="speed__speed too low" />
         </node>
         <node concept="21oswF" id="12q9egMHORW" role="3CrHoS">
-          <ref role="21oszt" node="12q9egMHORU" resolve="" />
+          <ref role="21oszt" node="12q9egMHORU" resolve="Or Gate 1" />
           <ref role="21oszj" node="12q9egMHORV" resolve="speed__speed too low" />
         </node>
         <node concept="21ATtL" id="12q9egMHORX" role="3CrHoS">
           <property role="TrG5h" value="speed__speed too high" />
         </node>
         <node concept="21oswF" id="12q9egMHORY" role="3CrHoS">
-          <ref role="21oszt" node="12q9egMHORU" resolve="" />
+          <ref role="21oszt" node="12q9egMHORU" resolve="Or Gate 1" />
           <ref role="21oszj" node="12q9egMHORX" resolve="speed__speed too high" />
         </node>
         <node concept="cFNQA" id="12q9egMHORU" role="3CrHoS">
           <property role="TrG5h" value="Or Gate 1" />
         </node>
         <node concept="21oswF" id="12q9egMHORZ" role="3CrHoS">
-          <ref role="21oszt" node="12q9egMHORT" resolve="" />
-          <ref role="21oszj" node="12q9egMHORU" resolve="" />
+          <ref role="21oszt" node="12q9egMHORT" resolve="Or Gate 2" />
+          <ref role="21oszj" node="12q9egMHORU" resolve="Or Gate 1" />
         </node>
         <node concept="21ATtL" id="12q9egMHOS0" role="3CrHoS">
           <property role="TrG5h" value="innacurate_computation" />
         </node>
         <node concept="21oswF" id="12q9egMHOS1" role="3CrHoS">
-          <ref role="21oszt" node="12q9egMHORT" resolve="" />
+          <ref role="21oszt" node="12q9egMHORT" resolve="Or Gate 2" />
           <ref role="21oszj" node="12q9egMHOS0" resolve="innacurate_computation" />
         </node>
         <node concept="cFNQA" id="12q9egMHORT" role="3CrHoS">
@@ -1268,7 +1268,7 @@
         </node>
         <node concept="21oswF" id="12q9egMHOS2" role="3CrHoS">
           <ref role="21oszt" node="12q9egMHORL" resolve="plausibilizedSpeed__speed innacurate" />
-          <ref role="21oszj" node="12q9egMHORT" resolve="" />
+          <ref role="21oszj" node="12q9egMHORT" resolve="Or Gate 2" />
         </node>
         <node concept="37mRI7" id="12q9egMHOTv" role="lGtFl">
           <node concept="37mRIm" id="12q9egMHOTw" role="37mRID">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
index dd18ce326..14fa95767 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
@@ -28,7 +28,7 @@
       <concept id="3731513482756195661" name="com.mbeddr.formal.safety.argument.process.structure.Standard" flags="ng" index="3dyRFK">
         <child id="3731513482756244090" name="clauses" index="3dzbR7" />
       </concept>
-      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ng" index="3dyRFN">
+      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ngI" index="3dyRFN">
         <property id="3731513482756243948" name="publicationYear" index="3dzbTh" />
         <property id="3731513482756243946" name="longTitle" index="3dzbTn" />
       </concept>
@@ -98,7 +98,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>
@@ -106,7 +106,7 @@
       <concept id="2210355370893864968" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.URLEvidenceDocument" flags="ng" index="2Fbr9R">
         <property id="2210355370893864971" name="url" index="2Fbr9O" />
       </concept>
-      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ng" index="2Fbr9U">
+      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ngI" index="2Fbr9U">
         <child id="2210355370893974680" name="explanation" index="2FbXVB" />
       </concept>
       <concept id="4043927170651692617" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.ExternalEvidenceDocument" flags="ng" index="K87gv">
@@ -167,17 +167,17 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
         <property id="3731513482755309878" name="idPrefix" index="3dZJUb" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
@@ -201,7 +201,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTZ" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc.mps
index 84d42f141..f3ea31c02 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc.mps
@@ -28,7 +28,7 @@
       <concept id="5785245534400277706" name="com.mbeddr.doc.structure.TextBlockTableCell" flags="ng" index="C7FVz">
         <child id="5785245534400277707" name="text" index="C7FVy" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="6386504476136472795" name="com.mbeddr.doc.structure.PathDefinition" flags="ng" index="2SbYGw">
@@ -45,7 +45,7 @@
       <concept id="5185579450379471854" name="com.mbeddr.doc.structure.TableRow" flags="ng" index="1xAuFB">
         <child id="5185579450379471857" name="cells" index="1xAuFS" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -89,7 +89,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -126,7 +126,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae.mps
index 3deee789b..0d757a020 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae.mps
@@ -16,7 +16,7 @@
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
       <concept id="9296093157844054" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryDefinition" flags="ng" index="1qmubD" />
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
       <concept id="1629165016568013909" name="com.mbeddr.formal.safety.gsn.ext.structure.PatternInstance" flags="ng" index="1VB52A">
@@ -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/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn.mps
index 9cd994665..348c805db 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn.mps
@@ -17,7 +17,7 @@
       </concept>
       <concept id="9296093157844055" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryGoalRef" flags="ng" index="1qmubC" />
       <concept id="9296093157844054" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryDefinition" flags="ng" index="1qmubD" />
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
       <concept id="1629165016568013909" name="com.mbeddr.formal.safety.gsn.ext.structure.PatternInstance" flags="ng" index="1VB52A">
@@ -39,7 +39,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/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models.mps
index fff2eb75e..7f9e9a76e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models.mps
@@ -33,7 +33,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
       </concept>
       <concept id="1639692281461329473" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.GSNAttributeParticipantRef" flags="ng" index="1vGDkK">
@@ -49,7 +49,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -77,13 +77,13 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
index c4bfb1043..883cf150a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
@@ -201,10 +201,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
@@ -239,7 +239,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -301,7 +301,7 @@
       <concept id="79421622115107638" name="com.mbeddr.formal.safety.gsn.smv.structure.SmvResultsSolution" flags="ng" index="1$GyEX" />
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
@@ -350,7 +350,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
index 095bd9c1e..d48ab6b4a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
@@ -251,10 +251,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -295,7 +295,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>
@@ -361,7 +361,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
index 4bb088ae7..f87bbe625 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
@@ -188,10 +188,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -244,7 +244,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -302,7 +302,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
index e58698bbb..36abce17a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
@@ -225,10 +225,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -288,7 +288,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>
@@ -348,7 +348,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
index 3dd1902d2..69667256c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
@@ -215,10 +215,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -274,7 +274,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">
@@ -341,7 +341,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
index ae0329141..246d503f0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
@@ -121,10 +121,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPB" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -173,7 +173,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
index 3ef6d717d..4961c0e53 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
@@ -55,10 +55,10 @@
       </concept>
     </language>
     <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
-      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" index="8gIbR">
         <property id="3226630706269685486" name="id" index="0lsPA" />
       </concept>
-      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
@@ -79,7 +79,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
index 2c45a3771..b893ff0c8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
@@ -60,7 +60,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
index 9b93993f6..4c9ecfa2f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
@@ -74,7 +74,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
index a12e59415..c940c6b47 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
@@ -228,7 +228,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>
@@ -270,7 +270,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
index a673787c8..b5d61122b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case.mps
index 09a17699d..d8c71e5b6 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case.mps
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized.mps
index 8cf1171db..3acf8b3e7 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized.mps
@@ -20,7 +20,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/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
index 805345b2d..480338445 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.safety.users_guide" uuid="d873c9ba-1199-4310-897d-5fa1a905f179" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.safety.users_guide" uuid="d873c9ba-1199-4310-897d-5fa1a905f179" moduleVersion="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">7a642ffb-bd05-4e8c-b81a-08fde9a204ba(com.mbeddr.formal.safety.tutorial)</dependency>
     <dependency reexport="false">676b5323-9c6d-4b8d-a4fc-5d159c3d8aed(com.mbeddr.formal.safety.gsn.patterns.lib)</dependency>
@@ -30,7 +29,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
index a113763d7..3c9233bb2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
@@ -37,7 +37,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -101,7 +101,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -136,7 +136,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/.mps/migration.xml b/code/tutorial/.mps/migration.xml
index 1710be715..a2e96ad57 100644
--- a/code/tutorial/.mps/migration.xml
+++ b/code/tutorial/.mps/migration.xml
@@ -10,6 +10,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
-    <entry key="project.migrated.version" value="223" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="project.migrated.version" value="232" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/com.mbeddr.formal.nusmv.tutorial.msd b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/com.mbeddr.formal.nusmv.tutorial.msd
index 92dba5f99..04d1181e7 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/com.mbeddr.formal.nusmv.tutorial.msd
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/com.mbeddr.formal.nusmv.tutorial.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.tutorial" uuid="da511aba-2a36-47c9-bb4c-a869a0a1a55e" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.tutorial" uuid="da511aba-2a36-47c9-bb4c-a869a0a1a55e" moduleVersion="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">2dd5dace-06d5-4283-a878-7272f2df6d4b(com.mbeddr.formal.nusmv.operatorspanel)</dependency>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._010_nusmv_base.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._010_nusmv_base.mps
index 53593150c..e49d0f8af 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._010_nusmv_base.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._010_nusmv_base.mps
@@ -20,7 +20,7 @@
       <concept id="747060984333127928" name="com.mbeddr.formal.nusmv.source.structure.CheckCTLSpec" flags="ng" index="3uTczT" />
     </language>
     <language id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv">
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -140,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._015_nusmv_ext.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._015_nusmv_ext.mps
index 9cc681287..3315fbf4c 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._015_nusmv_ext.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._015_nusmv_ext.mps
@@ -83,7 +83,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" 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/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._020_nusmv_unit_tests.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._020_nusmv_unit_tests.mps
index 068635603..a786edc1d 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._020_nusmv_unit_tests.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._020_nusmv_unit_tests.mps
@@ -19,7 +19,7 @@
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636880" name="com.mbeddr.formal.nusmv.structure.GreaterExpression" flags="ng" index="nE0YJ" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -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>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._030_nusmv_architecture.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._030_nusmv_architecture.mps
index 9d7515bf3..b948f885b 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._030_nusmv_architecture.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._030_nusmv_architecture.mps
@@ -17,7 +17,7 @@
       <concept id="4599377533215110828" name="com.mbeddr.formal.nusmv.arch.structure.ModulesWiringSection" flags="ng" index="18TFfj" />
     </language>
     <language id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv">
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -98,7 +98,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -154,7 +154,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._040_nusmv_state_machines.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._040_nusmv_state_machines.mps
index 02e814516..5cb595fa8 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._040_nusmv_state_machines.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._040_nusmv_state_machines.mps
@@ -129,7 +129,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._050_nusmv_tables.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._050_nusmv_tables.mps
index 1d9fec57f..7b1873560 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._050_nusmv_tables.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._050_nusmv_tables.mps
@@ -52,7 +52,7 @@
       <concept id="2858146662931636879" name="com.mbeddr.formal.nusmv.structure.LessEqualsExpression" flags="ng" index="nE0YK" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
       <concept id="2707707741262126533" name="com.mbeddr.formal.nusmv.structure.EmptyModuleContent" flags="ng" index="s4Ewt" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -169,7 +169,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._060_nusmv_spec_patterns.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._060_nusmv_spec_patterns.mps
index fb8790cd8..31cf52b5e 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._060_nusmv_spec_patterns.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._060_nusmv_spec_patterns.mps
@@ -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/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._070_nusmv_verification_cases.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._070_nusmv_verification_cases.mps
index 4f5eb3b86..079d73aa7 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._070_nusmv_verification_cases.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._070_nusmv_verification_cases.mps
@@ -150,7 +150,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._100_nusmv_operators_panels.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._100_nusmv_operators_panels.mps
index eefb5efa1..297f7b006 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._100_nusmv_operators_panels.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._100_nusmv_operators_panels.mps
@@ -30,7 +30,7 @@
       <concept id="2858146662931636881" name="com.mbeddr.formal.nusmv.structure.GreaterEqualsExpression" flags="ng" index="nE0YI" />
       <concept id="2858146662931636880" name="com.mbeddr.formal.nusmv.structure.GreaterExpression" flags="ng" index="nE0YJ" />
       <concept id="2858146662931636878" name="com.mbeddr.formal.nusmv.structure.LessExpression" flags="ng" index="nE0YL" />
-      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ng" index="skqaJ">
+      <concept id="2707707741266384759" name="com.mbeddr.formal.nusmv.structure.IDefinitionLikeRef" flags="ngI" index="skqaJ">
         <reference id="2707707741266384760" name="definitionLike" index="skqaw" />
       </concept>
       <concept id="2707707741261635555" name="com.mbeddr.formal.nusmv.structure.DocumentationLine" flags="ng" index="sUyCV">
@@ -118,7 +118,7 @@
       </concept>
     </language>
     <language id="3fb92f6f-450c-4e41-8129-97a4b9978951" name="com.mbeddr.formal.base.operatorspanel">
-      <concept id="4261645280576222797" name="com.mbeddr.formal.base.operatorspanel.structure.IColoredShape" flags="ng" index="28kP60">
+      <concept id="4261645280576222797" name="com.mbeddr.formal.base.operatorspanel.structure.IColoredShape" flags="ngI" index="28kP60">
         <child id="4261645280576222798" name="color" index="28kP63" />
       </concept>
       <concept id="4261645280576222595" name="com.mbeddr.formal.base.operatorspanel.structure.ColorDefinition" flags="ng" index="28kP9e">
@@ -220,7 +220,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._010_cbd_lesson_1.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._010_cbd_lesson_1.mps
index a04b2f64f..9a1f3acf4 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._010_cbd_lesson_1.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._010_cbd_lesson_1.mps
@@ -42,7 +42,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/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._020_cbd_lesson_2.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._020_cbd_lesson_2.mps
index 6bbe32947..dcdc14489 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._020_cbd_lesson_2.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._020_cbd_lesson_2.mps
@@ -77,7 +77,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._030_cbd_lesson_3.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._030_cbd_lesson_3.mps
index 50bad8688..9dd87d619 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._030_cbd_lesson_3.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._030_cbd_lesson_3.mps
@@ -122,7 +122,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>
@@ -164,7 +164,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._040_cbd_lesson_4.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._040_cbd_lesson_4.mps
index d058c02f1..600d34a93 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._040_cbd_lesson_4.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd._040_cbd_lesson_4.mps
@@ -86,7 +86,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>
@@ -128,7 +128,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd.mps
index 202c54c06..14d792436 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._300_nusmv_cbd.mps
@@ -193,7 +193,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="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,7 +235,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._500_nusmv_importer.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._500_nusmv_importer.mps
index d5340356b..b64cbf0c9 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._500_nusmv_importer.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_010_features._500_nusmv_importer.mps
@@ -15,7 +15,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_020_real_examples._200_pacemaker.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_020_real_examples._200_pacemaker.mps
index c603b3455..801ff9ea2 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_020_real_examples._200_pacemaker.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.tutorial/models/_020_real_examples._200_pacemaker.mps
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/com.mbeddr.formal.nusmv.users_guide.msd b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/com.mbeddr.formal.nusmv.users_guide.msd
index 027f08ab3..db5671219 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/com.mbeddr.formal.nusmv.users_guide.msd
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/com.mbeddr.formal.nusmv.users_guide.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.formal.nusmv.users_guide" uuid="f31a1542-b112-41ee-b1b8-cb7c860c25e0" moduleVersion="0" compileInMPS="true">
+<solution name="com.mbeddr.formal.nusmv.users_guide" uuid="f31a1542-b112-41ee-b1b8-cb7c860c25e0" moduleVersion="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">da511aba-2a36-47c9-bb4c-a869a0a1a55e(com.mbeddr.formal.nusmv.tutorial)</dependency>
   </dependencies>
@@ -29,7 +28,7 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/models/doc.mps b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/models/doc.mps
index 29873a1d5..7c8adffb4 100644
--- a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/models/doc.mps
+++ b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/models/doc.mps
@@ -37,7 +37,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -102,7 +102,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -140,7 +140,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/gradle.lockfile b/gradle.lockfile
index 5d1b4a96e..5f50cf306 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -1,13 +1,34 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.jetbrains.jdk:jbr_jcef:17.0.6-b653.34=jbrLinux,jbrMac,jbrWin
-com.jetbrains:mps:2022.3.1=mps
-com.mbeddr:platform:2022.3.24165.f0c4f91=languageLibs
+com.fasterxml.jackson.core:jackson-annotations:2.11.4=modelcheckBackend
+com.fasterxml.jackson.core:jackson-core:2.11.4=modelcheckBackend
+com.fasterxml.jackson.core:jackson-databind:2.11.4=modelcheckBackend
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.4=modelcheckBackend
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.4=modelcheckBackend
+com.fasterxml.woodstox:woodstox-core:6.2.3=modelcheckBackend
+com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin
+com.jetbrains:mps:2023.2=mps
+com.mbeddr:platform:2023.2.24284.85fe583=languageLibs
+com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend
+com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend
+de.itemis.mps.build-backends:execute-generators:1.14.2.67.afe740c=generateBackend
+de.itemis.mps.build-backends:execute:1.14.2.67.afe740c=executeBackend
+de.itemis.mps.build-backends:modelcheck:1.14.2.67.afe740c=modelcheckBackend
+de.itemis.mps.build-backends:project-loader:2.0.0.67.afe740c=executeBackend,generateBackend,modelcheckBackend
+jakarta.activation:jakarta.activation-api:1.2.1=modelcheckBackend
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=modelcheckBackend
 junit:junit:4.12=antLib
 org.apache.ant:ant-junit:1.10.6=antLib
 org.apache.ant:ant-launcher:1.10.6=antLib
 org.apache.ant:ant:1.10.6=antLib
+org.codehaus.woodstox:stax2-api:4.2.1=modelcheckBackend
 org.hamcrest:hamcrest-core:1.3=antLib
-org.mpsqa:all-in-one:2022.3.235.5d33320=languageLibs
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=executeBackend,generateBackend,modelcheckBackend
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=executeBackend,generateBackend,modelcheckBackend
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=executeBackend,generateBackend,modelcheckBackend
+org.jetbrains.kotlin:kotlin-stdlib:1.6.10=executeBackend,generateBackend,modelcheckBackend
+org.jetbrains.kotlin:kotlin-test:1.6.10=modelcheckBackend
+org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend
+org.mpsqa:all-in-one:2023.2.264.338602f=languageLibs
 empty=
diff --git a/gradle.properties.example b/gradle.properties.example
deleted file mode 100644
index 5cdcaf8f3..000000000
--- a/gradle.properties.example
+++ /dev/null
@@ -1,5 +0,0 @@
-mpsHomeDir=<path_to_mps_installation_directory>
-mbeddr.formal.home=<path_to_the_current_directory>
-
-gpr.user=<a github user name>
-gpr.token=<token for package access>
\ No newline at end of file