diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e9815d7d..c6777084 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,8 +67,8 @@ jobs:
     - name: Upload distribution
       uses: actions/upload-artifact@v4
       with:
-        name: fasten-distribution-win-2023.2-${{ steps.time.outputs.time }}
-        path: build/distributions/fasten-2023.2-SNAPSHOT-Win-2023.2-SNAPSHOT.zip
+        name: fasten-distribution-win-2024.1-${{ steps.time.outputs.time }}
+        path: build/distributions/fasten-2024.1-SNAPSHOT-Win-2024.1-SNAPSHOT.zip
 
   publish:
     # Only publish on push (to maintenance or master) or on dispatch if requested
diff --git a/README.md b/README.md
index ce5f9493..d41814aa 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_2023.2
+       mpsHomeDir=C:/work/MPS_2024.1
        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 2023.2
+1. [download](https://www.jetbrains.com/mps/download/previous.html) and install MPS 2024.1
 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 f35ab44e..59a776a6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
     id("de.itemis.mps.gradle.common") version mpsGradlePluginVersion
 }
 
-val jbrVers = "17.0.8.1-b1000.32"
+val jbrVers = "17.0.11-b1207.30"
 
 downloadJbr {
     jbrVersion = jbrVers
@@ -35,9 +35,9 @@ if (nexusUsername == null) {
 logger.info("Repository username: {}", nexusUsername)
 
 // Project versions
-val major = "2023"
-val minor = "2"
-val bugfix = ""
+val major = "2024"
+val minor = "1"
+val bugfix = "1"
 
 fun appendOpt(str:String, pre:String) = if(!str.isEmpty()) "${pre}${str}" else ""
 
@@ -98,19 +98,11 @@ configurations {
 dependencyLocking { lockAllConfigurations() }
 
 repositories {
-    val dependencyRepositories = listOf("https://artifacts.itemis.cloud/repository/maven-mps",
-            "https://maven.pkg.github.com/mbeddr/*")
+    val dependencyRepositories = listOf("https://artifacts.itemis.cloud/repository/maven-mps")
 
     for (repoUrl in dependencyRepositories) {
         maven {
             url = uri(repoUrl)
-
-            if (repoUrl.startsWith("https://maven.pkg.github.com/")) {
-                credentials {
-                    username = project.property("gpr.user") as String
-                    password = project.property("gpr.token") as String
-                }
-            }
         }
     }
     mavenCentral()
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 25cd349c..2bfacaad 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -21,6 +21,7 @@
   <property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
   <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
+  <property name="mps.runtimeBuild" value="${import.mps.mps.runtimeBuild}" />
   <property name="mpsBootstrapCore.version.major" value="${import.mps.mpsBootstrapCore.version.major}" />
   <property name="mpsBootstrapCore.version.minor" value="${import.mps.mpsBootstrapCore.version.minor}" />
   <property name="mpsBootstrapCore.version.bugfixNr" value="${import.mps.mpsBootstrapCore.version.bugfixNr}" />
@@ -61,7 +62,6 @@
         <dependencies>
           <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" />
           <module ref="5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)" kind="cl" />
         </dependencies>
         <uses>
@@ -101,7 +101,6 @@
         <dependencies>
           <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" />
           <module ref="5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)" kind="cl" />
         </dependencies>
         <uses>
@@ -133,7 +132,7 @@
       <zipfileset file="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.fasten.assurance.build-models" prefix="module/models" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -161,99 +160,11 @@
     <echo message="generating" />
     <generate fork="true" logLevel="${mps.ant.log}">      
       <settings refid="m2m-defaults" />
-      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" />
-      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" />
-      <plugin path="${artifacts.mps}/plugins/mps-build" />
-      <plugin path="${artifacts.mps}/plugins/mps-core" />
-      <plugin path="${artifacts.org.mpsqa.base}/org.mpsqa.base.build" />
-      <library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.references.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.util.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editing.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/editor/typesystemIntegration.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.kinds.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.skeleton.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.defs.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <library file="${artifacts.mps}/languages/mps-stubs.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.refactoring.platform.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
-      <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" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
-      <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.makeup.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
-      <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" id="com.mbeddr.platform.build" />
+      <plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" id="de.itemis.mps.extensions.build" />
+      <plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
+      <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
+      <plugin path="${artifacts.org.mpsqa.base}/org.mpsqa.base.build" id="org.mpsqa.base.build" />
       <chunk>
         <module file="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd" />
         <module file="${mbeddr.formal.safety.code}/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd" />
@@ -291,6 +202,9 @@
         <fileset file="${artifacts.org.mpsqa.base}/org.mpsqa.base.build/languages/build/org.mpsqa.base.build.jar" />
       </classpath>
     </javac>
+    <copy todir="${build.tmp}/java/out/com.mbeddr.formal.safety.build">
+      <fileset dir="${mbeddr.formal.safety.code}/solutions/com.mbeddr.formal.safety.build/source_gen" excludes="**/*.java" />
+    </copy>
   </target>
   
   <target name="java.compile.com.fasten.assurance.build">
@@ -307,6 +221,9 @@
         <fileset file="${artifacts.org.mpsqa.base}/org.mpsqa.base.build/languages/build/org.mpsqa.base.build.jar" />
       </classpath>
     </javac>
+    <copy todir="${build.tmp}/java/out/com.fasten.assurance.build">
+      <fileset dir="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/source_gen" excludes="**/*.java" />
+    </copy>
   </target>
   
   <target name="cleanSources">
diff --git a/code/languages/com.fasten.symo/.mps/migration.xml b/code/languages/com.fasten.symo/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/languages/com.fasten.symo/.mps/migration.xml
+++ b/code/languages/com.fasten.symo/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 d268f8a6..80724c18 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
@@ -67,7 +67,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml b/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
index 8cebed28..a236af66 100644
--- a/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
@@ -6,7 +6,8 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
     <entry key="project.baseline.version" value="213" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="project.migrated.version" value="241" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
index a2e96ad5..475d1f0b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
@@ -12,6 +12,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 4bc2286b..c89daa07 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
@@ -60,7 +60,6 @@
         <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
         <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
@@ -140,7 +139,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
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 a5a1bcc7..f99e1d86 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
@@ -71,7 +71,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 e227c745..89633635 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
@@ -35,6 +35,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
@@ -83,7 +84,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 25705a0b..493e94f3 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
@@ -27,6 +27,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
@@ -76,7 +77,6 @@
     <module reference="4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
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 b3afeeb1..7304391e 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
@@ -77,7 +77,6 @@
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="7e450f4e-1ac3-41ef-a851-4598161bdb94(de.slisson.mps.tables)" version="0" />
     <module reference="da21218f-a674-474d-8b4e-d59e33007003(de.slisson.mps.tables.runtime)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
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 2980aa60..18f582eb 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
@@ -99,7 +99,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
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 d9cd246e..d48ec580 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
@@ -98,6 +98,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
@@ -161,7 +162,6 @@
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
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 586433bf..d8844e7f 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
@@ -46,6 +46,7 @@
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
@@ -126,6 +127,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
@@ -189,7 +191,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
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 cd77a103..d644aa61 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
@@ -133,6 +133,7 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
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 709f4eb2..624b2c0d 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
@@ -90,6 +90,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
@@ -149,7 +150,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
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 9a4bd2c7..81b992af 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
@@ -132,7 +132,6 @@
     <module reference="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e(com.mbeddr.mpsutil.genreview)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 3a34d746..b6b39547 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
@@ -12,7 +12,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/jfreechart-1.5.3.jar" />
     </facet>
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 3267266b..5507b9e5 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
@@ -32,6 +32,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.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 e0cc4586..408f28c1 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
@@ -15,6 +15,7 @@
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" 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" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="ekwn" ref="r:9832fb5f-2578-4b58-8014-a5de79da988e(jetbrains.mps.ide.editor.actions)" />
@@ -54,6 +55,7 @@
     <import index="xr52" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.ui.tree.smodel(MPS.Platform/)" />
     <import index="zce0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.smodel.action(MPS.Editor/)" />
     <import index="8tyk" ref="r:eb0002ce-67d6-41e9-b36c-361c22b4de97(com.mbeddr.mpsutil.smodule.runtime.lib)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="w873" ref="r:0de03bcd-6ad8-423c-b85e-ae3dd18ed2b3(com.mbeddr.formal.base.behavior)" implicit="true" />
   </imports>
@@ -66,6 +68,7 @@
       <concept id="394857668357342104" name="jetbrains.mps.lang.plugin.structure.EverywhereActionPlace" flags="ng" index="mfpdH" />
       <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
         <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
         <child id="394857668356997869" name="places" index="med8o" />
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
@@ -123,7 +126,6 @@
         <child id="1224071154657" name="classifierType" index="0kSFW" />
         <child id="1224071154656" name="expression" index="0kSFX" />
       </concept>
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -219,6 +221,7 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -426,13 +429,6 @@
         <property id="8575328350543493365" name="message" index="huDt6" />
         <property id="2423417345669755629" name="filter" index="1eyWvh" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -457,7 +453,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="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -468,15 +463,14 @@
       </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
-        <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="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <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" />
       <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" />
-      <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="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -550,7 +544,8 @@
             </node>
             <node concept="2ShNRf" id="6bK0Ak3CbLJ" role="33vP2m">
               <node concept="1pGfFk" id="6bK0Ak3CbLL" role="2ShVmc">
-                <ref role="37wK5l" to="8fb:~CustomActionsSchema.&lt;init&gt;()" resolve="CustomActionsSchema" />
+                <ref role="37wK5l" to="8fb:~CustomActionsSchema.&lt;init&gt;(kotlinx.coroutines.CoroutineScope)" resolve="CustomActionsSchema" />
+                <node concept="10Nm6u" id="2i2e8U0vTPh" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -584,9 +579,14 @@
           </node>
         </node>
         <node concept="3clFbF" id="6bK0Ak3CatE" role="3cqZAp">
-          <node concept="2YIFZM" id="6bK0Ak3CbKc" role="3clFbG">
-            <ref role="1Pybhc" to="8fb:~CustomActionsSchema" resolve="CustomActionsSchema" />
-            <ref role="37wK5l" to="8fb:~CustomActionsSchema.setCustomizationSchemaForCurrentProjects()" resolve="setCustomizationSchemaForCurrentProjects" />
+          <node concept="2OqwBi" id="2i2e8U0uiHJ" role="3clFbG">
+            <node concept="2YIFZM" id="2i2e8U0uiw6" role="2Oq$k0">
+              <ref role="37wK5l" to="8fb:~CustomActionsSchema.getInstance()" resolve="getInstance" />
+              <ref role="1Pybhc" to="8fb:~CustomActionsSchema" resolve="CustomActionsSchema" />
+            </node>
+            <node concept="liA8E" id="2i2e8U0uj1T" role="2OqNvi">
+              <ref role="37wK5l" to="8fb:~CustomActionsSchema.setCustomizationSchemaForCurrentProjects()" resolve="setCustomizationSchemaForCurrentProjects" />
+            </node>
           </node>
         </node>
       </node>
@@ -2494,6 +2494,7 @@
     <property role="TrG5h" value="FASTENNewModel" />
     <property role="2uzpH1" value="New FASTEN Model" />
     <property role="3GE5qa" value="new_actions" />
+    <property role="2YLI8m" value="6u2MFnph2wS/none" />
     <node concept="1DS2jV" id="26E6nZcFIuS" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
@@ -2562,8 +2563,8 @@
         <node concept="3cpWs8" id="5tRIc6mlvG5" role="3cqZAp">
           <node concept="3cpWsn" id="5tRIc6mlvG6" role="3cpWs9">
             <property role="TrG5h" value="mrs" />
-            <node concept="2BANLN" id="5tRIc6mlvFI" role="1tU5fm">
-              <node concept="3uibUv" id="5tRIc6mlvFL" role="_ZDj9">
+            <node concept="_YKpA" id="2i2e8U2kc2k" role="1tU5fm">
+              <node concept="3uibUv" id="2i2e8U2kc2m" role="_ZDj9">
                 <ref role="3uigEE" to="dush:~ModelRoot" resolve="ModelRoot" />
               </node>
             </node>
@@ -2572,17 +2573,43 @@
                 <node concept="3uibUv" id="5tRIc6mlvG9" role="HW$YZ">
                   <ref role="3uigEE" to="dush:~ModelRoot" resolve="ModelRoot" />
                 </node>
-                <node concept="2OqwBi" id="5tRIc6mlvGa" role="I$8f6">
-                  <node concept="37vLTw" id="5tRIc6mlvGb" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5tRIc6mlsRK" resolve="sol" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1QHqEK" id="2i2e8U2iC9d" role="3cqZAp">
+          <node concept="1QHqEC" id="2i2e8U2iC9f" role="1QHqEI">
+            <node concept="3clFbS" id="2i2e8U2iC9h" role="1bW5cS">
+              <node concept="3clFbF" id="2i2e8U2iGb1" role="3cqZAp">
+                <node concept="2OqwBi" id="2i2e8U2iHAL" role="3clFbG">
+                  <node concept="37vLTw" id="2i2e8U2iGb0" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5tRIc6mlvG6" resolve="mrs" />
                   </node>
-                  <node concept="liA8E" id="5tRIc6mlvGc" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~AbstractModule.getModelRoots()" resolve="getModelRoots" />
+                  <node concept="X8dFx" id="2i2e8U2iJOh" role="2OqNvi">
+                    <node concept="2OqwBi" id="5tRIc6mlvGa" role="25WWJ7">
+                      <node concept="37vLTw" id="5tRIc6mlvGb" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5tRIc6mlsRK" resolve="sol" />
+                      </node>
+                      <node concept="liA8E" id="5tRIc6mlvGc" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c4:~AbstractModule.getModelRoots()" resolve="getModelRoots" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="2i2e8U2iEi4" role="ukAjM">
+            <node concept="2OqwBi" id="2i2e8U2iCIC" role="2Oq$k0">
+              <node concept="2WthIp" id="2i2e8U2iCIF" role="2Oq$k0" />
+              <node concept="1DTwFV" id="2i2e8U2iCIH" role="2OqNvi">
+                <ref role="2WH_rO" node="26E6nZcFIuS" resolve="project" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2i2e8U2iFC3" role="2OqNvi">
+              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
+            </node>
+          </node>
         </node>
         <node concept="3clFbJ" id="5tRIc6mlwku" role="3cqZAp">
           <node concept="3clFbS" id="5tRIc6mlwkw" role="3clFbx">
@@ -2595,34 +2622,34 @@
             <node concept="1v1jN8" id="5tRIc6mlzAn" role="2OqNvi" />
           </node>
         </node>
-        <node concept="3cpWs8" id="5tRIc6mlCTF" role="3cqZAp">
-          <node concept="3cpWsn" id="5tRIc6mlCTG" role="3cpWs9">
-            <property role="TrG5h" value="mr" />
-            <node concept="3uibUv" id="5tRIc6mlCTy" role="1tU5fm">
-              <ref role="3uigEE" to="dush:~ModelRoot" resolve="ModelRoot" />
-            </node>
-            <node concept="2OqwBi" id="5tRIc6mlCTH" role="33vP2m">
-              <node concept="37vLTw" id="5tRIc6mlCTI" role="2Oq$k0">
-                <ref role="3cqZAo" node="5tRIc6mlvG6" resolve="mrs" />
-              </node>
-              <node concept="1uHKPH" id="5tRIc6mlCTJ" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="5tRIc6mlHkE" role="3cqZAp">
           <node concept="3cpWsn" id="5tRIc6mlHkF" role="3cpWs9">
             <property role="TrG5h" value="modelName" />
             <node concept="17QB3L" id="5tRIc6mm0vv" role="1tU5fm" />
-            <node concept="2YIFZM" id="5tRIc6mlHkG" role="33vP2m">
-              <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-              <ref role="37wK5l" to="dxuu:~JOptionPane.showInputDialog(java.awt.Component,java.lang.Object)" resolve="showInputDialog" />
-              <node concept="10Nm6u" id="5tRIc6mlHkH" role="37wK5m" />
-              <node concept="Xl_RD" id="5tRIc6mlHkI" role="37wK5m">
-                <property role="Xl_RC" value="Model name:" />
+            <node concept="2YIFZM" id="2i2e8U2kMo5" role="33vP2m">
+              <ref role="37wK5l" to="jkm4:~Messages.showInputDialog(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="showInputDialog" />
+              <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+              <node concept="Xl_RD" id="2i2e8U2kMo7" role="37wK5m">
+                <property role="Xl_RC" value="Name:" />
+              </node>
+              <node concept="Xl_RD" id="2i2e8U2kTeV" role="37wK5m">
+                <property role="Xl_RC" value="Model" />
               </node>
+              <node concept="10Nm6u" id="2i2e8U2kXO2" role="37wK5m" />
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="2i2e8U2kZFH" role="3cqZAp">
+          <node concept="3clFbS" id="2i2e8U2kZFJ" role="3clFbx">
+            <node concept="3cpWs6" id="2i2e8U2l4oS" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="2i2e8U2l1_8" role="3clFbw">
+            <node concept="37vLTw" id="2i2e8U2l07B" role="2Oq$k0">
+              <ref role="3cqZAo" node="5tRIc6mlHkF" resolve="modelName" />
+            </node>
+            <node concept="17RlXB" id="2i2e8U2l3uS" role="2OqNvi" />
+          </node>
+        </node>
         <node concept="3cpWs8" id="2NC0Oc6G62F" role="3cqZAp">
           <node concept="3cpWsn" id="2NC0Oc6G62I" role="3cpWs9">
             <property role="TrG5h" value="namespace" />
@@ -2824,36 +2851,17 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="26E6nZcFtoJ" role="3cqZAp">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="26E6nZcFsZY" role="8Wnug">
-            <node concept="37vLTI" id="26E6nZcFt00" role="3clFbG">
-              <node concept="2YIFZM" id="5tRIc6mm0Qm" role="37vLTx">
-                <ref role="37wK5l" to="z1c4:~SModuleOperations.createModelWithAdjustments(java.lang.String,org.jetbrains.mps.openapi.persistence.ModelRoot)" resolve="createModelWithAdjustments" />
-                <ref role="1Pybhc" to="z1c4:~SModuleOperations" resolve="SModuleOperations" />
-                <node concept="37vLTw" id="5tRIc6mm0Qn" role="37wK5m">
-                  <ref role="3cqZAo" node="3ALtb$ipQoE" resolve="fullModelName" />
-                </node>
-                <node concept="37vLTw" id="5tRIc6mm0Qo" role="37wK5m">
-                  <ref role="3cqZAo" node="5tRIc6mlCTG" resolve="mr" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="26E6nZcFt04" role="37vLTJ">
-                <ref role="3cqZAo" node="5tRIc6mm0Ql" resolve="newModel" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbJ" id="5tRIc6mm2CE" role="3cqZAp">
           <node concept="3clFbS" id="5tRIc6mm2CG" role="3clFbx">
             <node concept="3clFbF" id="5tRIc6mm3uy" role="3cqZAp">
-              <node concept="2YIFZM" id="5tRIc6mm3v6" role="3clFbG">
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <node concept="10Nm6u" id="5tRIc6mm3x0" role="37wK5m" />
-                <node concept="Xl_RD" id="5tRIc6mm3Ag" role="37wK5m">
-                  <property role="Xl_RC" value="Error while creating the model!" />
+              <node concept="2YIFZM" id="2i2e8U2kCUr" role="3clFbG">
+                <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <node concept="Xl_RD" id="2i2e8U2kCUt" role="37wK5m">
+                  <property role="Xl_RC" value="Error while creating the model" />
+                </node>
+                <node concept="Xl_RD" id="2i2e8U2kJce" role="37wK5m">
+                  <property role="Xl_RC" value="Error" />
                 </node>
               </node>
             </node>
@@ -3414,24 +3422,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Nl9e7Eg0Ca" role="3cqZAp">
-          <node concept="37vLTI" id="1Nl9e7Eg0Cb" role="3clFbG">
-            <node concept="1rXfSq" id="1Nl9e7Egc1R" role="37vLTx">
-              <ref role="37wK5l" node="1Nl9e7EfNwo" resolve="getVirtualPackage" />
-              <node concept="37vLTw" id="1Nl9e7EgcTE" role="37wK5m">
-                <ref role="3cqZAo" node="1Nl9e7Egchb" resolve="treeNode" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1Nl9e7Eg0Cf" role="37vLTJ">
-              <node concept="37vLTw" id="1Nl9e7Eg0Cg" role="2Oq$k0">
-                <ref role="3cqZAo" node="1Nl9e7Eg0C3" resolve="root" />
-              </node>
-              <node concept="3TrcHB" id="1Nl9e7Eg0Ch" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1Nl9e7Eg0Ci" role="3cqZAp">
           <node concept="2OqwBi" id="1Nl9e7Eg0Cj" role="3clFbG">
             <node concept="37vLTw" id="1Nl9e7EgdHJ" role="2Oq$k0">
@@ -3499,12 +3489,6 @@
         <property role="TrG5h" value="concept" />
         <node concept="3bZ5Sz" id="1Nl9e7Eg52n" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="1Nl9e7Egchb" role="3clF46">
-        <property role="TrG5h" value="treeNode" />
-        <node concept="3uibUv" id="1Nl9e7EgcED" role="1tU5fm">
-          <ref role="3uigEE" to="rgfa:~TreeNode" resolve="TreeNode" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1Nl9e7EgERt" role="3clF46">
         <property role="TrG5h" value="instance" />
         <node concept="3Tqbb2" id="1Nl9e7EgFgV" role="1tU5fm" />
@@ -3756,12 +3740,6 @@
                 <ref role="2WH_rO" node="BKGoaZNALC" resolve="concept" />
               </node>
             </node>
-            <node concept="2OqwBi" id="1Nl9e7Egjhc" role="37wK5m">
-              <node concept="2WthIp" id="1Nl9e7Egj1y" role="2Oq$k0" />
-              <node concept="1DTwFV" id="1Nl9e7EgjCu" role="2OqNvi">
-                <ref role="2WH_rO" node="7A06dcUFz0N" resolve="treeNode" />
-              </node>
-            </node>
             <node concept="10Nm6u" id="1Nl9e7EgI_I" role="37wK5m" />
             <node concept="2OqwBi" id="7A06dcUG9Ev" role="37wK5m">
               <node concept="2WthIp" id="7A06dcUG9mf" role="2Oq$k0" />
@@ -4012,8 +3990,8 @@
     <node concept="2S4$dB" id="BKGoaZT9Fw" role="1NuT2Z">
       <property role="TrG5h" value="model" />
       <node concept="3Tm6S6" id="BKGoaZT9Fx" role="1B3o_S" />
-      <node concept="1oajcY" id="BKGoaZT9Fy" role="1oa70y" />
       <node concept="H_c77" id="BKGoaZT9wI" role="1tU5fm" />
+      <node concept="1oajcY" id="BKGoaZT9Fy" role="1oa70y" />
     </node>
     <node concept="1DS2jV" id="BKGoaZOs19" role="1NuT2Z">
       <property role="TrG5h" value="treeSelectionSize" />
@@ -4068,90 +4046,6 @@
         </node>
       </node>
     </node>
-    <node concept="1DS2jV" id="7A06dcUFz0N" role="1NuT2Z">
-      <property role="TrG5h" value="treeNode" />
-      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.TREE_NODE" resolve="TREE_NODE" />
-      <node concept="1oa70z" id="BKGoaZNQey" role="1oa70y">
-        <node concept="3clFbS" id="BKGoaZNQe$" role="2VODD2">
-          <node concept="3SKdUt" id="49cZsxqJIOz" role="3cqZAp">
-            <node concept="1PaTwC" id="49cZsxqJIO$" role="1aUNEU">
-              <node concept="3oM_SD" id="49cZsxqJKdp" role="1PaTwD">
-                <property role="3oM_SC" value="action" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJIP2" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJIQ4" role="1PaTwD">
-                <property role="3oM_SC" value="only" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJIQa" role="1PaTwD">
-                <property role="3oM_SC" value="active" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJIQh" role="1PaTwD">
-                <property role="3oM_SC" value="when" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK6x" role="1PaTwD">
-                <property role="3oM_SC" value="the" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK6E" role="1PaTwD">
-                <property role="3oM_SC" value="selected" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK7z" role="1PaTwD">
-                <property role="3oM_SC" value="tree" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK7I" role="1PaTwD">
-                <property role="3oM_SC" value="node" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK7U" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJK87" role="1PaTwD">
-                <property role="3oM_SC" value="either" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJKa8" role="1PaTwD">
-                <property role="3oM_SC" value="a" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJKaz" role="1PaTwD">
-                <property role="3oM_SC" value="model," />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJKc6" role="1PaTwD">
-                <property role="3oM_SC" value="package" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqK1x9" role="1PaTwD">
-                <property role="3oM_SC" value="or" />
-              </node>
-              <node concept="3oM_SD" id="49cZsxqJKcJ" role="1PaTwD">
-                <property role="3oM_SC" value="node" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="BKGoaZOKAm" role="3cqZAp">
-            <node concept="22lmx$" id="BKGoaZONGP" role="3clFbG">
-              <node concept="2ZW3vV" id="BKGoaZOOlX" role="3uHU7w">
-                <node concept="3uibUv" id="BKGoaZOOxs" role="2ZW6by">
-                  <ref role="3uigEE" to="xr52:~SNodeTreeNode" resolve="SNodeTreeNode" />
-                </node>
-                <node concept="1oajcR" id="BKGoaZONY5" role="2ZW6bz" />
-              </node>
-              <node concept="22lmx$" id="BKGoaZOMLx" role="3uHU7B">
-                <node concept="2ZW3vV" id="BKGoaZOKRb" role="3uHU7B">
-                  <node concept="3uibUv" id="BKGoaZOKVs" role="2ZW6by">
-                    <ref role="3uigEE" to="xr52:~SModelTreeNode" resolve="SModelTreeNode" />
-                  </node>
-                  <node concept="1oajcR" id="BKGoaZOKAl" role="2ZW6bz" />
-                </node>
-                <node concept="2ZW3vV" id="BKGoaZONi3" role="3uHU7w">
-                  <node concept="3uibUv" id="BKGoaZONmy" role="2ZW6by">
-                    <ref role="3uigEE" to="xr52:~PackageNode" resolve="PackageNode" />
-                  </node>
-                  <node concept="1oajcR" id="BKGoaZOMN1" role="2ZW6bz" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
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 edaad65d..107e5e6c 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
@@ -28,10 +28,8 @@
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)</dependency>
     <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
-    <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -41,6 +39,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
@@ -64,7 +63,6 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="810b1f0c-97b8-4211-8a3c-55a39bac8bee(com.mbeddr.formal.base.analyses)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
-    <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
     <module reference="6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
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 7b17f80d..594c25d9 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
@@ -19,6 +19,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="4agl" ref="r:fdf64437-9be3-455e-9c7a-77cc1026e250(com.mbeddr.formal.base.plugin)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1162,12 +1163,15 @@
           <node concept="3clFbS" id="3fsZMFLI9tO" role="3clFbx">
             <node concept="3clFbF" id="3fsZMFLI9tP" role="3cqZAp">
               <node concept="2YIFZM" id="3fsZMFLI9tQ" role="3clFbG">
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <node concept="10Nm6u" id="3fsZMFLI9tR" role="37wK5m" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <ref role="37wK5l" to="jkm4:~Messages.showMessageDialog(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="showMessageDialog" />
                 <node concept="Xl_RD" id="3fsZMFLI9tS" role="37wK5m">
-                  <property role="Xl_RC" value="No simulation trace associated to this node - please re-run the simulator" />
+                  <property role="Xl_RC" value="Please re-run the simulator" />
                 </node>
+                <node concept="Xl_RD" id="2i2e8U2lqCg" role="37wK5m">
+                  <property role="Xl_RC" value="No simulation trace associated to this node" />
+                </node>
+                <node concept="10Nm6u" id="2i2e8U2lnff" role="37wK5m" />
               </node>
             </node>
             <node concept="3cpWs6" id="3fsZMFLI9tT" role="3cqZAp" />
@@ -1183,12 +1187,15 @@
           <node concept="3clFbS" id="3fsZMFLI9tY" role="3clFbx">
             <node concept="3clFbF" id="3fsZMFLI9tZ" role="3cqZAp">
               <node concept="2YIFZM" id="3fsZMFLI9u0" role="3clFbG">
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <node concept="10Nm6u" id="3fsZMFLI9u1" role="37wK5m" />
+                <ref role="37wK5l" to="jkm4:~Messages.showMessageDialog(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="showMessageDialog" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <node concept="Xl_RD" id="2i2e8U2lxbD" role="37wK5m">
+                  <property role="Xl_RC" value="Index less than zero" />
+                </node>
                 <node concept="Xl_RD" id="3fsZMFLI9u2" role="37wK5m">
-                  <property role="Xl_RC" value="Beginning of the trace!" />
+                  <property role="Xl_RC" value="Beginning of the trace" />
                 </node>
+                <node concept="10Nm6u" id="2i2e8U2lwgI" role="37wK5m" />
               </node>
             </node>
             <node concept="3clFbF" id="3fsZMFLI9u3" role="3cqZAp">
@@ -1216,12 +1223,15 @@
           <node concept="3clFbS" id="3fsZMFLI9uc" role="3clFbx">
             <node concept="3clFbF" id="3fsZMFLI9ud" role="3cqZAp">
               <node concept="2YIFZM" id="3fsZMFLI9ue" role="3clFbG">
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <node concept="10Nm6u" id="3fsZMFLI9uf" role="37wK5m" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <ref role="37wK5l" to="jkm4:~Messages.showMessageDialog(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="showMessageDialog" />
+                <node concept="Xl_RD" id="2i2e8U2lDsP" role="37wK5m">
+                  <property role="Xl_RC" value="Number of steps less or equal to index" />
+                </node>
                 <node concept="Xl_RD" id="3fsZMFLI9ug" role="37wK5m">
-                  <property role="Xl_RC" value="End of the trace!" />
+                  <property role="Xl_RC" value="End of the trace" />
                 </node>
+                <node concept="10Nm6u" id="2i2e8U2lCQB" role="37wK5m" />
               </node>
             </node>
             <node concept="3clFbF" id="3fsZMFLI9uh" role="3cqZAp">
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 eaa89cef..d8c5c4e7 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
@@ -20,29 +20,8 @@
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="r791" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
-    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
-    <import index="f061" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application.ex(MPS.IDEA/)" />
-    <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
-    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="oqcp" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.imageio(JDK/)" />
-    <import index="7a0s" ref="r:2af017c2-293f-4ebb-99f3-81e353b3d6e6(jetbrains.mps.editor.runtime)" />
-    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
-    <import index="jan3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.image(JDK/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="2y64" ref="r:b91d3184-5a2f-40d8-b310-14ec3048d9cc(com.mbeddr.formal.base.tooling.project)" />
-    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
-    <import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
-    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
-    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="nxzt" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.svggen(org.apache.batik/)" />
-    <import index="ujg5" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.dom(org.apache.batik/)" />
-    <import index="lhjl" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:org.w3c.dom(JDK/)" />
+    <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -250,20 +229,15 @@
           </node>
         </node>
         <node concept="3clFbF" id="3kLBXRrt367" role="3cqZAp">
-          <node concept="2YIFZM" id="3kLBXRrt368" role="3clFbG">
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <node concept="10Nm6u" id="3kLBXRrt369" role="37wK5m" />
-            <node concept="37vLTw" id="3kLBXRrt36a" role="37wK5m">
+          <node concept="2YIFZM" id="2i2e8U2lR59" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="37vLTw" id="2i2e8U2lR5b" role="37wK5m">
               <ref role="3cqZAo" node="3kLBXRrt36d" resolve="message" />
             </node>
-            <node concept="37vLTw" id="3kLBXRrtf4F" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2lR5c" role="37wK5m">
               <ref role="3cqZAo" node="3kLBXRrtd$t" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="3kLBXRrt36c" role="37wK5m">
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            </node>
           </node>
         </node>
       </node>
@@ -292,138 +266,25 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="6BowXlDxQ7U" role="3cqZAp">
-          <node concept="3cpWsn" id="6BowXlDxQ7T" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="textPane" />
-            <node concept="3uibUv" id="6BowXlDC7Pv" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JTextPane" resolve="JTextPane" />
-            </node>
-            <node concept="2ShNRf" id="6BowXlDxQ8g" role="33vP2m">
-              <node concept="1pGfFk" id="6BowXlDxQag" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JTextPane.&lt;init&gt;()" resolve="JTextPane" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlDCaoC" role="3cqZAp">
-          <node concept="2OqwBi" id="6BowXlDCaAc" role="3clFbG">
-            <node concept="37vLTw" id="6BowXlDCaoA" role="2Oq$k0">
-              <ref role="3cqZAo" node="6BowXlDxQ7T" resolve="textPane" />
-            </node>
-            <node concept="liA8E" id="6BowXlDCbbv" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JEditorPane.setContentType(java.lang.String)" resolve="setContentType" />
-              <node concept="Xl_RD" id="6BowXlDCbi3" role="37wK5m">
-                <property role="Xl_RC" value="text/html" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlDC8yT" role="3cqZAp">
-          <node concept="2OqwBi" id="6BowXlDC8Lx" role="3clFbG">
-            <node concept="37vLTw" id="6BowXlDC8yR" role="2Oq$k0">
-              <ref role="3cqZAo" node="6BowXlDxQ7T" resolve="textPane" />
-            </node>
-            <node concept="liA8E" id="6BowXlDC9n4" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JEditorPane.setText(java.lang.String)" resolve="setText" />
-              <node concept="37vLTw" id="6BowXlDC9zS" role="37wK5m">
-                <ref role="3cqZAo" node="6BowXlDxMX3" resolve="message" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlD$J0p" role="3cqZAp">
-          <node concept="2OqwBi" id="6BowXlD$JdW" role="3clFbG">
-            <node concept="37vLTw" id="6BowXlD$J0n" role="2Oq$k0">
-              <ref role="3cqZAo" node="6BowXlDxQ7T" resolve="textPane" />
-            </node>
-            <node concept="liA8E" id="6BowXlD$JMW" role="2OqNvi">
-              <ref role="37wK5l" to="r791:~JTextComponent.setEditable(boolean)" resolve="setEditable" />
-              <node concept="3clFbT" id="6BowXlD$JTv" role="37wK5m">
-                <property role="3clFbU" value="false" />
+        <node concept="3clFbF" id="6BowXlDxMWV" role="3cqZAp">
+          <node concept="2YIFZM" id="2i2e8U2ma3d" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.awt.Component,java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="2OqwBi" id="2i2e8U2n3l7" role="37wK5m">
+              <node concept="2YIFZM" id="2i2e8U2n2RZ" role="2Oq$k0">
+                <ref role="37wK5l" to="jkny:~WindowManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="jkny:~WindowManager" resolve="WindowManager" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlDxQ84" role="3cqZAp">
-          <node concept="2OqwBi" id="6BowXlDxQd9" role="3clFbG">
-            <node concept="37vLTw" id="6BowXlDxQd8" role="2Oq$k0">
-              <ref role="3cqZAo" node="6BowXlDxQ7T" resolve="textPane" />
-            </node>
-            <node concept="liA8E" id="6BowXlDxQda" role="2OqNvi">
-              <ref role="37wK5l" to="r791:~JTextComponent.setMargin(java.awt.Insets)" resolve="setMargin" />
-              <node concept="2ShNRf" id="6BowXlDxQdb" role="37wK5m">
-                <node concept="1pGfFk" id="6BowXlDxQdc" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Insets.&lt;init&gt;(int,int,int,int)" resolve="Insets" />
-                  <node concept="3cmrfG" id="6BowXlDxQ87" role="37wK5m">
-                    <property role="3cmrfH" value="5" />
-                  </node>
-                  <node concept="3cmrfG" id="6BowXlDxQ88" role="37wK5m">
-                    <property role="3cmrfH" value="5" />
-                  </node>
-                  <node concept="3cmrfG" id="6BowXlDxQ89" role="37wK5m">
-                    <property role="3cmrfH" value="5" />
-                  </node>
-                  <node concept="3cmrfG" id="6BowXlDxQ8a" role="37wK5m">
-                    <property role="3cmrfH" value="5" />
-                  </node>
-                </node>
+              <node concept="liA8E" id="2i2e8U2n6Pt" role="2OqNvi">
+                <ref role="37wK5l" to="jkny:~WindowManager.findVisibleFrame()" resolve="findVisibleFrame" />
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6BowXlDxO9D" role="3cqZAp">
-          <node concept="3cpWsn" id="6BowXlDxO9E" role="3cpWs9">
-            <property role="TrG5h" value="scrollPane" />
-            <node concept="3uibUv" id="6BowXlDxO9F" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JScrollPane" resolve="JScrollPane" />
-            </node>
-            <node concept="2ShNRf" id="6BowXlDxOhs" role="33vP2m">
-              <node concept="1pGfFk" id="6BowXlDxQ2u" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JScrollPane.&lt;init&gt;(java.awt.Component)" resolve="JScrollPane" />
-                <node concept="37vLTw" id="6BowXlDzNzO" role="37wK5m">
-                  <ref role="3cqZAo" node="6BowXlDxQ7T" resolve="textPane" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="2i2e8U2mmn4" role="37wK5m">
+              <ref role="3cqZAo" node="6BowXlDxMX3" resolve="message" />
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlDySCz" role="3cqZAp">
-          <node concept="2OqwBi" id="6BowXlDySD$" role="3clFbG">
-            <node concept="37vLTw" id="6BowXlDySDz" role="2Oq$k0">
-              <ref role="3cqZAo" node="6BowXlDxO9E" resolve="scrollPane" />
-            </node>
-            <node concept="liA8E" id="6BowXlDySD_" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
-              <node concept="2ShNRf" id="6BowXlDySDA" role="37wK5m">
-                <node concept="1pGfFk" id="6BowXlDySDB" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                  <node concept="37vLTw" id="6BowXlDL2Vc" role="37wK5m">
-                    <ref role="3cqZAo" node="6BowXlDKZSX" resolve="width" />
-                  </node>
-                  <node concept="37vLTw" id="6BowXlDL39h" role="37wK5m">
-                    <ref role="3cqZAo" node="6BowXlDL02v" resolve="height" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6BowXlDxMWV" role="3cqZAp">
-          <node concept="2YIFZM" id="6BowXlDxMWW" role="3clFbG">
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <node concept="10Nm6u" id="6BowXlDxMWX" role="37wK5m" />
-            <node concept="37vLTw" id="6BowXlD$I$b" role="37wK5m">
-              <ref role="3cqZAo" node="6BowXlDxO9E" resolve="scrollPane" />
-            </node>
-            <node concept="37vLTw" id="6BowXlDxMWZ" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2ma3g" role="37wK5m">
               <ref role="3cqZAo" node="6BowXlDxMX1" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="6BowXlDxMX0" role="37wK5m">
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-            </node>
           </node>
         </node>
       </node>
@@ -467,21 +328,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7Quig7_QtUO" role="3cqZAp">
-          <node concept="2YIFZM" id="7Quig7_QtUP" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <node concept="10Nm6u" id="7Quig7_QtUQ" role="37wK5m" />
-            <node concept="37vLTw" id="7Quig7_QEpc" role="37wK5m">
+        <node concept="3clFbF" id="2i2e8U2ncf5" role="3cqZAp">
+          <node concept="2YIFZM" id="2i2e8U2nfTt" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.awt.Component,java.lang.String,java.lang.String)" resolve="showInfoMessage" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="2OqwBi" id="2i2e8U2njzG" role="37wK5m">
+              <node concept="2YIFZM" id="2i2e8U2njzH" role="2Oq$k0">
+                <ref role="37wK5l" to="jkny:~WindowManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="jkny:~WindowManager" resolve="WindowManager" />
+              </node>
+              <node concept="liA8E" id="2i2e8U2njzI" role="2OqNvi">
+                <ref role="37wK5l" to="jkny:~WindowManager.findVisibleFrame()" resolve="findVisibleFrame" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2i2e8U2noa$" role="37wK5m">
               <ref role="3cqZAo" node="7Quig7_QDn$" resolve="msg" />
             </node>
-            <node concept="37vLTw" id="7Quig7_QtUS" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2nsLn" role="37wK5m">
               <ref role="3cqZAo" node="7Quig7_QtUU" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="7Quig7_QtUT" role="37wK5m">
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.INFORMATION_MESSAGE" resolve="INFORMATION_MESSAGE" />
-            </node>
           </node>
         </node>
       </node>
@@ -518,21 +383,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="615cGN$MG9s" role="3cqZAp">
-          <node concept="2YIFZM" id="615cGN$MG9t" role="3clFbG">
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <node concept="10Nm6u" id="615cGN$MG9u" role="37wK5m" />
-            <node concept="37vLTw" id="615cGN$MG9v" role="37wK5m">
+        <node concept="3clFbF" id="2i2e8U2n$Vi" role="3cqZAp">
+          <node concept="2YIFZM" id="2i2e8U2n$Vj" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.awt.Component,java.lang.String,java.lang.String)" resolve="showInfoMessage" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="2OqwBi" id="2i2e8U2n$Vk" role="37wK5m">
+              <node concept="2YIFZM" id="2i2e8U2n$Vl" role="2Oq$k0">
+                <ref role="37wK5l" to="jkny:~WindowManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="jkny:~WindowManager" resolve="WindowManager" />
+              </node>
+              <node concept="liA8E" id="2i2e8U2n$Vm" role="2OqNvi">
+                <ref role="37wK5l" to="jkny:~WindowManager.findVisibleFrame()" resolve="findVisibleFrame" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2i2e8U2n$Vn" role="37wK5m">
               <ref role="3cqZAo" node="615cGN$MG9n" resolve="msg" />
             </node>
-            <node concept="37vLTw" id="615cGN$MG9w" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2n$Vo" role="37wK5m">
               <ref role="3cqZAo" node="615cGN$MG9y" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="615cGN$MG9x" role="37wK5m">
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.INFORMATION_MESSAGE" resolve="INFORMATION_MESSAGE" />
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            </node>
           </node>
         </node>
       </node>
@@ -569,21 +438,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7Quig7_QJQN" role="3cqZAp">
-          <node concept="2YIFZM" id="7Quig7_QJQO" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <node concept="10Nm6u" id="7Quig7_QJQP" role="37wK5m" />
-            <node concept="37vLTw" id="7Quig7_QJQQ" role="37wK5m">
+        <node concept="3clFbF" id="2i2e8U2nHeS" role="3cqZAp">
+          <node concept="2YIFZM" id="2i2e8U2nHeT" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.awt.Component,java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="2OqwBi" id="2i2e8U2nHeU" role="37wK5m">
+              <node concept="2YIFZM" id="2i2e8U2nHeV" role="2Oq$k0">
+                <ref role="37wK5l" to="jkny:~WindowManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="jkny:~WindowManager" resolve="WindowManager" />
+              </node>
+              <node concept="liA8E" id="2i2e8U2nHeW" role="2OqNvi">
+                <ref role="37wK5l" to="jkny:~WindowManager.findVisibleFrame()" resolve="findVisibleFrame" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2i2e8U2nHeX" role="37wK5m">
               <ref role="3cqZAo" node="7Quig7_QJQI" resolve="msg" />
             </node>
-            <node concept="37vLTw" id="7Quig7_QJQR" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2nHeY" role="37wK5m">
               <ref role="3cqZAo" node="7Quig7_QJQT" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="7Quig7_QJQS" role="37wK5m">
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-            </node>
           </node>
         </node>
       </node>
@@ -620,21 +493,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="615cGN$MQRq" role="3cqZAp">
-          <node concept="2YIFZM" id="615cGN$MQRr" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <node concept="10Nm6u" id="615cGN$MQRs" role="37wK5m" />
-            <node concept="37vLTw" id="615cGN$MQRt" role="37wK5m">
+        <node concept="3clFbF" id="2i2e8U2oHZ6" role="3cqZAp">
+          <node concept="2YIFZM" id="2i2e8U2oHZ7" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.awt.Component,java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+            <node concept="2OqwBi" id="2i2e8U2oHZ8" role="37wK5m">
+              <node concept="2YIFZM" id="2i2e8U2oHZ9" role="2Oq$k0">
+                <ref role="37wK5l" to="jkny:~WindowManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="jkny:~WindowManager" resolve="WindowManager" />
+              </node>
+              <node concept="liA8E" id="2i2e8U2oHZa" role="2OqNvi">
+                <ref role="37wK5l" to="jkny:~WindowManager.findVisibleFrame()" resolve="findVisibleFrame" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2i2e8U2oHZb" role="37wK5m">
               <ref role="3cqZAo" node="615cGN$MQRl" resolve="msg" />
             </node>
-            <node concept="37vLTw" id="615cGN$MQRu" role="37wK5m">
+            <node concept="37vLTw" id="2i2e8U2oHZc" role="37wK5m">
               <ref role="3cqZAo" node="615cGN$MQRw" resolve="title" />
             </node>
-            <node concept="10M0yZ" id="615cGN$MQRv" role="37wK5m">
-              <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-              <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-            </node>
           </node>
         </node>
       </node>
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 db195f1f..33c4db69 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
@@ -33,6 +33,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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="6" />
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 30fe2429..bfb69133 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
@@ -39,6 +39,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
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 11cfe8a6..240bb58d 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
@@ -40,6 +40,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
@@ -49,6 +50,7 @@
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
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 408dc5a0..c2001a67 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
@@ -7,6 +7,9 @@
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <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" />
+    <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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -26,7 +29,13 @@
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="4c75" ref="r:088add12-8a36-47c2-b0d2-7180a8a2a891(com.mbeddr.formal.nusmv.pluginSolution.runner)" />
-    <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="syuh" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.concurrency(MPS.IDEA/)" />
+    <import index="ov6m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.messages(MPS.IDEA/)" />
+    <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
+    <import index="qqrq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.components(MPS.IDEA/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -46,9 +55,6 @@
       <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">
-        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
-      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -62,28 +68,18 @@
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
@@ -93,6 +89,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -136,15 +135,13 @@
       <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="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
@@ -164,6 +161,9 @@
       <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">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
@@ -173,9 +173,7 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-      </concept>
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
@@ -188,10 +186,17 @@
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
+      </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
+      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e">
+        <child id="1225797361612" name="parameter" index="1BdPVh" />
+      </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
@@ -255,11 +260,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="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <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="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <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" />
@@ -272,7 +272,6 @@
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
-      <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
@@ -310,373 +309,376 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1wencriT8ca" role="3cqZAp">
-          <node concept="3cpWsn" id="1wencriT8cb" role="3cpWs9">
-            <property role="TrG5h" value="variablesToDisplay" />
-            <node concept="_YKpA" id="1wencriT86Z" role="1tU5fm">
-              <node concept="17QB3L" id="6f7vJBUiTyr" role="_ZDj9" />
+        <node concept="3clFbF" id="2i2e8U2BGTz" role="3cqZAp">
+          <node concept="2YIFZM" id="1wencriT8cc" role="3clFbG">
+            <ref role="37wK5l" node="1wencriQVM8" resolve="variablesWhichIShouldDisplay" />
+            <ref role="1Pybhc" node="1wencriQFZN" resolve="SelectionOfRelevantVariables" />
+            <node concept="37vLTw" id="1wencriV9nb" role="37wK5m">
+              <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
             </node>
-            <node concept="2YIFZM" id="1wencriT8cc" role="33vP2m">
-              <ref role="37wK5l" node="1wencriQVM8" resolve="variablesWhichIShouldDisplay" />
-              <ref role="1Pybhc" node="1wencriQFZN" resolve="SelectionOfRelevantVariables" />
-              <node concept="37vLTw" id="1wencriV9nb" role="37wK5m">
-                <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
-              </node>
-              <node concept="37vLTw" id="1wencriT8cf" role="37wK5m">
-                <ref role="3cqZAo" node="1wencriOX0B" resolve="allAssignedVariables" />
-              </node>
+            <node concept="37vLTw" id="1wencriT8cf" role="37wK5m">
+              <ref role="3cqZAo" node="1wencriOX0B" resolve="allAssignedVariables" />
             </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1wencriUdoj" role="3cqZAp" />
-        <node concept="1QHqEK" id="1wencriP$LF" role="3cqZAp">
-          <node concept="1QHqEC" id="1wencriP$LJ" role="1QHqEI">
-            <node concept="3clFbS" id="1wencriP$LN" role="1bW5cS">
-              <node concept="3cpWs8" id="1wencriP1Ew" role="3cqZAp">
-                <node concept="3cpWsn" id="1wencriP1Ez" role="3cpWs9">
-                  <property role="TrG5h" value="variableName2CorrespondingMSCObject" />
-                  <node concept="3rvAFt" id="1wencriP1Eq" role="1tU5fm">
-                    <node concept="17QB3L" id="6f7vJBUj5VX" role="3rvQeY" />
-                    <node concept="3Tqbb2" id="1wencriP1T4" role="3rvSg0">
-                      <ref role="ehGHo" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="1wencriP236" role="33vP2m">
-                    <node concept="3rGOSV" id="1wencriP2bC" role="2ShVmc">
-                      <node concept="17QB3L" id="6f7vJBUj6je" role="3rHrn6" />
-                      <node concept="3Tqbb2" id="1wencriP2py" role="3rHtpV">
-                        <ref role="ehGHo" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
-                      </node>
-                    </node>
-                  </node>
+            <node concept="1bVj0M" id="2i2e8U2BI0W" role="37wK5m">
+              <node concept="37vLTG" id="2i2e8U2BIyl" role="1bW2Oz">
+                <property role="TrG5h" value="variablesToDisplay" />
+                <node concept="_YKpA" id="2i2e8U2BIyn" role="1tU5fm">
+                  <node concept="17QB3L" id="2i2e8U2BIyo" role="_ZDj9" />
                 </node>
               </node>
-              <node concept="3clFbF" id="1wencriOXf$" role="3cqZAp">
-                <node concept="2OqwBi" id="1wencriOYzA" role="3clFbG">
-                  <node concept="37vLTw" id="1wencriTdxt" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1wencriT8cb" resolve="variablesToDisplay" />
-                  </node>
-                  <node concept="2es0OD" id="1wencriP39V" role="2OqNvi">
-                    <node concept="1bVj0M" id="1wencriP39X" role="23t8la">
-                      <node concept="3clFbS" id="1wencriP39Y" role="1bW5cS">
-                        <node concept="3cpWs8" id="1wencriP44G" role="3cqZAp">
-                          <node concept="3cpWsn" id="1wencriP44H" role="3cpWs9">
-                            <property role="TrG5h" value="mscObj" />
-                            <node concept="3Tqbb2" id="1wencriP425" role="1tU5fm">
+              <node concept="3clFbS" id="2i2e8U2BI1a" role="1bW5cS">
+                <node concept="1QHqEK" id="1wencriP$LF" role="3cqZAp">
+                  <node concept="1QHqEC" id="1wencriP$LJ" role="1QHqEI">
+                    <node concept="3clFbS" id="1wencriP$LN" role="1bW5cS">
+                      <node concept="3cpWs8" id="1wencriP1Ew" role="3cqZAp">
+                        <node concept="3cpWsn" id="1wencriP1Ez" role="3cpWs9">
+                          <property role="TrG5h" value="variableName2CorrespondingMSCObject" />
+                          <node concept="3rvAFt" id="1wencriP1Eq" role="1tU5fm">
+                            <node concept="17QB3L" id="6f7vJBUj5VX" role="3rvQeY" />
+                            <node concept="3Tqbb2" id="1wencriP1T4" role="3rvSg0">
                               <ref role="ehGHo" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
                             </node>
                           </node>
-                        </node>
-                        <node concept="3clFbF" id="1wencriP4Co" role="3cqZAp">
-                          <node concept="37vLTI" id="1wencriP4Cq" role="3clFbG">
-                            <node concept="2pJPEk" id="1wencriP44I" role="37vLTx">
-                              <node concept="2pJPED" id="1wencriP44J" role="2pJPEn">
-                                <ref role="2pJxaS" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
-                                <node concept="2pJxcG" id="1wencriP44K" role="2pJxcM">
-                                  <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="2hED36D1DuU" resolve="it" />
-                                    </node>
-                                  </node>
-                                </node>
+                          <node concept="2ShNRf" id="1wencriP236" role="33vP2m">
+                            <node concept="3rGOSV" id="1wencriP2bC" role="2ShVmc">
+                              <node concept="17QB3L" id="6f7vJBUj6je" role="3rHrn6" />
+                              <node concept="3Tqbb2" id="1wencriP2py" role="3rHtpV">
+                                <ref role="ehGHo" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
                               </node>
                             </node>
-                            <node concept="37vLTw" id="1wencriP4Cu" role="37vLTJ">
-                              <ref role="3cqZAo" node="1wencriP44H" resolve="mscObj" />
-                            </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="1wencriP4Tx" role="3cqZAp">
-                          <node concept="37vLTI" id="1wencriP5Nj" role="3clFbG">
-                            <node concept="37vLTw" id="1wencriP5UK" role="37vLTx">
-                              <ref role="3cqZAo" node="1wencriP44H" resolve="mscObj" />
-                            </node>
-                            <node concept="3EllGN" id="1wencriP5gH" role="37vLTJ">
-                              <node concept="37vLTw" id="1wencriP5x4" role="3ElVtu">
-                                <ref role="3cqZAo" node="2hED36D1DuU" resolve="it" />
+                      </node>
+                      <node concept="3clFbF" id="1wencriOXf$" role="3cqZAp">
+                        <node concept="2OqwBi" id="1wencriOYzA" role="3clFbG">
+                          <node concept="37vLTw" id="1wencriTdxt" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2i2e8U2BIyl" resolve="variablesToDisplay" />
+                          </node>
+                          <node concept="2es0OD" id="1wencriP39V" role="2OqNvi">
+                            <node concept="1bVj0M" id="1wencriP39X" role="23t8la">
+                              <node concept="3clFbS" id="1wencriP39Y" role="1bW5cS">
+                                <node concept="3cpWs8" id="1wencriP44G" role="3cqZAp">
+                                  <node concept="3cpWsn" id="1wencriP44H" role="3cpWs9">
+                                    <property role="TrG5h" value="mscObj" />
+                                    <node concept="3Tqbb2" id="1wencriP425" role="1tU5fm">
+                                      <ref role="ehGHo" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="1wencriP4Co" role="3cqZAp">
+                                  <node concept="37vLTI" id="1wencriP4Cq" role="3clFbG">
+                                    <node concept="2pJPEk" id="1wencriP44I" role="37vLTx">
+                                      <node concept="2pJPED" id="1wencriP44J" role="2pJPEn">
+                                        <ref role="2pJxaS" to="6jj4:4CA5ZMJ3trF" resolve="MSCObject" />
+                                        <node concept="2pJxcG" id="1wencriP44K" role="2pJxcM">
+                                          <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="2hED36D1DuU" resolve="it" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="37vLTw" id="1wencriP4Cu" role="37vLTJ">
+                                      <ref role="3cqZAo" node="1wencriP44H" resolve="mscObj" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="1wencriP4Tx" role="3cqZAp">
+                                  <node concept="37vLTI" id="1wencriP5Nj" role="3clFbG">
+                                    <node concept="37vLTw" id="1wencriP5UK" role="37vLTx">
+                                      <ref role="3cqZAo" node="1wencriP44H" resolve="mscObj" />
+                                    </node>
+                                    <node concept="3EllGN" id="1wencriP5gH" role="37vLTJ">
+                                      <node concept="37vLTw" id="1wencriP5x4" role="3ElVtu">
+                                        <ref role="3cqZAo" node="2hED36D1DuU" resolve="it" />
+                                      </node>
+                                      <node concept="37vLTw" id="1wencriP4Tv" role="3ElQJh">
+                                        <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="37vLTw" id="1wencriP4Tv" role="3ElQJh">
-                                <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                              <node concept="gl6BB" id="2hED36D1DuU" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="2hED36D1DuV" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="gl6BB" id="2hED36D1DuU" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2hED36D1DuV" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1wencriQFvS" role="3cqZAp" />
-              <node concept="3cpWs8" id="1wencriQusM" role="3cqZAp">
-                <node concept="3cpWsn" id="1wencriQusL" role="3cpWs9">
-                  <property role="TrG5h" value="sdfDate" />
-                  <node concept="3uibUv" id="1wencriQwk3" role="1tU5fm">
-                    <ref role="3uigEE" to="25x5:~SimpleDateFormat" resolve="SimpleDateFormat" />
-                  </node>
-                  <node concept="2ShNRf" id="1wencriQwMT" role="33vP2m">
-                    <node concept="1pGfFk" id="1wencriQwNb" role="2ShVmc">
-                      <ref role="37wK5l" to="25x5:~SimpleDateFormat.&lt;init&gt;(java.lang.String)" resolve="SimpleDateFormat" />
-                      <node concept="Xl_RD" id="1wencriQwNc" role="37wK5m">
-                        <property role="Xl_RC" value="yyyy-MM-dd_HH:mm:ss" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1wencriQusR" role="3cqZAp">
-                <node concept="3cpWsn" id="1wencriQusQ" role="3cpWs9">
-                  <property role="TrG5h" value="now" />
-                  <node concept="3uibUv" id="1wencriQy3K" role="1tU5fm">
-                    <ref role="3uigEE" to="33ny:~Date" resolve="Date" />
-                  </node>
-                  <node concept="2ShNRf" id="1wencriQyvt" role="33vP2m">
-                    <node concept="1pGfFk" id="1wencriQyvx" role="2ShVmc">
-                      <ref role="37wK5l" to="33ny:~Date.&lt;init&gt;()" resolve="Date" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1wencriQusV" role="3cqZAp">
-                <node concept="3cpWsn" id="1wencriQusU" role="3cpWs9">
-                  <property role="TrG5h" value="strDate" />
-                  <node concept="17QB3L" id="1wencriQyPo" role="1tU5fm" />
-                  <node concept="2OqwBi" id="1wencriQuUM" role="33vP2m">
-                    <node concept="37vLTw" id="1wencriQuUL" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1wencriQusL" resolve="sdfDate" />
-                    </node>
-                    <node concept="liA8E" id="1wencriQuUN" role="2OqNvi">
-                      <ref role="37wK5l" to="25x5:~DateFormat.format(java.util.Date)" resolve="format" />
-                      <node concept="37vLTw" id="1wencriQuUO" role="37wK5m">
-                        <ref role="3cqZAo" node="1wencriQusQ" resolve="now" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1wencriPDGD" role="3cqZAp">
-                <node concept="37vLTI" id="1wencriPDGF" role="3clFbG">
-                  <node concept="2pJPEk" id="1wencriOWzK" role="37vLTx">
-                    <node concept="2pJPED" id="1wencriOW_R" role="2pJPEn">
-                      <ref role="2pJxaS" to="6jj4:4CA5ZMJ3trC" resolve="MessageSequenceChart" />
-                      <node concept="2pJxcG" id="1wencriOWAM" role="2pJxcM">
-                        <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                        <node concept="WxPPo" id="7eXh0gmQhwM" role="28ntcv">
-                          <node concept="3cpWs3" id="1wencriQpjr" role="WxPPp">
-                            <node concept="Xl_RD" id="1wencriQpJP" role="3uHU7w">
-                              <property role="Xl_RC" value="_msc_trace" />
-                            </node>
-                            <node concept="3cpWs3" id="1wencriQzHU" role="3uHU7B">
-                              <node concept="37vLTw" id="1wencriQzYz" role="3uHU7w">
-                                <ref role="3cqZAo" node="1wencriQusU" resolve="strDate" />
-                              </node>
-                              <node concept="Xl_RD" id="1wencriP6qx" role="3uHU7B">
-                                <property role="Xl_RC" value="_" />
+                      <node concept="3clFbH" id="1wencriQFvS" role="3cqZAp" />
+                      <node concept="3cpWs8" id="1wencriQusM" role="3cqZAp">
+                        <node concept="3cpWsn" id="1wencriQusL" role="3cpWs9">
+                          <property role="TrG5h" value="sdfDate" />
+                          <node concept="3uibUv" id="1wencriQwk3" role="1tU5fm">
+                            <ref role="3uigEE" to="25x5:~SimpleDateFormat" resolve="SimpleDateFormat" />
+                          </node>
+                          <node concept="2ShNRf" id="1wencriQwMT" role="33vP2m">
+                            <node concept="1pGfFk" id="1wencriQwNb" role="2ShVmc">
+                              <ref role="37wK5l" to="25x5:~SimpleDateFormat.&lt;init&gt;(java.lang.String)" resolve="SimpleDateFormat" />
+                              <node concept="Xl_RD" id="1wencriQwNc" role="37wK5m">
+                                <property role="Xl_RC" value="yyyy-MM-dd_HH:mm:ss" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="2pIpSj" id="1wencriP6sY" role="2pJxcM">
-                        <ref role="2pIpSl" to="6jj4:4CA5ZMJ3tsn" resolve="objects" />
-                        <node concept="36biLy" id="1wencriP6tA" role="28nt2d">
-                          <node concept="2OqwBi" id="1wencriP6Nw" role="36biLW">
-                            <node concept="37vLTw" id="1wencriP6un" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
-                            </node>
-                            <node concept="T8wYR" id="1wencriP7eR" role="2OqNvi" />
+                      <node concept="3cpWs8" id="1wencriQusR" role="3cqZAp">
+                        <node concept="3cpWsn" id="1wencriQusQ" role="3cpWs9">
+                          <property role="TrG5h" value="now" />
+                          <node concept="3uibUv" id="1wencriQy3K" role="1tU5fm">
+                            <ref role="3uigEE" to="33ny:~Date" resolve="Date" />
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="1wencriPDGJ" role="37vLTJ">
-                    <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1wencriOWoY" role="3cqZAp" />
-              <node concept="3cpWs8" id="1wencriOVgT" role="3cqZAp">
-                <node concept="3cpWsn" id="1wencriOVgU" role="3cpWs9">
-                  <property role="TrG5h" value="numberOfSteps" />
-                  <node concept="10Oyi0" id="1wencriOV7K" role="1tU5fm" />
-                  <node concept="2OqwBi" id="1wencriOVgV" role="33vP2m">
-                    <node concept="37vLTw" id="1wencriOVgW" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2xeYpNCxBdp" resolve="res" />
-                    </node>
-                    <node concept="liA8E" id="6f7vJBUjNIk" role="2OqNvi">
-                      <ref role="37wK5l" to="4c75:6f7vJBUj7Na" resolve="getNumberOfWitnessSteps" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Dw8fO" id="1wencriOVjz" role="3cqZAp">
-                <node concept="3clFbS" id="1wencriOVj_" role="2LFqv$">
-                  <node concept="3cpWs8" id="1wencriP8Hv" role="3cqZAp">
-                    <node concept="3cpWsn" id="1wencriP8Hy" role="3cpWs9">
-                      <property role="TrG5h" value="state" />
-                      <node concept="3Tqbb2" id="1wencriP8Ht" role="1tU5fm">
-                        <ref role="ehGHo" to="6jj4:HiEhrZeLlj" resolve="StateDistributed" />
-                      </node>
-                      <node concept="2ShNRf" id="1wencriP8Mm" role="33vP2m">
-                        <node concept="3zrR0B" id="1wencriP8Uw" role="2ShVmc">
-                          <node concept="3Tqbb2" id="1wencriP8Uy" role="3zrR0E">
-                            <ref role="ehGHo" to="6jj4:HiEhrZeLlj" resolve="StateDistributed" />
+                          <node concept="2ShNRf" id="1wencriQyvt" role="33vP2m">
+                            <node concept="1pGfFk" id="1wencriQyvx" role="2ShVmc">
+                              <ref role="37wK5l" to="33ny:~Date.&lt;init&gt;()" resolve="Date" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs8" id="1wencriP8_G" role="3cqZAp">
-                    <node concept="3cpWsn" id="1wencriP8_H" role="3cpWs9">
-                      <property role="TrG5h" value="var2Val" />
-                      <node concept="_YKpA" id="6f7vJBUjOIA" role="1tU5fm">
-                        <node concept="3uibUv" id="6f7vJBUjPBr" role="_ZDj9">
-                          <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="1wencriP8_I" role="33vP2m">
-                        <node concept="37vLTw" id="1wencriP8_J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2xeYpNCxBdp" resolve="res" />
-                        </node>
-                        <node concept="liA8E" id="1wencriP8_K" role="2OqNvi">
-                          <ref role="37wK5l" to="4c75:6f7vJBUjv3v" resolve="getAssignmentsInStep" />
-                          <node concept="37vLTw" id="1wencriP8_L" role="37wK5m">
-                            <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
+                      <node concept="3cpWs8" id="1wencriQusV" role="3cqZAp">
+                        <node concept="3cpWsn" id="1wencriQusU" role="3cpWs9">
+                          <property role="TrG5h" value="strDate" />
+                          <node concept="17QB3L" id="1wencriQyPo" role="1tU5fm" />
+                          <node concept="2OqwBi" id="1wencriQuUM" role="33vP2m">
+                            <node concept="37vLTw" id="1wencriQuUL" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1wencriQusL" resolve="sdfDate" />
+                            </node>
+                            <node concept="liA8E" id="1wencriQuUN" role="2OqNvi">
+                              <ref role="37wK5l" to="25x5:~DateFormat.format(java.util.Date)" resolve="format" />
+                              <node concept="37vLTw" id="1wencriQuUO" role="37wK5m">
+                                <ref role="3cqZAo" node="1wencriQusQ" resolve="now" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="2Gpval" id="1wencriPc66" role="3cqZAp">
-                    <node concept="2GrKxI" id="1wencriPc68" role="2Gsz3X">
-                      <property role="TrG5h" value="n" />
-                    </node>
-                    <node concept="37vLTw" id="1wencriVJGv" role="2GsD0m">
-                      <ref role="3cqZAo" node="1wencriT8cb" resolve="variablesToDisplay" />
-                    </node>
-                    <node concept="3clFbS" id="1wencriPc6c" role="2LFqv$">
-                      <node concept="3cpWs8" id="6f7vJBUkCiH" role="3cqZAp">
-                        <node concept="3cpWsn" id="6f7vJBUkCiI" role="3cpWs9">
-                          <property role="TrG5h" value="searchedVar2Val" />
-                          <node concept="3uibUv" id="6f7vJBUkCbI" role="1tU5fm">
-                            <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
-                          </node>
-                          <node concept="2OqwBi" id="6f7vJBUkCiJ" role="33vP2m">
-                            <node concept="37vLTw" id="6f7vJBUkCiK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1wencriP8_H" resolve="var2Val" />
-                            </node>
-                            <node concept="1z4cxt" id="6f7vJBUkCiL" role="2OqNvi">
-                              <node concept="1bVj0M" id="6f7vJBUkCiM" role="23t8la">
-                                <node concept="3clFbS" id="6f7vJBUkCiN" role="1bW5cS">
-                                  <node concept="3clFbF" id="6f7vJBUkCiO" role="3cqZAp">
-                                    <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="2hED36D1DuW" resolve="it" />
-                                        </node>
-                                        <node concept="liA8E" id="6f7vJBUkCiS" role="2OqNvi">
-                                          <ref role="37wK5l" to="4c75:1ZsZb$iUjw_" resolve="getLhsString" />
-                                        </node>
+                      <node concept="3clFbF" id="1wencriPDGD" role="3cqZAp">
+                        <node concept="37vLTI" id="1wencriPDGF" role="3clFbG">
+                          <node concept="2pJPEk" id="1wencriOWzK" role="37vLTx">
+                            <node concept="2pJPED" id="1wencriOW_R" role="2pJPEn">
+                              <ref role="2pJxaS" to="6jj4:4CA5ZMJ3trC" resolve="MessageSequenceChart" />
+                              <node concept="2pJxcG" id="1wencriOWAM" role="2pJxcM">
+                                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
+                                <node concept="WxPPo" id="7eXh0gmQhwM" role="28ntcv">
+                                  <node concept="3cpWs3" id="1wencriQpjr" role="WxPPp">
+                                    <node concept="Xl_RD" id="1wencriQpJP" role="3uHU7w">
+                                      <property role="Xl_RC" value="_msc_trace" />
+                                    </node>
+                                    <node concept="3cpWs3" id="1wencriQzHU" role="3uHU7B">
+                                      <node concept="37vLTw" id="1wencriQzYz" role="3uHU7w">
+                                        <ref role="3cqZAo" node="1wencriQusU" resolve="strDate" />
                                       </node>
-                                      <node concept="liA8E" id="6f7vJBUkCiT" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                                        <node concept="2GrUjf" id="6f7vJBUkCiU" role="37wK5m">
-                                          <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
-                                        </node>
+                                      <node concept="Xl_RD" id="1wencriP6qx" role="3uHU7B">
+                                        <property role="Xl_RC" value="_" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="gl6BB" id="2hED36D1DuW" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="2hED36D1DuX" role="1tU5fm" />
+                              </node>
+                              <node concept="2pIpSj" id="1wencriP6sY" role="2pJxcM">
+                                <ref role="2pIpSl" to="6jj4:4CA5ZMJ3tsn" resolve="objects" />
+                                <node concept="36biLy" id="1wencriP6tA" role="28nt2d">
+                                  <node concept="2OqwBi" id="1wencriP6Nw" role="36biLW">
+                                    <node concept="37vLTw" id="1wencriP6un" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                    </node>
+                                    <node concept="T8wYR" id="1wencriP7eR" role="2OqNvi" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="37vLTw" id="1wencriPDGJ" role="37vLTJ">
+                            <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="3clFbJ" id="6f7vJBUkH2R" role="3cqZAp">
-                        <node concept="3clFbS" id="6f7vJBUkH2T" role="3clFbx">
-                          <node concept="3cpWs8" id="1wencriPTP4" role="3cqZAp">
-                            <node concept="3cpWsn" id="1wencriPTP5" role="3cpWs9">
-                              <property role="TrG5h" value="crtVal" />
-                              <node concept="17QB3L" id="1wencriPV1D" role="1tU5fm" />
-                              <node concept="2OqwBi" id="6f7vJBUkOTK" role="33vP2m">
-                                <node concept="37vLTw" id="6f7vJBUkOzI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6f7vJBUkCiI" resolve="searchedVar2Val" />
-                                </node>
-                                <node concept="liA8E" id="6f7vJBUkPjq" role="2OqNvi">
-                                  <ref role="37wK5l" to="4c75:1ZsZb$iUjwH" resolve="getRhsString" />
+                      <node concept="3clFbH" id="1wencriOWoY" role="3cqZAp" />
+                      <node concept="3cpWs8" id="1wencriOVgT" role="3cqZAp">
+                        <node concept="3cpWsn" id="1wencriOVgU" role="3cpWs9">
+                          <property role="TrG5h" value="numberOfSteps" />
+                          <node concept="10Oyi0" id="1wencriOV7K" role="1tU5fm" />
+                          <node concept="2OqwBi" id="1wencriOVgV" role="33vP2m">
+                            <node concept="37vLTw" id="1wencriOVgW" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2xeYpNCxBdp" resolve="res" />
+                            </node>
+                            <node concept="liA8E" id="6f7vJBUjNIk" role="2OqNvi">
+                              <ref role="37wK5l" to="4c75:6f7vJBUj7Na" resolve="getNumberOfWitnessSteps" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1Dw8fO" id="1wencriOVjz" role="3cqZAp">
+                        <node concept="3clFbS" id="1wencriOVj_" role="2LFqv$">
+                          <node concept="3cpWs8" id="1wencriP8Hv" role="3cqZAp">
+                            <node concept="3cpWsn" id="1wencriP8Hy" role="3cpWs9">
+                              <property role="TrG5h" value="state" />
+                              <node concept="3Tqbb2" id="1wencriP8Ht" role="1tU5fm">
+                                <ref role="ehGHo" to="6jj4:HiEhrZeLlj" resolve="StateDistributed" />
+                              </node>
+                              <node concept="2ShNRf" id="1wencriP8Mm" role="33vP2m">
+                                <node concept="3zrR0B" id="1wencriP8Uw" role="2ShVmc">
+                                  <node concept="3Tqbb2" id="1wencriP8Uy" role="3zrR0E">
+                                    <ref role="ehGHo" to="6jj4:HiEhrZeLlj" resolve="StateDistributed" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbF" id="1wencriPcRN" role="3cqZAp">
-                            <node concept="2OqwBi" id="1wencriPegu" role="3clFbG">
-                              <node concept="2OqwBi" id="1wencriPcZ0" role="2Oq$k0">
-                                <node concept="37vLTw" id="1wencriPcRM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1wencriP8Hy" resolve="state" />
+                          <node concept="3cpWs8" id="1wencriP8_G" role="3cqZAp">
+                            <node concept="3cpWsn" id="1wencriP8_H" role="3cpWs9">
+                              <property role="TrG5h" value="var2Val" />
+                              <node concept="_YKpA" id="6f7vJBUjOIA" role="1tU5fm">
+                                <node concept="3uibUv" id="6f7vJBUjPBr" role="_ZDj9">
+                                  <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
                                 </node>
-                                <node concept="3Tsc0h" id="1wencriPd9b" role="2OqNvi">
-                                  <ref role="3TtcxE" to="6jj4:HiEhrZeLrA" resolve="instances" />
+                              </node>
+                              <node concept="2OqwBi" id="1wencriP8_I" role="33vP2m">
+                                <node concept="37vLTw" id="1wencriP8_J" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2xeYpNCxBdp" resolve="res" />
+                                </node>
+                                <node concept="liA8E" id="1wencriP8_K" role="2OqNvi">
+                                  <ref role="37wK5l" to="4c75:6f7vJBUjv3v" resolve="getAssignmentsInStep" />
+                                  <node concept="37vLTw" id="1wencriP8_L" role="37wK5m">
+                                    <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="TSZUe" id="1wencriPfwn" role="2OqNvi">
-                                <node concept="2pJPEk" id="1wencriPfMV" role="25WWJ7">
-                                  <node concept="2pJPED" id="1wencriPg1A" role="2pJPEn">
-                                    <ref role="2pJxaS" to="6jj4:HiEhrZeLox" resolve="StateInstance" />
-                                    <node concept="2pIpSj" id="1wencriPgdV" role="2pJxcM">
-                                      <ref role="2pIpSl" to="6jj4:HiEhrZgdjG" resolve="exp" />
-                                      <node concept="2pJPED" id="1wencriPhbK" role="28nt2d">
-                                        <ref role="2pJxaS" to="ehqg:6mm$FLYVIYX" resolve="ArbitraryTextExpression" />
-                                        <node concept="2pJxcG" id="1wencriPhfc" role="2pJxcM">
-                                          <ref role="2pJxcJ" to="ehqg:6mm$FLYVIZj" resolve="value" />
-                                          <node concept="WxPPo" id="7eXh0gmQhwN" role="28ntcv">
-                                            <node concept="37vLTw" id="1wencriPTPb" role="WxPPp">
-                                              <ref role="3cqZAo" node="1wencriPTP5" resolve="crtVal" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
+                            </node>
+                          </node>
+                          <node concept="2Gpval" id="1wencriPc66" role="3cqZAp">
+                            <node concept="2GrKxI" id="1wencriPc68" role="2Gsz3X">
+                              <property role="TrG5h" value="n" />
+                            </node>
+                            <node concept="37vLTw" id="1wencriVJGv" role="2GsD0m">
+                              <ref role="3cqZAo" node="2i2e8U2BIyl" resolve="variablesToDisplay" />
+                            </node>
+                            <node concept="3clFbS" id="1wencriPc6c" role="2LFqv$">
+                              <node concept="3cpWs8" id="6f7vJBUkCiH" role="3cqZAp">
+                                <node concept="3cpWsn" id="6f7vJBUkCiI" role="3cpWs9">
+                                  <property role="TrG5h" value="searchedVar2Val" />
+                                  <node concept="3uibUv" id="6f7vJBUkCbI" role="1tU5fm">
+                                    <ref role="3uigEE" to="4c75:1ZsZb$iTgio" resolve="Var2ValEntry" />
+                                  </node>
+                                  <node concept="2OqwBi" id="6f7vJBUkCiJ" role="33vP2m">
+                                    <node concept="37vLTw" id="6f7vJBUkCiK" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1wencriP8_H" resolve="var2Val" />
                                     </node>
-                                    <node concept="2pIpSj" id="1wencriPh$c" role="2pJxcM">
-                                      <ref role="2pIpSl" to="6jj4:HiEhrZeNaj" resolve="source" />
-                                      <node concept="2pJPED" id="1wencriPirE" role="28nt2d">
-                                        <ref role="2pJxaS" to="6jj4:5PdLXX5HGha" resolve="MSCObjectRef" />
-                                        <node concept="2pIpSj" id="1wencriPivS" role="2pJxcM">
-                                          <ref role="2pIpSl" to="6jj4:5PdLXX5HGhd" resolve="mscObject" />
-                                          <node concept="36biLy" id="1wencriPhLP" role="28nt2d">
-                                            <node concept="3EllGN" id="1wencriPici" role="36biLW">
-                                              <node concept="2GrUjf" id="1wencriPig1" role="3ElVtu">
-                                                <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
+                                    <node concept="1z4cxt" id="6f7vJBUkCiL" role="2OqNvi">
+                                      <node concept="1bVj0M" id="6f7vJBUkCiM" role="23t8la">
+                                        <node concept="3clFbS" id="6f7vJBUkCiN" role="1bW5cS">
+                                          <node concept="3clFbF" id="6f7vJBUkCiO" role="3cqZAp">
+                                            <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="2hED36D1DuW" resolve="it" />
+                                                </node>
+                                                <node concept="liA8E" id="6f7vJBUkCiS" role="2OqNvi">
+                                                  <ref role="37wK5l" to="4c75:1ZsZb$iUjw_" resolve="getLhsString" />
+                                                </node>
                                               </node>
-                                              <node concept="37vLTw" id="1wencriPhMA" role="3ElQJh">
-                                                <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                              <node concept="liA8E" id="6f7vJBUkCiT" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                                                <node concept="2GrUjf" id="6f7vJBUkCiU" role="37wK5m">
+                                                  <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
+                                        <node concept="gl6BB" id="2hED36D1DuW" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="2hED36D1DuX" role="1tU5fm" />
+                                        </node>
                                       </node>
                                     </node>
-                                    <node concept="2pIpSj" id="1wencriPiAb" role="2pJxcM">
-                                      <ref role="2pIpSl" to="6jj4:HiEhrZeNak" resolve="target" />
-                                      <node concept="2pJPED" id="1wencriPiAc" role="28nt2d">
-                                        <ref role="2pJxaS" to="6jj4:5PdLXX5HGha" resolve="MSCObjectRef" />
-                                        <node concept="2pIpSj" id="1wencriPiAd" role="2pJxcM">
-                                          <ref role="2pIpSl" to="6jj4:5PdLXX5HGhd" resolve="mscObject" />
-                                          <node concept="36biLy" id="1wencriPiAe" role="28nt2d">
-                                            <node concept="3EllGN" id="1wencriPiAf" role="36biLW">
-                                              <node concept="2GrUjf" id="1wencriPiAg" role="3ElVtu">
-                                                <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbJ" id="6f7vJBUkH2R" role="3cqZAp">
+                                <node concept="3clFbS" id="6f7vJBUkH2T" role="3clFbx">
+                                  <node concept="3cpWs8" id="1wencriPTP4" role="3cqZAp">
+                                    <node concept="3cpWsn" id="1wencriPTP5" role="3cpWs9">
+                                      <property role="TrG5h" value="crtVal" />
+                                      <node concept="17QB3L" id="1wencriPV1D" role="1tU5fm" />
+                                      <node concept="2OqwBi" id="6f7vJBUkOTK" role="33vP2m">
+                                        <node concept="37vLTw" id="6f7vJBUkOzI" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="6f7vJBUkCiI" resolve="searchedVar2Val" />
+                                        </node>
+                                        <node concept="liA8E" id="6f7vJBUkPjq" role="2OqNvi">
+                                          <ref role="37wK5l" to="4c75:1ZsZb$iUjwH" resolve="getRhsString" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="1wencriPcRN" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1wencriPegu" role="3clFbG">
+                                      <node concept="2OqwBi" id="1wencriPcZ0" role="2Oq$k0">
+                                        <node concept="37vLTw" id="1wencriPcRM" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="1wencriP8Hy" resolve="state" />
+                                        </node>
+                                        <node concept="3Tsc0h" id="1wencriPd9b" role="2OqNvi">
+                                          <ref role="3TtcxE" to="6jj4:HiEhrZeLrA" resolve="instances" />
+                                        </node>
+                                      </node>
+                                      <node concept="TSZUe" id="1wencriPfwn" role="2OqNvi">
+                                        <node concept="2pJPEk" id="1wencriPfMV" role="25WWJ7">
+                                          <node concept="2pJPED" id="1wencriPg1A" role="2pJPEn">
+                                            <ref role="2pJxaS" to="6jj4:HiEhrZeLox" resolve="StateInstance" />
+                                            <node concept="2pIpSj" id="1wencriPgdV" role="2pJxcM">
+                                              <ref role="2pIpSl" to="6jj4:HiEhrZgdjG" resolve="exp" />
+                                              <node concept="2pJPED" id="1wencriPhbK" role="28nt2d">
+                                                <ref role="2pJxaS" to="ehqg:6mm$FLYVIYX" resolve="ArbitraryTextExpression" />
+                                                <node concept="2pJxcG" id="1wencriPhfc" role="2pJxcM">
+                                                  <ref role="2pJxcJ" to="ehqg:6mm$FLYVIZj" resolve="value" />
+                                                  <node concept="WxPPo" id="7eXh0gmQhwN" role="28ntcv">
+                                                    <node concept="37vLTw" id="1wencriPTPb" role="WxPPp">
+                                                      <ref role="3cqZAo" node="1wencriPTP5" resolve="crtVal" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="2pIpSj" id="1wencriPh$c" role="2pJxcM">
+                                              <ref role="2pIpSl" to="6jj4:HiEhrZeNaj" resolve="source" />
+                                              <node concept="2pJPED" id="1wencriPirE" role="28nt2d">
+                                                <ref role="2pJxaS" to="6jj4:5PdLXX5HGha" resolve="MSCObjectRef" />
+                                                <node concept="2pIpSj" id="1wencriPivS" role="2pJxcM">
+                                                  <ref role="2pIpSl" to="6jj4:5PdLXX5HGhd" resolve="mscObject" />
+                                                  <node concept="36biLy" id="1wencriPhLP" role="28nt2d">
+                                                    <node concept="3EllGN" id="1wencriPici" role="36biLW">
+                                                      <node concept="2GrUjf" id="1wencriPig1" role="3ElVtu">
+                                                        <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
+                                                      </node>
+                                                      <node concept="37vLTw" id="1wencriPhMA" role="3ElQJh">
+                                                        <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                               </node>
-                                              <node concept="37vLTw" id="1wencriPiAh" role="3ElQJh">
-                                                <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                            </node>
+                                            <node concept="2pIpSj" id="1wencriPiAb" role="2pJxcM">
+                                              <ref role="2pIpSl" to="6jj4:HiEhrZeNak" resolve="target" />
+                                              <node concept="2pJPED" id="1wencriPiAc" role="28nt2d">
+                                                <ref role="2pJxaS" to="6jj4:5PdLXX5HGha" resolve="MSCObjectRef" />
+                                                <node concept="2pIpSj" id="1wencriPiAd" role="2pJxcM">
+                                                  <ref role="2pIpSl" to="6jj4:5PdLXX5HGhd" resolve="mscObject" />
+                                                  <node concept="36biLy" id="1wencriPiAe" role="28nt2d">
+                                                    <node concept="3EllGN" id="1wencriPiAf" role="36biLW">
+                                                      <node concept="2GrUjf" id="1wencriPiAg" role="3ElVtu">
+                                                        <ref role="2Gs0qQ" node="1wencriPc68" resolve="n" />
+                                                      </node>
+                                                      <node concept="37vLTw" id="1wencriPiAh" role="3ElQJh">
+                                                        <ref role="3cqZAo" node="1wencriP1Ez" resolve="variableName2CorrespondingMSCObject" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
@@ -685,121 +687,121 @@
                                     </node>
                                   </node>
                                 </node>
+                                <node concept="3y3z36" id="6f7vJBUkJ0z" role="3clFbw">
+                                  <node concept="10Nm6u" id="6f7vJBUkJwH" role="3uHU7w" />
+                                  <node concept="37vLTw" id="6f7vJBUkHyc" role="3uHU7B">
+                                    <ref role="3cqZAo" node="6f7vJBUkCiI" resolve="searchedVar2Val" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="3y3z36" id="6f7vJBUkJ0z" role="3clFbw">
-                          <node concept="10Nm6u" id="6f7vJBUkJwH" role="3uHU7w" />
-                          <node concept="37vLTw" id="6f7vJBUkHyc" role="3uHU7B">
-                            <ref role="3cqZAo" node="6f7vJBUkCiI" resolve="searchedVar2Val" />
+                          <node concept="3clFbF" id="1wencriP8Xe" role="3cqZAp">
+                            <node concept="2OqwBi" id="1wencriPae6" role="3clFbG">
+                              <node concept="2OqwBi" id="1wencriP96c" role="2Oq$k0">
+                                <node concept="37vLTw" id="1wencriP8Xc" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
+                                </node>
+                                <node concept="3Tsc0h" id="1wencriP9i$" role="2OqNvi">
+                                  <ref role="3TtcxE" to="6jj4:4CA5ZMJ3tsp" resolve="messages" />
+                                </node>
+                              </node>
+                              <node concept="TSZUe" id="1wencriPbAW" role="2OqNvi">
+                                <node concept="37vLTw" id="1wencriPbJa" role="25WWJ7">
+                                  <ref role="3cqZAo" node="1wencriP8Hy" resolve="state" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="1wencriP8Xe" role="3cqZAp">
-                    <node concept="2OqwBi" id="1wencriPae6" role="3clFbG">
-                      <node concept="2OqwBi" id="1wencriP96c" role="2Oq$k0">
-                        <node concept="37vLTw" id="1wencriP8Xc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
+                        <node concept="3cpWsn" id="1wencriOVjA" role="1Duv9x">
+                          <property role="TrG5h" value="i" />
+                          <node concept="10Oyi0" id="1wencriOVkn" role="1tU5fm" />
+                          <node concept="3cmrfG" id="1wencriOVln" role="33vP2m">
+                            <property role="3cmrfH" value="0" />
+                          </node>
                         </node>
-                        <node concept="3Tsc0h" id="1wencriP9i$" role="2OqNvi">
-                          <ref role="3TtcxE" to="6jj4:4CA5ZMJ3tsp" resolve="messages" />
+                        <node concept="3eOVzh" id="1wencriOW2j" role="1Dwp0S">
+                          <node concept="37vLTw" id="1wencriOW3c" role="3uHU7w">
+                            <ref role="3cqZAo" node="1wencriOVgU" resolve="numberOfSteps" />
+                          </node>
+                          <node concept="37vLTw" id="1wencriOVlU" role="3uHU7B">
+                            <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
+                          </node>
                         </node>
-                      </node>
-                      <node concept="TSZUe" id="1wencriPbAW" role="2OqNvi">
-                        <node concept="37vLTw" id="1wencriPbJa" role="25WWJ7">
-                          <ref role="3cqZAo" node="1wencriP8Hy" resolve="state" />
+                        <node concept="3uNrnE" id="1wencriOW89" role="1Dwrff">
+                          <node concept="37vLTw" id="1wencriOW8b" role="2$L3a6">
+                            <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3cpWsn" id="1wencriOVjA" role="1Duv9x">
-                  <property role="TrG5h" value="i" />
-                  <node concept="10Oyi0" id="1wencriOVkn" role="1tU5fm" />
-                  <node concept="3cmrfG" id="1wencriOVln" role="33vP2m">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                </node>
-                <node concept="3eOVzh" id="1wencriOW2j" role="1Dwp0S">
-                  <node concept="37vLTw" id="1wencriOW3c" role="3uHU7w">
-                    <ref role="3cqZAo" node="1wencriOVgU" resolve="numberOfSteps" />
-                  </node>
-                  <node concept="37vLTw" id="1wencriOVlU" role="3uHU7B">
-                    <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
-                  </node>
-                </node>
-                <node concept="3uNrnE" id="1wencriOW89" role="1Dwrff">
-                  <node concept="37vLTw" id="1wencriOW8b" role="2$L3a6">
-                    <ref role="3cqZAo" node="1wencriOVjA" resolve="i" />
+                  <node concept="37vLTw" id="1wencriP_bf" role="ukAjM">
+                    <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
                   </node>
                 </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="1wencriP_bf" role="ukAjM">
-            <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="1wencriWrA0" role="3cqZAp" />
-        <node concept="1QHqEF" id="1wencriP7Fh" role="3cqZAp">
-          <node concept="1QHqEC" id="1wencriP7Fj" role="1QHqEI">
-            <node concept="3clFbS" id="1wencriP7Fl" role="1bW5cS">
-              <node concept="3clFbF" id="1wencriP7ZV" role="3cqZAp">
-                <node concept="2OqwBi" id="1wencriP85N" role="3clFbG">
-                  <node concept="37vLTw" id="1wencriP7ZU" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1wencriOLo8" resolve="m" />
-                  </node>
-                  <node concept="3BYIHo" id="1wencriP8bH" role="2OqNvi">
-                    <node concept="37vLTw" id="1wencriP8eu" role="3BYIHq">
-                      <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2k2dPZH4hat" role="3cqZAp">
-                <node concept="2OqwBi" id="2k2dPZH4hau" role="3clFbG">
-                  <node concept="2OqwBi" id="2k2dPZH4hav" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2k2dPZH4haw" role="2Oq$k0">
-                      <node concept="2ShNRf" id="2k2dPZH4hax" role="2Oq$k0">
-                        <node concept="1pGfFk" id="2k2dPZH4hay" role="2ShVmc">
-                          <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                          <node concept="37vLTw" id="1wencriWiHH" role="37wK5m">
-                            <ref role="3cqZAo" node="1wencriWhXI" resolve="proj" />
+                <node concept="3clFbH" id="1wencriWrA0" role="3cqZAp" />
+                <node concept="1QHqEF" id="1wencriP7Fh" role="3cqZAp">
+                  <node concept="1QHqEC" id="1wencriP7Fj" role="1QHqEI">
+                    <node concept="3clFbS" id="1wencriP7Fl" role="1bW5cS">
+                      <node concept="3clFbF" id="1wencriP7ZV" role="3cqZAp">
+                        <node concept="2OqwBi" id="1wencriP85N" role="3clFbG">
+                          <node concept="37vLTw" id="1wencriP7ZU" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1wencriOLo8" resolve="m" />
+                          </node>
+                          <node concept="3BYIHo" id="1wencriP8bH" role="2OqNvi">
+                            <node concept="37vLTw" id="1wencriP8eu" role="3BYIHq">
+                              <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2k2dPZH4ha_" role="2OqNvi">
-                        <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                        <node concept="3clFbT" id="2k2dPZH4haA" role="37wK5m">
-                          <property role="3clFbU" value="true" />
+                      <node concept="3clFbF" id="2k2dPZH4hat" role="3cqZAp">
+                        <node concept="2OqwBi" id="2k2dPZH4hau" role="3clFbG">
+                          <node concept="2OqwBi" id="2k2dPZH4hav" role="2Oq$k0">
+                            <node concept="2OqwBi" id="2k2dPZH4haw" role="2Oq$k0">
+                              <node concept="2ShNRf" id="2k2dPZH4hax" role="2Oq$k0">
+                                <node concept="1pGfFk" id="2k2dPZH4hay" role="2ShVmc">
+                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
+                                  <node concept="37vLTw" id="1wencriWiHH" role="37wK5m">
+                                    <ref role="3cqZAo" node="1wencriWhXI" resolve="proj" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="2k2dPZH4ha_" role="2OqNvi">
+                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
+                                <node concept="3clFbT" id="2k2dPZH4haA" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="2k2dPZH4haB" role="2OqNvi">
+                              <ref role="37wK5l" to="kz9k:~EditorNavigator.selectIfChild()" resolve="selectIfChild" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="2k2dPZH4haC" role="2OqNvi">
+                            <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
+                            <node concept="2ShNRf" id="2k2dPZH4haD" role="37wK5m">
+                              <node concept="1pGfFk" id="2k2dPZH4haE" role="2ShVmc">
+                                <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
+                                <node concept="37vLTw" id="1wencriW21s" role="37wK5m">
+                                  <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2k2dPZH4haB" role="2OqNvi">
-                      <ref role="37wK5l" to="kz9k:~EditorNavigator.selectIfChild()" resolve="selectIfChild" />
-                    </node>
                   </node>
-                  <node concept="liA8E" id="2k2dPZH4haC" role="2OqNvi">
-                    <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                    <node concept="2ShNRf" id="2k2dPZH4haD" role="37wK5m">
-                      <node concept="1pGfFk" id="2k2dPZH4haE" role="2ShVmc">
-                        <ref role="37wK5l" to="w1kc:~SNodePointer.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="SNodePointer" />
-                        <node concept="37vLTw" id="1wencriW21s" role="37wK5m">
-                          <ref role="3cqZAo" node="1wencriOWrR" resolve="msc" />
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="1wencriP7Y4" role="ukAjM">
+                    <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="1wencriP7Y4" role="ukAjM">
-            <ref role="3cqZAo" node="7V1Bqz797Br" resolve="repo" />
-          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="1wencriOLn6" role="1B3o_S" />
@@ -832,356 +834,64 @@
   <node concept="312cEu" id="1wencriQFZN">
     <property role="TrG5h" value="SelectionOfRelevantVariables" />
     <node concept="2tJIrI" id="1wencriQG1H" role="jymVt" />
-    <node concept="Wx3nA" id="1wencriRYyS" role="jymVt">
-      <property role="TrG5h" value="selectedVariables" />
-      <node concept="_YKpA" id="6f7vJBUl7t6" role="1tU5fm">
-        <node concept="17QB3L" id="6f7vJBUl8tP" role="_ZDj9" />
-      </node>
-      <node concept="2ShNRf" id="1wencriS0NI" role="33vP2m">
-        <node concept="2Jqq0_" id="6f7vJBUldau" role="2ShVmc">
-          <node concept="17QB3L" id="6f7vJBUldNe" role="HW$YZ" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1wencriQTw7" role="jymVt" />
     <node concept="2YIFZL" id="1wencriQVM8" role="jymVt">
       <property role="TrG5h" value="variablesWhichIShouldDisplay" />
       <node concept="3clFbS" id="1wencriQVMb" role="3clF47">
-        <node concept="3clFbF" id="1wencriS2x3" role="3cqZAp">
-          <node concept="2OqwBi" id="1wencriS49_" role="3clFbG">
-            <node concept="37vLTw" id="1wencriS2x1" role="2Oq$k0">
-              <ref role="3cqZAo" node="1wencriRYyS" resolve="selectedVariables" />
+        <node concept="3clFbF" id="2i2e8U2A_MC" role="3cqZAp">
+          <node concept="2OqwBi" id="2i2e8U2ABhD" role="3clFbG">
+            <node concept="2YIFZM" id="2i2e8U2AAHG" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="2Kehj3" id="1wencriS68b" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1wencriRGdi" role="3cqZAp">
-          <node concept="3cpWsn" id="1wencriRGdl" role="3cpWs9">
-            <property role="TrG5h" value="item2VariableNames" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3rvAFt" id="1wencriRGdc" role="1tU5fm">
-              <node concept="3uibUv" id="1wencriRJ52" role="3rvQeY">
-                <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-              </node>
-              <node concept="17QB3L" id="6f7vJBUleVb" role="3rvSg0" />
-            </node>
-            <node concept="2ShNRf" id="1wencriRHXX" role="33vP2m">
-              <node concept="3rGOSV" id="1wencriRIAM" role="2ShVmc">
-                <node concept="3uibUv" id="1wencriRJwx" role="3rHrn6">
-                  <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                </node>
-                <node concept="17QB3L" id="6f7vJBUlgsP" role="3rHtpV" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1wencriRkXb" role="3cqZAp">
-          <node concept="3cpWsn" id="1wencriRkXe" role="3cpWs9">
-            <property role="TrG5h" value="items" />
-            <node concept="_YKpA" id="1wencriRkX7" role="1tU5fm">
-              <node concept="3uibUv" id="1wencriRlL1" role="_ZDj9">
-                <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1wencriRma0" role="33vP2m">
-              <node concept="Tc6Ow" id="1wencriRmLi" role="2ShVmc">
-                <node concept="3uibUv" id="1wencriRnpE" role="HW$YZ">
-                  <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1wencriV4PM" role="3cqZAp" />
-        <node concept="1QHqEK" id="1wencriV7sG" role="3cqZAp">
-          <node concept="1QHqEC" id="1wencriV7sI" role="1QHqEI">
-            <node concept="3clFbS" id="1wencriV7sK" role="1bW5cS">
-              <node concept="2Gpval" id="1wencriRsrJ" role="3cqZAp">
-                <node concept="2GrKxI" id="1wencriRsrL" role="2Gsz3X">
-                  <property role="TrG5h" value="n" />
-                </node>
-                <node concept="37vLTw" id="1wencriRtUL" role="2GsD0m">
-                  <ref role="3cqZAo" node="1wencriRhLy" resolve="allAssignedVariables" />
-                </node>
-                <node concept="3clFbS" id="1wencriRsrP" role="2LFqv$">
-                  <node concept="3cpWs8" id="1wencriRJRy" role="3cqZAp">
-                    <node concept="3cpWsn" id="1wencriRJRz" role="3cpWs9">
-                      <property role="TrG5h" value="cli" />
-                      <node concept="3uibUv" id="1wencriRGwk" role="1tU5fm">
-                        <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
+            <node concept="liA8E" id="2i2e8U2AC2Q" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeAndWait(java.lang.Runnable)" resolve="invokeAndWait" />
+              <node concept="1bVj0M" id="2i2e8U2ACxk" role="37wK5m">
+                <node concept="3clFbS" id="2i2e8U2ACxn" role="1bW5cS">
+                  <node concept="3cpWs8" id="2i2e8U2yJ3C" role="3cqZAp">
+                    <node concept="3cpWsn" id="2i2e8U2yJ3D" role="3cpWs9">
+                      <property role="TrG5h" value="dialog" />
+                      <node concept="3uibUv" id="2i2e8U2yJ3E" role="1tU5fm">
+                        <ref role="3uigEE" node="2i2e8U2wXi9" resolve="CheckboxDialog" />
                       </node>
-                      <node concept="2ShNRf" id="1wencriRJR$" role="33vP2m">
-                        <node concept="1pGfFk" id="1wencriRJR_" role="2ShVmc">
-                          <ref role="37wK5l" node="1wencriQRhd" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                          <node concept="2GrUjf" id="6f7vJBUlelJ" role="37wK5m">
-                            <ref role="2Gs0qQ" node="1wencriRsrL" resolve="n" />
+                      <node concept="2ShNRf" id="2i2e8U2yMnn" role="33vP2m">
+                        <node concept="1pGfFk" id="2i2e8U2yO9E" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" node="2i2e8U2wXih" resolve="CheckboxDialog" />
+                          <node concept="37vLTw" id="2i2e8U2yYTS" role="37wK5m">
+                            <ref role="3cqZAo" node="1wencriRhLy" resolve="allAssignedVariables" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="1wencriRyry" role="3cqZAp">
-                    <node concept="2OqwBi" id="1wencriRz9f" role="3clFbG">
-                      <node concept="37vLTw" id="1wencriRyrw" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1wencriRkXe" resolve="items" />
+                  <node concept="3clFbH" id="2i2e8U2BweU" role="3cqZAp" />
+                  <node concept="3clFbJ" id="2i2e8U2$Ly3" role="3cqZAp">
+                    <node concept="2OqwBi" id="2i2e8U2$Myd" role="3clFbw">
+                      <node concept="37vLTw" id="2i2e8U2$LWN" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2i2e8U2yJ3D" resolve="dialog" />
                       </node>
-                      <node concept="TSZUe" id="1wencriR$pS" role="2OqNvi">
-                        <node concept="37vLTw" id="1wencriRJRB" role="25WWJ7">
-                          <ref role="3cqZAo" node="1wencriRJRz" resolve="cli" />
-                        </node>
+                      <node concept="liA8E" id="2i2e8U2$NaX" role="2OqNvi">
+                        <ref role="37wK5l" to="jkm4:~DialogWrapper.showAndGet()" resolve="showAndGet" />
                       </node>
                     </node>
-                  </node>
-                  <node concept="3clFbF" id="1wencriRLVq" role="3cqZAp">
-                    <node concept="37vLTI" id="1wencriRNm4" role="3clFbG">
-                      <node concept="2GrUjf" id="1wencriRNwQ" role="37vLTx">
-                        <ref role="2Gs0qQ" node="1wencriRsrL" resolve="n" />
-                      </node>
-                      <node concept="3EllGN" id="1wencriRN8J" role="37vLTJ">
-                        <node concept="37vLTw" id="1wencriRNek" role="3ElVtu">
-                          <ref role="3cqZAo" node="1wencriRJRz" resolve="cli" />
-                        </node>
-                        <node concept="37vLTw" id="1wencriRLVo" role="3ElQJh">
-                          <ref role="3cqZAo" node="1wencriRGdl" resolve="item2VariableNames" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="1wencriVdGC" role="ukAjM">
-            <ref role="3cqZAo" node="1wencriVcao" resolve="repo" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="1wencriRnH3" role="3cqZAp" />
-        <node concept="3cpWs8" id="1wencriQWWJ" role="3cqZAp">
-          <node concept="3cpWsn" id="1wencriQWWI" role="3cpWs9">
-            <property role="TrG5h" value="list" />
-            <node concept="3uibUv" id="1wencriQWWK" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JList" resolve="JList" />
-              <node concept="3uibUv" id="1wencriQWWL" role="11_B2D">
-                <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1wencriQY5l" role="33vP2m">
-              <node concept="1pGfFk" id="1wencriQYcZ" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JList.&lt;init&gt;(java.lang.Object[])" resolve="JList" />
-                <node concept="2OqwBi" id="1wencriRP1o" role="37wK5m">
-                  <node concept="37vLTw" id="1wencriRNCi" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1wencriRkXe" resolve="items" />
-                  </node>
-                  <node concept="3_kTaI" id="1wencriRQt_" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1wencriQWX1" role="3cqZAp">
-          <node concept="2OqwBi" id="1wencriR6V6" role="3clFbG">
-            <node concept="37vLTw" id="1wencriR6V5" role="2Oq$k0">
-              <ref role="3cqZAo" node="1wencriQWWI" resolve="list" />
-            </node>
-            <node concept="liA8E" id="1wencriR6V7" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JList.setCellRenderer(javax.swing.ListCellRenderer)" resolve="setCellRenderer" />
-              <node concept="2ShNRf" id="1wencriR6V8" role="37wK5m">
-                <node concept="HV5vD" id="1wencriR6V9" role="2ShVmc">
-                  <ref role="HV5vE" node="1wencriQG4L" resolve="SelectionOfRelevantVariables.CheckboxListRenderer" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1wencriQWX4" role="3cqZAp">
-          <node concept="2OqwBi" id="1wencriR6aE" role="3clFbG">
-            <node concept="37vLTw" id="1wencriR6aD" role="2Oq$k0">
-              <ref role="3cqZAo" node="1wencriQWWI" resolve="list" />
-            </node>
-            <node concept="liA8E" id="1wencriR6aF" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JList.setSelectionMode(int)" resolve="setSelectionMode" />
-              <node concept="10M0yZ" id="1wencriRAKN" role="37wK5m">
-                <ref role="3cqZAo" to="dxuu:~ListSelectionModel.MULTIPLE_INTERVAL_SELECTION" resolve="MULTIPLE_INTERVAL_SELECTION" />
-                <ref role="1PxDUh" to="dxuu:~ListSelectionModel" resolve="ListSelectionModel" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1wencriQWX7" role="3cqZAp">
-          <node concept="2OqwBi" id="1wencriR5lf" role="3clFbG">
-            <node concept="37vLTw" id="1wencriR5le" role="2Oq$k0">
-              <ref role="3cqZAo" node="1wencriQWWI" resolve="list" />
-            </node>
-            <node concept="liA8E" id="1wencriR5lg" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener)" resolve="addMouseListener" />
-              <node concept="2ShNRf" id="1wencriR5lh" role="37wK5m">
-                <node concept="YeOm9" id="1wencriR5li" role="2ShVmc">
-                  <node concept="1Y3b0j" id="1wencriR5lj" role="YeSDq">
-                    <ref role="1Y3XeK" to="hyam:~MouseAdapter" resolve="MouseAdapter" />
-                    <ref role="37wK5l" to="hyam:~MouseAdapter.&lt;init&gt;()" resolve="MouseAdapter" />
-                    <node concept="3clFb_" id="1wencriR5lk" role="jymVt">
-                      <property role="TrG5h" value="mouseClicked" />
-                      <node concept="37vLTG" id="1wencriR5ll" role="3clF46">
-                        <property role="TrG5h" value="event" />
-                        <node concept="3uibUv" id="1wencriREAj" role="1tU5fm">
-                          <ref role="3uigEE" to="hyam:~MouseEvent" resolve="MouseEvent" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="1wencriR5ln" role="3clF47">
-                        <node concept="3cpWs8" id="1wencriR5lo" role="3cqZAp">
-                          <node concept="3cpWsn" id="1wencriR5lp" role="3cpWs9">
-                            <property role="TrG5h" value="list" />
-                            <node concept="3uibUv" id="1wencriR5lq" role="1tU5fm">
-                              <ref role="3uigEE" to="dxuu:~JList" resolve="JList" />
-                              <node concept="3uibUv" id="1wencriR5lr" role="11_B2D">
-                                <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                              </node>
-                            </node>
-                            <node concept="10QFUN" id="1wencriR5ls" role="33vP2m">
-                              <node concept="2OqwBi" id="1wencriR5lt" role="10QFUP">
-                                <node concept="37vLTw" id="1wencriR5lu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1wencriR5ll" resolve="event" />
-                                </node>
-                                <node concept="liA8E" id="1wencriRRE7" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~EventObject.getSource()" resolve="getSource" />
-                                </node>
-                              </node>
-                              <node concept="3uibUv" id="1wencriR5lw" role="10QFUM">
-                                <ref role="3uigEE" to="dxuu:~JList" resolve="JList" />
-                                <node concept="3uibUv" id="1wencriR5lx" role="11_B2D">
-                                  <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                                </node>
-                              </node>
-                            </node>
+                    <node concept="3clFbS" id="2i2e8U2$Ly5" role="3clFbx">
+                      <node concept="3clFbF" id="2i2e8U2B$si" role="3cqZAp">
+                        <node concept="2OqwBi" id="2i2e8U2B_c8" role="3clFbG">
+                          <node concept="37vLTw" id="2i2e8U2B$sh" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2i2e8U2BrVo" resolve="callback" />
                           </node>
-                        </node>
-                        <node concept="3cpWs8" id="1wencriR5lD" role="3cqZAp">
-                          <node concept="3cpWsn" id="1wencriR5lE" role="3cpWs9">
-                            <property role="TrG5h" value="index" />
-                            <node concept="10Oyi0" id="1wencriR5lF" role="1tU5fm" />
-                            <node concept="2OqwBi" id="1wencriR5lG" role="33vP2m">
-                              <node concept="37vLTw" id="1wencriR5lH" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1wencriR5lp" resolve="list" />
+                          <node concept="1Bd96e" id="2i2e8U2B_ZE" role="2OqNvi">
+                            <node concept="2OqwBi" id="2i2e8U2zmpB" role="1BdPVh">
+                              <node concept="37vLTw" id="2i2e8U2zlFH" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2i2e8U2yJ3D" resolve="dialog" />
                               </node>
-                              <node concept="liA8E" id="1wencriR5lI" role="2OqNvi">
-                                <ref role="37wK5l" to="dxuu:~JList.locationToIndex(java.awt.Point)" resolve="locationToIndex" />
-                                <node concept="2OqwBi" id="1wencriRcxG" role="37wK5m">
-                                  <node concept="37vLTw" id="1wencriRcxF" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1wencriR5ll" resolve="event" />
-                                  </node>
-                                  <node concept="liA8E" id="1wencriRcxH" role="2OqNvi">
-                                    <ref role="37wK5l" to="hyam:~MouseEvent.getPoint()" resolve="getPoint" />
-                                  </node>
-                                </node>
+                              <node concept="liA8E" id="2i2e8U2znOC" role="2OqNvi">
+                                <ref role="37wK5l" node="2i2e8U2wXj7" resolve="getSelectedOptions" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3cpWs8" id="1wencriR5lK" role="3cqZAp">
-                          <node concept="3cpWsn" id="1wencriR5lL" role="3cpWs9">
-                            <property role="TrG5h" value="item" />
-                            <node concept="3uibUv" id="1wencriR5lM" role="1tU5fm">
-                              <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                            </node>
-                            <node concept="10QFUN" id="1wencriR5lN" role="33vP2m">
-                              <node concept="2OqwBi" id="1wencriR5lO" role="10QFUP">
-                                <node concept="2OqwBi" id="1wencriR5lP" role="2Oq$k0">
-                                  <node concept="37vLTw" id="1wencriR5lQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1wencriR5lp" resolve="list" />
-                                  </node>
-                                  <node concept="liA8E" id="1wencriR5lR" role="2OqNvi">
-                                    <ref role="37wK5l" to="dxuu:~JList.getModel()" resolve="getModel" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="1wencriR5lS" role="2OqNvi">
-                                  <ref role="37wK5l" to="dxuu:~ListModel.getElementAt(int)" resolve="getElementAt" />
-                                  <node concept="37vLTw" id="1wencriR5lT" role="37wK5m">
-                                    <ref role="3cqZAo" node="1wencriR5lE" resolve="index" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3uibUv" id="1wencriR5lU" role="10QFUM">
-                                <ref role="3uigEE" node="1wencriQRh3" resolve="SelectionOfRelevantVariables.CheckboxListItem" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="1wencriR5m0" role="3cqZAp">
-                          <node concept="2OqwBi" id="1wencriRcym" role="3clFbG">
-                            <node concept="37vLTw" id="1wencriRcyl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1wencriR5lL" resolve="item" />
-                            </node>
-                            <node concept="liA8E" id="1wencriRcyn" role="2OqNvi">
-                              <ref role="37wK5l" node="1wencriQRhv" resolve="setSelected" />
-                              <node concept="3fqX7Q" id="1wencriRcyo" role="37wK5m">
-                                <node concept="2OqwBi" id="1wencriRcyp" role="3fr31v">
-                                  <node concept="37vLTw" id="1wencriRcyq" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1wencriR5lL" resolve="item" />
-                                  </node>
-                                  <node concept="liA8E" id="1wencriRcyr" role="2OqNvi">
-                                    <ref role="37wK5l" node="1wencriQRhp" resolve="isSelected" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="1wencriR5ma" role="3cqZAp">
-                          <node concept="2OqwBi" id="1wencriRcCZ" role="3clFbG">
-                            <node concept="37vLTw" id="1wencriRcCY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1wencriR5lp" resolve="list" />
-                            </node>
-                            <node concept="liA8E" id="1wencriRcD0" role="2OqNvi">
-                              <ref role="37wK5l" to="dxuu:~JComponent.repaint(java.awt.Rectangle)" resolve="repaint" />
-                              <node concept="2OqwBi" id="1wencriRcD1" role="37wK5m">
-                                <node concept="37vLTw" id="1wencriRcD2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1wencriR5lp" resolve="list" />
-                                </node>
-                                <node concept="liA8E" id="1wencriRcD3" role="2OqNvi">
-                                  <ref role="37wK5l" to="dxuu:~JList.getCellBounds(int,int)" resolve="getCellBounds" />
-                                  <node concept="37vLTw" id="1wencriRcD4" role="37wK5m">
-                                    <ref role="3cqZAo" node="1wencriR5lE" resolve="index" />
-                                  </node>
-                                  <node concept="37vLTw" id="1wencriRcD5" role="37wK5m">
-                                    <ref role="3cqZAo" node="1wencriR5lE" resolve="index" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbJ" id="1wencriTor8" role="3cqZAp">
-                          <node concept="3clFbS" id="1wencriTora" role="3clFbx">
-                            <node concept="3clFbF" id="1wencriTqct" role="3cqZAp">
-                              <node concept="2OqwBi" id="1wencriTq_s" role="3clFbG">
-                                <node concept="37vLTw" id="1wencriTqcr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1wencriRYyS" resolve="selectedVariables" />
-                                </node>
-                                <node concept="TSZUe" id="1wencriTr8Y" role="2OqNvi">
-                                  <node concept="3EllGN" id="1wencriTuQH" role="25WWJ7">
-                                    <node concept="37vLTw" id="1wencriTvkT" role="3ElVtu">
-                                      <ref role="3cqZAo" node="1wencriR5lL" resolve="item" />
-                                    </node>
-                                    <node concept="37vLTw" id="1wencriTue8" role="3ElQJh">
-                                      <ref role="3cqZAo" node="1wencriRGdl" resolve="item2VariableNames" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="1wencriTpdc" role="3clFbw">
-                            <node concept="37vLTw" id="1wencriTp4l" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1wencriR5lL" resolve="item" />
-                            </node>
-                            <node concept="liA8E" id="1wencriTpPc" role="2OqNvi">
-                              <ref role="37wK5l" node="1wencriQRhp" resolve="isSelected" />
-                            </node>
-                          </node>
-                        </node>
                       </node>
-                      <node concept="3Tm1VV" id="1wencriR5mh" role="1B3o_S" />
-                      <node concept="3cqZAl" id="1wencriR5mi" role="3clF45" />
                     </node>
                   </node>
                 </node>
@@ -1189,65 +899,9 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1wencriQWU$" role="3cqZAp" />
-        <node concept="3cpWs8" id="1wencriSaxn" role="3cqZAp">
-          <node concept="3cpWsn" id="1wencriSaxm" role="3cpWs9">
-            <property role="TrG5h" value="listScroller" />
-            <node concept="3uibUv" id="1wencriSaxo" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~JScrollPane" resolve="JScrollPane" />
-            </node>
-            <node concept="2ShNRf" id="1wencriSb$2" role="33vP2m">
-              <node concept="1pGfFk" id="1wencriSbEM" role="2ShVmc">
-                <ref role="37wK5l" to="dxuu:~JScrollPane.&lt;init&gt;(java.awt.Component)" resolve="JScrollPane" />
-                <node concept="37vLTw" id="1wencriSbEN" role="37wK5m">
-                  <ref role="3cqZAo" node="1wencriQWWI" resolve="list" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1wencriSaxr" role="3cqZAp">
-          <node concept="2OqwBi" id="1wencriSbw2" role="3clFbG">
-            <node concept="37vLTw" id="1wencriSbw1" role="2Oq$k0">
-              <ref role="3cqZAo" node="1wencriSaxm" resolve="listScroller" />
-            </node>
-            <node concept="liA8E" id="1wencriSbw3" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
-              <node concept="2ShNRf" id="1wencriSc$Z" role="37wK5m">
-                <node concept="1pGfFk" id="1wencriSc_c" role="2ShVmc">
-                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                  <node concept="3cmrfG" id="1wencriSc_d" role="37wK5m">
-                    <property role="3cmrfH" value="250" />
-                  </node>
-                  <node concept="3cmrfG" id="1wencriSc_e" role="37wK5m">
-                    <property role="3cmrfH" value="80" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1wencriVvhb" role="3cqZAp">
-          <node concept="2YIFZM" id="1wencriVwIo" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JOptionPane.showConfirmDialog(java.awt.Component,java.lang.Object)" resolve="showConfirmDialog" />
-            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-            <node concept="10Nm6u" id="1wencriVy5R" role="37wK5m" />
-            <node concept="37vLTw" id="1wencriVyoq" role="37wK5m">
-              <ref role="3cqZAo" node="1wencriSaxm" resolve="listScroller" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1wencriVtVT" role="3cqZAp" />
-        <node concept="3clFbF" id="1wencriS7Fq" role="3cqZAp">
-          <node concept="37vLTw" id="1wencriS7Fo" role="3clFbG">
-            <ref role="3cqZAo" node="1wencriRYyS" resolve="selectedVariables" />
-          </node>
-        </node>
       </node>
       <node concept="3Tm1VV" id="1wencriQUDJ" role="1B3o_S" />
-      <node concept="_YKpA" id="1wencriQVLV" role="3clF45">
-        <node concept="17QB3L" id="6f7vJBUlgSk" role="_ZDj9" />
-      </node>
+      <node concept="3cqZAl" id="2i2e8U2BuT0" role="3clF45" />
       <node concept="37vLTG" id="1wencriVcao" role="3clF46">
         <property role="TrG5h" value="repo" />
         <node concept="3uibUv" id="1wencriVdxN" role="1tU5fm">
@@ -1260,6 +914,16 @@
           <node concept="17QB3L" id="6f7vJBUl6oE" role="_ZDj9" />
         </node>
       </node>
+      <node concept="37vLTG" id="2i2e8U2BrVo" role="3clF46">
+        <property role="TrG5h" value="callback" />
+        <property role="3TUv4t" value="true" />
+        <node concept="1ajhzC" id="2i2e8U2BsZG" role="1tU5fm">
+          <node concept="_YKpA" id="2i2e8U2BtpV" role="1ajw0F">
+            <node concept="17QB3L" id="2i2e8U2BtVv" role="_ZDj9" />
+          </node>
+          <node concept="3cqZAl" id="2i2e8U2BEY4" role="1ajl9A" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1wencriQTzm" role="jymVt" />
     <node concept="312cEu" id="1wencriQRh3" role="jymVt">
@@ -1484,5 +1148,251 @@
     </node>
     <node concept="3Tm1VV" id="1wencriQFZO" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2i2e8U2wXi9">
+    <property role="TrG5h" value="CheckboxDialog" />
+    <property role="2bfB8j" value="true" />
+    <node concept="3Tm1VV" id="2i2e8U2wXia" role="1B3o_S" />
+    <node concept="3uibUv" id="2i2e8U2wXib" role="1zkMxy">
+      <ref role="3uigEE" to="jkm4:~DialogWrapper" resolve="DialogWrapper" />
+    </node>
+    <node concept="312cEg" id="2i2e8U2wXic" role="jymVt">
+      <property role="TrG5h" value="checkBoxes" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="2i2e8U2wXig" role="1B3o_S" />
+      <node concept="_YKpA" id="2i2e8U2xFgP" role="1tU5fm">
+        <node concept="3uibUv" id="2i2e8U2xJ5c" role="_ZDj9">
+          <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i2e8U2yzRY" role="jymVt" />
+    <node concept="3clFbW" id="2i2e8U2wXih" role="jymVt">
+      <node concept="3cqZAl" id="2i2e8U2wXii" role="3clF45" />
+      <node concept="37vLTG" id="2i2e8U2wXij" role="3clF46">
+        <property role="TrG5h" value="options" />
+        <node concept="_YKpA" id="2i2e8U2yRM8" role="1tU5fm">
+          <node concept="17QB3L" id="2i2e8U2yU8d" role="_ZDj9" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2i2e8U2wXim" role="3clF47">
+        <node concept="XkiVB" id="2i2e8U2x93Q" role="3cqZAp">
+          <ref role="37wK5l" to="jkm4:~DialogWrapper.&lt;init&gt;(boolean)" resolve="DialogWrapper" />
+          <node concept="3clFbT" id="2i2e8U2x93R" role="37wK5m">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i2e8U2wXin" role="3cqZAp">
+          <node concept="37vLTI" id="2i2e8U2wXio" role="3clFbG">
+            <node concept="37vLTw" id="2i2e8U2wXip" role="37vLTJ">
+              <ref role="3cqZAo" node="2i2e8U2wXic" resolve="checkBoxes" />
+            </node>
+            <node concept="2ShNRf" id="2i2e8U2xOO4" role="37vLTx">
+              <node concept="Tc6Ow" id="2i2e8U2xS7E" role="2ShVmc" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="2i2e8U2wXir" role="3cqZAp">
+          <node concept="37vLTw" id="2i2e8U2wXi_" role="1DdaDG">
+            <ref role="3cqZAo" node="2i2e8U2wXij" resolve="options" />
+          </node>
+          <node concept="3cpWsn" id="2i2e8U2wXiy" role="1Duv9x">
+            <property role="TrG5h" value="option" />
+            <node concept="17QB3L" id="2i2e8U2xiQ1" role="1tU5fm" />
+          </node>
+          <node concept="3clFbS" id="2i2e8U2wXit" role="2LFqv$">
+            <node concept="3clFbF" id="2i2e8U2wXiu" role="3cqZAp">
+              <node concept="2OqwBi" id="2i2e8U2xei0" role="3clFbG">
+                <node concept="37vLTw" id="2i2e8U2x94g" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2i2e8U2wXic" resolve="checkBoxes" />
+                </node>
+                <node concept="TSZUe" id="2i2e8U2y1H2" role="2OqNvi">
+                  <node concept="2ShNRf" id="2i2e8U2xei2" role="25WWJ7">
+                    <node concept="1pGfFk" id="2i2e8U2xei3" role="2ShVmc">
+                      <ref role="37wK5l" to="qqrq:~JBCheckBox.&lt;init&gt;(java.lang.String)" resolve="JBCheckBox" />
+                      <node concept="37vLTw" id="2i2e8U2xei4" role="37wK5m">
+                        <ref role="3cqZAo" node="2i2e8U2wXiy" resolve="option" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i2e8U2wXiA" role="3cqZAp">
+          <node concept="1rXfSq" id="2i2e8U2wXiB" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~DialogWrapper.setTitle(java.lang.String)" resolve="setTitle" />
+            <node concept="Xl_RD" id="2i2e8U2wXiC" role="37wK5m">
+              <property role="Xl_RC" value="Select Options" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i2e8U2wXiD" role="3cqZAp">
+          <node concept="1rXfSq" id="2i2e8U2wXiE" role="3clFbG">
+            <ref role="37wK5l" to="jkm4:~DialogWrapper.init()" resolve="init" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2i2e8U2wXiH" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2i2e8U2yxbt" role="jymVt" />
+    <node concept="3clFb_" id="2i2e8U2wXiI" role="jymVt">
+      <property role="TrG5h" value="createCenterPanel" />
+      <node concept="2AHcQZ" id="2i2e8U2wXiJ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="2AHcQZ" id="2i2e8U2wXiK" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="3clFbS" id="2i2e8U2wXiL" role="3clF47">
+        <node concept="3cpWs8" id="2i2e8U2wXiN" role="3cqZAp">
+          <node concept="3cpWsn" id="2i2e8U2wXiM" role="3cpWs9">
+            <property role="TrG5h" value="panel" />
+            <node concept="3uibUv" id="2i2e8U2wXiO" role="1tU5fm">
+              <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
+            </node>
+            <node concept="2ShNRf" id="2i2e8U2x91U" role="33vP2m">
+              <node concept="1pGfFk" id="2i2e8U2x93E" role="2ShVmc">
+                <ref role="37wK5l" to="dxuu:~JPanel.&lt;init&gt;(java.awt.LayoutManager)" resolve="JPanel" />
+                <node concept="2ShNRf" id="2i2e8U2x93F" role="37wK5m">
+                  <node concept="1pGfFk" id="2i2e8U2x93G" role="2ShVmc">
+                    <ref role="37wK5l" to="z60i:~GridLayout.&lt;init&gt;(int,int)" resolve="GridLayout" />
+                    <node concept="3cmrfG" id="2i2e8U2x93H" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                    <node concept="3cmrfG" id="2i2e8U2x93I" role="37wK5m">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="2i2e8U2wXiT" role="3cqZAp">
+          <node concept="37vLTw" id="2i2e8U2wXj2" role="1DdaDG">
+            <ref role="3cqZAo" node="2i2e8U2wXic" resolve="checkBoxes" />
+          </node>
+          <node concept="3cpWsn" id="2i2e8U2wXiZ" role="1Duv9x">
+            <property role="TrG5h" value="checkBox" />
+            <node concept="3uibUv" id="2i2e8U2wXj1" role="1tU5fm">
+              <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="2i2e8U2wXiV" role="2LFqv$">
+            <node concept="3clFbF" id="2i2e8U2wXiW" role="3cqZAp">
+              <node concept="2OqwBi" id="2i2e8U2xafv" role="3clFbG">
+                <node concept="37vLTw" id="2i2e8U2x93K" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2i2e8U2wXiM" resolve="panel" />
+                </node>
+                <node concept="liA8E" id="2i2e8U2xafw" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
+                  <node concept="37vLTw" id="2i2e8U2xafx" role="37wK5m">
+                    <ref role="3cqZAo" node="2i2e8U2wXiZ" resolve="checkBox" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2i2e8U2wXj3" role="3cqZAp">
+          <node concept="37vLTw" id="2i2e8U2wXj4" role="3cqZAk">
+            <ref role="3cqZAo" node="2i2e8U2wXiM" resolve="panel" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="2i2e8U2wXj5" role="1B3o_S" />
+      <node concept="3uibUv" id="2i2e8U2wXj6" role="3clF45">
+        <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i2e8U2y_VB" role="jymVt" />
+    <node concept="3clFb_" id="2i2e8U2wXj7" role="jymVt">
+      <property role="TrG5h" value="getSelectedOptions" />
+      <node concept="3clFbS" id="2i2e8U2wXj8" role="3clF47">
+        <node concept="3cpWs8" id="2i2e8U2wXja" role="3cqZAp">
+          <node concept="3cpWsn" id="2i2e8U2wXj9" role="3cpWs9">
+            <property role="TrG5h" value="selectedOptions" />
+            <node concept="_YKpA" id="2i2e8U2ygBT" role="1tU5fm">
+              <node concept="17QB3L" id="2i2e8U2ygBU" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="2i2e8U2yiWs" role="33vP2m">
+              <node concept="Tc6Ow" id="2i2e8U2yiWt" role="2ShVmc" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="2i2e8U2wXje" role="3cqZAp">
+          <node concept="37vLTw" id="2i2e8U2wXjr" role="1DdaDG">
+            <ref role="3cqZAo" node="2i2e8U2wXic" resolve="checkBoxes" />
+          </node>
+          <node concept="3cpWsn" id="2i2e8U2wXjo" role="1Duv9x">
+            <property role="TrG5h" value="checkBox" />
+            <node concept="3uibUv" id="2i2e8U2wXjq" role="1tU5fm">
+              <ref role="3uigEE" to="qqrq:~JBCheckBox" resolve="JBCheckBox" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="2i2e8U2wXjg" role="2LFqv$">
+            <node concept="3clFbJ" id="2i2e8U2wXjh" role="3cqZAp">
+              <node concept="2OqwBi" id="2i2e8U2xaCN" role="3clFbw">
+                <node concept="37vLTw" id="2i2e8U2x93O" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2i2e8U2wXjo" resolve="checkBox" />
+                </node>
+                <node concept="liA8E" id="2i2e8U2xaCO" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="2i2e8U2wXjk" role="3clFbx">
+                <node concept="3clFbF" id="2i2e8U2wXjl" role="3cqZAp">
+                  <node concept="2OqwBi" id="2i2e8U2xs4P" role="3clFbG">
+                    <node concept="37vLTw" id="2i2e8U2x91p" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2i2e8U2wXj9" resolve="selectedOptions" />
+                    </node>
+                    <node concept="TSZUe" id="2i2e8U2ysBO" role="2OqNvi">
+                      <node concept="2OqwBi" id="2i2e8U2xs4R" role="25WWJ7">
+                        <node concept="37vLTw" id="2i2e8U2xs4S" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2i2e8U2wXjo" resolve="checkBox" />
+                        </node>
+                        <node concept="liA8E" id="2i2e8U2xs4T" role="2OqNvi">
+                          <ref role="37wK5l" to="dxuu:~AbstractButton.getText()" resolve="getText" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2i2e8U2wXjs" role="3cqZAp">
+          <node concept="37vLTw" id="2i2e8U2wXjt" role="3cqZAk">
+            <ref role="3cqZAo" node="2i2e8U2wXj9" resolve="selectedOptions" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2i2e8U2wXju" role="1B3o_S" />
+      <node concept="_YKpA" id="2i2e8U2ybeC" role="3clF45">
+        <node concept="17QB3L" id="2i2e8U2ydCF" role="_ZDj9" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i2e8U2_ptb" role="jymVt" />
+    <node concept="3uibUv" id="2i2e8U2_nOK" role="EKbjA">
+      <ref role="3uigEE" to="bd8o:~WriteActionAware" resolve="WriteActionAware" />
+    </node>
+    <node concept="3clFb_" id="2i2e8U2_rI5" role="jymVt">
+      <property role="TrG5h" value="startInWriteAction" />
+      <node concept="3Tm1VV" id="2i2e8U2_rI7" role="1B3o_S" />
+      <node concept="10P_77" id="2i2e8U2_rI9" role="3clF45" />
+      <node concept="3clFbS" id="2i2e8U2_rIb" role="3clF47">
+        <node concept="3clFbF" id="2i2e8U2_yUn" role="3cqZAp">
+          <node concept="3clFbT" id="2i2e8U2_yUm" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2i2e8U2_rIc" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+  </node>
 </model>
 
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 e8253929..fe23b637 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
@@ -39,6 +39,7 @@
     <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" />
     <import index="rcfd" ref="r:aa6c5e05-6972-4980-b759-3c51783a587d(com.mbeddr.formal.nusmv.source.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="pav8" ref="r:feabab2a-139f-4223-afac-3da5bc33e1e8(com.mbeddr.formal.nusmv.tests.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -326,6 +327,7 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
         <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
         <child id="1883223317721008709" name="body" index="Jncv$" />
@@ -9469,7 +9471,7 @@
                       <node concept="3clFbS" id="1uIpCUur6Cp" role="9aQI4">
                         <node concept="3cpWs8" id="1uIpCUuGI1o" role="3cqZAp">
                           <node concept="3cpWsn" id="1uIpCUuGI1p" role="3cpWs9">
-                            <property role="TrG5h" value="msg" />
+                            <property role="TrG5h" value="title" />
                             <node concept="17QB3L" id="1uIpCUuGI1n" role="1tU5fm" />
                             <node concept="Xl_RD" id="1uIpCUuGI1q" role="33vP2m">
                               <property role="Xl_RC" value="Cannot find the module declaration corresponding to the starting point of the analysis." />
@@ -9484,7 +9486,7 @@
                             </node>
                             <node concept="3cpWs3" id="1uIpCUuGIEF" role="3uHU7B">
                               <node concept="37vLTw" id="1uIpCUuGIlc" role="3uHU7B">
-                                <ref role="3cqZAo" node="1uIpCUuGI1p" resolve="msg" />
+                                <ref role="3cqZAo" node="1uIpCUuGI1p" resolve="title" />
                               </node>
                               <node concept="Xl_RD" id="1uIpCUuGIIZ" role="3uHU7w">
                                 <property role="Xl_RC" value=" Analysis starting point is: " />
@@ -9492,13 +9494,23 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="1uIpCUur6X1" role="3cqZAp">
-                          <node concept="2YIFZM" id="1uIpCUur72i" role="3clFbG">
-                            <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                            <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                            <node concept="10Nm6u" id="1uIpCUur77G" role="37wK5m" />
-                            <node concept="37vLTw" id="1uIpCUuGI1r" role="37wK5m">
-                              <ref role="3cqZAo" node="1uIpCUuGI1p" resolve="msg" />
+                        <node concept="3clFbF" id="2i2e8U2CktA" role="3cqZAp">
+                          <node concept="2YIFZM" id="2i2e8U2CkLH" role="3clFbG">
+                            <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                            <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                            <node concept="3cpWs3" id="2i2e8U2CmrG" role="37wK5m">
+                              <node concept="Xl_RD" id="2i2e8U2CmrK" role="3uHU7B">
+                                <property role="Xl_RC" value="Analysis starting point is: " />
+                              </node>
+                              <node concept="2OqwBi" id="2i2e8U2CCq2" role="3uHU7w">
+                                <node concept="37vLTw" id="2i2e8U2CmrH" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6Kf5KB71ni8" resolve="analysisStartingPoint" />
+                                </node>
+                                <node concept="2Iv5rx" id="2i2e8U2CCq3" role="2OqNvi" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="2i2e8U2Cl9S" role="37wK5m">
+                              <ref role="3cqZAo" node="1uIpCUuGI1p" resolve="title" />
                             </node>
                           </node>
                         </node>
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 4973d0d0..3aac7899 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
@@ -28,6 +28,7 @@
     <import index="mc3u" ref="r:c40f5d7d-8d11-4fe7-a7f1-b09919c94fc9(com.mbeddr.formal.base.tooling.simulator)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="yvhq" ref="r:b8dfa86d-6fa5-4013-9800-ef25be8121b5(com.mbeddr.formal.nusmv.pluginSolution.msc)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="v4mk" ref="e9ce245b-3106-45ed-8e5b-aff820d09b85/java:org.jdesktop.swingx(com.mbeddr.formal.base.tooling/)" implicit="true" />
@@ -81,9 +82,6 @@
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -1069,27 +1067,23 @@
                               </node>
                             </node>
                             <node concept="3clFbS" id="2k2dPZH6$th" role="1zc67A">
-                              <node concept="3clFbF" id="2k2dPZH6$ti" role="3cqZAp">
-                                <node concept="2YIFZM" id="2k2dPZH6$tj" role="3clFbG">
-                                  <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-                                  <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                                  <node concept="37vLTw" id="2k2dPZH6$tk" role="37wK5m">
+                              <node concept="3clFbF" id="2i2e8U2CRs0" role="3cqZAp">
+                                <node concept="2YIFZM" id="2i2e8U2D0Cx" role="3clFbG">
+                                  <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.awt.Component,java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                                  <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                                  <node concept="37vLTw" id="2i2e8U2D3ws" role="37wK5m">
                                     <ref role="3cqZAo" to="vxn5:JsaLOcnA09" resolve="analysesResultsTable" />
                                   </node>
-                                  <node concept="2OqwBi" id="2k2dPZH6$tl" role="37wK5m">
-                                    <node concept="37vLTw" id="2k2dPZH6$tm" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="2i2e8U2Dghz" role="37wK5m">
+                                    <node concept="37vLTw" id="2i2e8U2DdnA" role="2Oq$k0">
                                       <ref role="3cqZAo" node="2k2dPZH6$tf" resolve="ex" />
                                     </node>
-                                    <node concept="liA8E" id="2k2dPZH6$tn" role="2OqNvi">
+                                    <node concept="liA8E" id="2i2e8U2DjJ1" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                     </node>
                                   </node>
-                                  <node concept="Xl_RD" id="2k2dPZH6$to" role="37wK5m">
-                                    <property role="Xl_RC" value="Error" />
-                                  </node>
-                                  <node concept="10M0yZ" id="2k2dPZH6$tp" role="37wK5m">
-                                    <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-                                    <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
+                                  <node concept="Xl_RD" id="2i2e8U2DnOf" role="37wK5m">
+                                    <property role="Xl_RC" value="Error running last analysis" />
                                   </node>
                                 </node>
                               </node>
@@ -1153,13 +1147,15 @@
                             </node>
                           </node>
                           <node concept="3clFbS" id="6Kf5KB718M3" role="3clFbx">
-                            <node concept="3clFbF" id="2QUcAU243Fa" role="3cqZAp">
-                              <node concept="2YIFZM" id="2QUcAU244dM" role="3clFbG">
-                                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                                <node concept="10Nm6u" id="2QUcAU244Cq" role="37wK5m" />
-                                <node concept="Xl_RD" id="2QUcAU24557" role="37wK5m">
-                                  <property role="Xl_RC" value="No trace available to simulate!\nPlease select a result with a trace attached." />
+                            <node concept="3clFbF" id="2i2e8U2DFY1" role="3cqZAp">
+                              <node concept="2YIFZM" id="2i2e8U2DHKQ" role="3clFbG">
+                                <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                                <node concept="Xl_RD" id="2i2e8U2DLxc" role="37wK5m">
+                                  <property role="Xl_RC" value="Please select a result with a trace attached" />
+                                </node>
+                                <node concept="Xl_RD" id="2i2e8U2E47r" role="37wK5m">
+                                  <property role="Xl_RC" value="No trace available to simulate" />
                                 </node>
                               </node>
                             </node>
@@ -1293,13 +1289,15 @@
                             </node>
                           </node>
                           <node concept="3clFbS" id="1wencriOzsu" role="3clFbx">
-                            <node concept="3clFbF" id="1wencriOzsv" role="3cqZAp">
-                              <node concept="2YIFZM" id="1wencriOzsw" role="3clFbG">
-                                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                                <node concept="10Nm6u" id="1wencriOzsx" role="37wK5m" />
-                                <node concept="Xl_RD" id="1wencriOzsy" role="37wK5m">
-                                  <property role="Xl_RC" value="No trace available to show MSC on!\nPlease select a result with a trace attached." />
+                            <node concept="3clFbF" id="2i2e8U2EkBh" role="3cqZAp">
+                              <node concept="2YIFZM" id="2i2e8U2EkBi" role="3clFbG">
+                                <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                                <node concept="Xl_RD" id="2i2e8U2EkBj" role="37wK5m">
+                                  <property role="Xl_RC" value="Please select a result with a trace attached" />
+                                </node>
+                                <node concept="Xl_RD" id="2i2e8U2EkBk" role="37wK5m">
+                                  <property role="Xl_RC" value="No trace available to simulate" />
                                 </node>
                               </node>
                             </node>
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 84b13a47..c6b39a85 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
@@ -22,6 +22,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
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 e4dfcf61..0e86822d 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
@@ -39,6 +39,10 @@
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
@@ -733,6 +737,28 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="2i2e8U2i1x$" role="jymVt" />
+    <node concept="3clFb_" id="2i2e8U2i2n6" role="jymVt">
+      <property role="TrG5h" value="getActionUpdateThread" />
+      <node concept="3Tm1VV" id="2i2e8U2i2n7" role="1B3o_S" />
+      <node concept="2AHcQZ" id="2i2e8U2i2n9" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="2i2e8U2i2na" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+      </node>
+      <node concept="3clFbS" id="2i2e8U2i2nb" role="3clF47">
+        <node concept="3clFbF" id="2i2e8U2i5nV" role="3cqZAp">
+          <node concept="Rm8GO" id="2i2e8U2i5M8" role="3clFbG">
+            <ref role="Rm8GQ" to="qkt:~ActionUpdateThread.BGT" resolve="BGT" />
+            <ref role="1Px2BO" to="qkt:~ActionUpdateThread" resolve="ActionUpdateThread" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2i2e8U2i2nc" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7Y21hZBa4D0" role="jymVt" />
     <node concept="3Tm1VV" id="7Y21hZBa4tl" role="1B3o_S" />
     <node concept="3uibUv" id="7Y21hZBa4Bn" role="1zkMxy">
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 91905ee1..ea65e0b2 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
@@ -57,6 +57,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <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.prism/.mps/migration.xml b/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.prism/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 8f9a3d99..32466ebe 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
@@ -70,7 +70,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 bdaf2127..4f19a477 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
@@ -25,6 +25,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml b/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.req/.mps/migration.xml b/code/languages/com.mbeddr.formal.req/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/languages/com.mbeddr.formal.req/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.req/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 d7504a4a..175567ae 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
@@ -75,7 +75,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 7d194360..1d19d81d 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
@@ -80,7 +80,6 @@
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 13be5fb3..b177e260 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
@@ -116,7 +116,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 6ce440e6..c0809829 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
@@ -57,7 +57,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -122,7 +121,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
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 769d70a6..b6d2491f 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
@@ -61,7 +61,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -123,7 +122,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 b0c01581..88375a8f 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
@@ -58,7 +58,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -120,7 +119,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 adbc8bc9..390f20a0 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
@@ -58,7 +58,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -122,7 +121,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 63de3e2e..380b57f8 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
@@ -60,7 +60,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -125,7 +124,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 c9c84486..65e946e7 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
@@ -77,7 +77,6 @@
         <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
@@ -202,7 +201,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 ad906b96..157e7c35 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
@@ -67,7 +67,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 d787facb..c312f16b 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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -43,7 +43,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
   </dependencyVersions>
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 75be86af..00ca4015 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
@@ -46,7 +46,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 56594529..e0dd5c5e 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
@@ -33,6 +33,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
@@ -68,7 +69,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
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 e301e4ce..ca1095a3 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
@@ -33,6 +33,7 @@
     <import index="7gut" ref="r:a2a23a30-67b2-48a3-878f-fb5cb8f590da(com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer)" />
     <import index="3g0o" ref="r:a6263c3c-f5c8-43aa-8a86-c420dd6b206e(com.mpsbasics.docx4j.core.registry)" />
     <import index="amee" ref="r:9a030108-0369-40ca-a181-b4e3b6ebc9c7(com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.word_serializer)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -116,9 +117,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
@@ -597,21 +595,16 @@
         <node concept="3clFbH" id="4qaoH_J6fr" role="3cqZAp" />
         <node concept="3clFbJ" id="6hWVnwAIRSQ" role="3cqZAp">
           <node concept="3clFbS" id="6hWVnwAIRSS" role="3clFbx">
-            <node concept="3clFbF" id="6hWVnwAIT8O" role="3cqZAp">
-              <node concept="2YIFZM" id="6hWVnwAIT$s" role="3clFbG">
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-                <node concept="10Nm6u" id="6hWVnwAITEO" role="37wK5m" />
-                <node concept="Xl_RD" id="6hWVnwAITLx" role="37wK5m">
-                  <property role="Xl_RC" value="Requirements are consistent!" />
+            <node concept="3clFbF" id="2i2e8U2EqOr" role="3cqZAp">
+              <node concept="2YIFZM" id="2i2e8U2Er7B" role="3clFbG">
+                <ref role="37wK5l" to="jkm4:~Messages.showInfoMessage(java.lang.String,java.lang.String)" resolve="showInfoMessage" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <node concept="Xl_RD" id="2i2e8U2EuOT" role="37wK5m">
+                  <property role="Xl_RC" value="Requirements are consistent" />
                 </node>
-                <node concept="Xl_RD" id="6hWVnwAIWGZ" role="37wK5m">
+                <node concept="Xl_RD" id="2i2e8U2Ewi0" role="37wK5m">
                   <property role="Xl_RC" value="Success" />
                 </node>
-                <node concept="10M0yZ" id="6hWVnwAIWvT" role="37wK5m">
-                  <ref role="3cqZAo" to="dxuu:~JOptionPane.INFORMATION_MESSAGE" resolve="INFORMATION_MESSAGE" />
-                  <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                </node>
               </node>
             </node>
           </node>
@@ -625,21 +618,16 @@
           </node>
           <node concept="9aQIb" id="6hWVnwAIUnH" role="9aQIa">
             <node concept="3clFbS" id="6hWVnwAIUnI" role="9aQI4">
-              <node concept="3clFbF" id="6hWVnwAIUs8" role="3cqZAp">
-                <node concept="2YIFZM" id="6hWVnwAIUs9" role="3clFbG">
-                  <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                  <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
-                  <node concept="10Nm6u" id="6hWVnwAIUsa" role="37wK5m" />
-                  <node concept="Xl_RD" id="6hWVnwAIUsb" role="37wK5m">
-                    <property role="Xl_RC" value="Requirements are NOT consistent!" />
+              <node concept="3clFbF" id="2i2e8U2Exb4" role="3cqZAp">
+                <node concept="2YIFZM" id="2i2e8U2ExtT" role="3clFbG">
+                  <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                  <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                  <node concept="Xl_RD" id="2i2e8U2ExPW" role="37wK5m">
+                    <property role="Xl_RC" value="Requirements are not consistent" />
                   </node>
-                  <node concept="Xl_RD" id="6hWVnwAIUNW" role="37wK5m">
+                  <node concept="Xl_RD" id="2i2e8U2E$v1" role="37wK5m">
                     <property role="Xl_RC" value="Error" />
                   </node>
-                  <node concept="10M0yZ" id="6hWVnwAIVe2" role="37wK5m">
-                    <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-                    <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                  </node>
                 </node>
               </node>
             </node>
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 a8552510..0877f11f 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
@@ -65,7 +65,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="710e4a44-4764-4107-9c89-e059fb11d8f5(test.com.mbeddr.formal.req.tl_patterns)" 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 d62e30e5..5524d8e3 100644
--- a/code/languages/com.mbeddr.formal.safety/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.safety/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 be42de2e..0777dfed 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
@@ -70,7 +70,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 3b45b67c..a8e7acd0 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
@@ -68,7 +68,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 f13c6cef..78d0e383 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
@@ -64,7 +64,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 9a0323da..74954f6d 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
@@ -90,7 +90,6 @@
     <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 f76aa6ba..ad5397c9 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
@@ -66,7 +66,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
index 92cd4aa2..215d94d5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
@@ -76,7 +76,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)" version="0" />
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 dcaca82f..1aeac585 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
@@ -68,7 +68,6 @@
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
@@ -148,7 +147,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
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 f9dfc7ea..fbf56344 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
@@ -78,7 +78,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 0ca05af4..d0c0d657 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
@@ -71,7 +71,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 5e4dfc7b..a84b85de 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
@@ -86,7 +86,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
index 65aedb8f..0df4ccce 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -73,7 +73,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
index 81686e97..f05fffb5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
@@ -76,7 +76,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
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 94c870a2..373aee88 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
@@ -72,7 +72,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 f6be3113..848aa680 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
@@ -71,7 +71,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
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 23d58779..b59fdd12 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
@@ -83,7 +83,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 d4cf21a4..1ee9169b 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
@@ -79,7 +79,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 baa84af3..2ae3524d 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
@@ -79,7 +79,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
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 8582c2ed..e389b4ce 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
@@ -42,6 +42,7 @@
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
@@ -86,11 +87,11 @@
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" version="0" />
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
@@ -197,11 +198,11 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
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 c01edbbd..5c8bedf2 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
@@ -93,7 +93,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" 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.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 444e1b06..84eeceab 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
@@ -15,6 +15,7 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
@@ -804,11 +805,10 @@
         </node>
         <node concept="3clFbJ" id="6csJveEtVBh" role="3cqZAp">
           <node concept="3clFbS" id="6csJveEtVBj" role="3clFbx">
-            <node concept="3clFbF" id="6csJveEu4UE" role="3cqZAp">
-              <node concept="2YIFZM" id="6csJveEu7EG" role="3clFbG">
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <node concept="10Nm6u" id="6csJveEu7JV" role="37wK5m" />
+            <node concept="3clFbF" id="2i2e8U2ESH8" role="3cqZAp">
+              <node concept="2YIFZM" id="2i2e8U2EVul" role="3clFbG">
+                <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
                 <node concept="3cpWs3" id="6csJveEL6_e" role="37wK5m">
                   <node concept="2OqwBi" id="6csJveEL72Q" role="3uHU7w">
                     <node concept="37vLTw" id="6csJveEL6II" role="2Oq$k0">
@@ -836,9 +836,12 @@
                     </node>
                   </node>
                   <node concept="Xl_RD" id="6csJveEu7Or" role="3uHU7B">
-                    <property role="Xl_RC" value="Goal structure shall have exactly one top\n element to enable automated layout!\nThe following entities were found: " />
+                    <property role="Xl_RC" value="The following entities were found: " />
                   </node>
                 </node>
+                <node concept="Xl_RD" id="2i2e8U2EZNS" role="37wK5m">
+                  <property role="Xl_RC" value="Goal structure shall have exactly one top element to enable automated layout" />
+                </node>
               </node>
             </node>
             <node concept="3cpWs6" id="6csJveEu8b6" role="3cqZAp" />
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 0df711d6..2577b34c 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
@@ -82,7 +82,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
index efb70d8b..9c500f52 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
@@ -76,7 +76,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 767afa09..87e30612 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
@@ -85,7 +85,6 @@
         <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
         <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
@@ -182,7 +181,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 1ea17d72..6b98c9b9 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
@@ -89,7 +89,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
index 1ddde925..18352204 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
@@ -70,7 +70,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
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 f90cb68f..724cf486 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
@@ -90,7 +90,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 5d16e9c2..347a3d7b 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
@@ -75,7 +75,6 @@
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
@@ -141,7 +140,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
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 ad24444c..439a3456 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
@@ -71,7 +71,6 @@
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
       </dependencyVersions>
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 3c594bc3..533d6c66 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
@@ -95,7 +95,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
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 e0529358..8d87e36f 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
@@ -64,7 +64,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 139ad680..74488c6c 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
@@ -70,7 +70,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 274a0086..3e30d9c6 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
@@ -68,7 +68,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/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 c27fcb9c..863d44f9 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
@@ -68,7 +68,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 6c91c115..ec57e29a 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
@@ -90,7 +90,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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 03dc4a7c..3023f783 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
@@ -18,7 +18,7 @@
   </dependencies>
   <languageVersions>
     <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:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
   <dependencyVersions>
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 d5db9b88..587f1381 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
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
   </languages>
   <imports>
@@ -1919,11 +1919,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2u7UHDCnSLS" role="3bR37C">
-          <node concept="3bR9La" id="2u7UHDCnSLT" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2u7UHDCnSLU" role="3bR37C">
           <node concept="3bR9La" id="2u7UHDCnSLV" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
@@ -1977,6 +1972,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2i2e8U1mEgx" role="3bR37C">
+          <node concept="3bR9La" id="2i2e8U1mEgy" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6bkzxtWPDx1" resolve="de.itemis.stubs.batik" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2u7UHDC1RNf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2055,11 +2055,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="3TNxfDZ5bWw" role="3bR37C">
-          <node concept="3bR9La" id="3TNxfDZ5bWx" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3TNxfDZ5bWy" role="3bR37C">
           <node concept="3bR9La" id="3TNxfDZ5bWz" role="1SiIV1">
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
@@ -3952,11 +3947,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4jiM8XS_ow5" role="3bR37C">
-          <node concept="3bR9La" id="4jiM8XS_ow6" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4jiM8XS_ow7" role="3bR37C">
           <node concept="3bR9La" id="4jiM8XS_ow8" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -4027,11 +4017,6 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzHk" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzHl" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="xDU_PQJGFb" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -8048,7 +8033,7 @@
         <node concept="2Ry0Ak" id="6hyv0iVPmu0" role="iGT6I">
           <property role="2Ry0Am" value=".." />
           <node concept="2Ry0Ak" id="3ALtb$it0Jq" role="2Ry0An">
-            <property role="2Ry0Am" value="MPS_2022_2_3" />
+            <property role="2Ry0Am" value="MPS_2024_1" />
           </node>
         </node>
       </node>
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 ba298ff9..c0c4ce50 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
@@ -71,11 +71,11 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" version="0" />
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 a8b357f6..4f08a224 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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
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 583db31e..34fb90f0 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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
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 dec26f0f..96958aa5 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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -96,11 +96,11 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
index be9407ef..ed4f4393 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
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 5772e0b6..c82d8b23 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
@@ -18,7 +18,7 @@
   </dependencies>
   <languageVersions>
     <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:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
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 6ecdbc21..109dab8f 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
@@ -2,7 +2,7 @@
 <model ref="r:c3566e6b-a5e5-48f9-99d7-fc25ee01c1dd(com.mbeddr.formal.safety.build)">
   <persistence version="9" />
   <languages>
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="-1" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="-1" />
     <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="-1" />
   </languages>
@@ -345,7 +345,7 @@
         <node concept="2Ry0Ak" id="51uLzzZ6tyC" role="iGT6I">
           <property role="2Ry0Am" value=".." />
           <node concept="2Ry0Ak" id="3Sfdbyg_LZt" role="2Ry0An">
-            <property role="2Ry0Am" value="MPS_2022_2_2" />
+            <property role="2Ry0Am" value="MPS_2024_1" />
           </node>
         </node>
       </node>
@@ -2147,11 +2147,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2u7UHDCnSLS" role="3bR37C">
-          <node concept="3bR9La" id="2u7UHDCnSLT" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2u7UHDCnSLU" role="3bR37C">
           <node concept="3bR9La" id="2u7UHDCnSLV" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
@@ -2205,6 +2200,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2i2e8U1mG6w" role="3bR37C">
+          <node concept="3bR9La" id="2i2e8U1mG6x" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6bkzxtWPDx1" resolve="de.itemis.stubs.batik" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2u7UHDC1RNf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2283,11 +2283,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="3TNxfDZ5bWw" role="3bR37C">
-          <node concept="3bR9La" id="3TNxfDZ5bWx" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3TNxfDZ5bWy" role="3bR37C">
           <node concept="3bR9La" id="3TNxfDZ5bWz" role="1SiIV1">
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
@@ -7281,11 +7276,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5et_HVSOwOD" role="3bR37C">
-          <node concept="3bR9La" id="5et_HVSOwOE" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="5et_HVSOwOF" role="3bR37C">
           <node concept="3bR9La" id="5et_HVSOwOG" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
@@ -7306,11 +7296,6 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyJE" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyJF" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="4dogv0aLOD" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -16063,7 +16048,7 @@
     <node concept="2kB4xC" id="wUJmWCxY0a" role="1l3spd">
       <property role="TrG5h" value="build.date" />
       <node concept="hHN3E" id="wUJmWCxY0b" role="aVJcv">
-        <property role="hHN3Y" value="20240104" />
+        <property role="hHN3Y" value="20241114" />
       </node>
     </node>
     <node concept="2kB4xC" id="wUJmWCxY0c" role="1l3spd">
@@ -16071,7 +16056,7 @@
       <node concept="aVJcg" id="wUJmWCxY0d" role="aVJcv">
         <node concept="NbPM2" id="wUJmWCxY0e" role="aVJcq">
           <node concept="3Mxwew" id="wUJmWCxY0f" role="3MwsjC">
-            <property role="3MwjfP" value="FASTEN-222.SNAPSHOT" />
+            <property role="3MwjfP" value="FASTEN-241.SNAPSHOT" />
           </node>
         </node>
       </node>
@@ -16094,7 +16079,7 @@
         <node concept="2Ry0Ak" id="7YjSMFl$i24" role="iGT6I">
           <property role="2Ry0Am" value=".." />
           <node concept="2Ry0Ak" id="3SfdbygrgG8" role="2Ry0An">
-            <property role="2Ry0Am" value="MPS_2022_2_2" />
+            <property role="2Ry0Am" value="MPS_2024_1" />
           </node>
         </node>
       </node>
@@ -16194,7 +16179,7 @@
       <node concept="aVJcg" id="wUJmWCxY0I" role="aVJcv">
         <node concept="NbPM2" id="wUJmWCxY0J" role="aVJcq">
           <node concept="3Mxwew" id="wUJmWCxY0K" role="3MwsjC">
-            <property role="3MwjfP" value="2024-01-04" />
+            <property role="3MwjfP" value="2024-11-14" />
           </node>
         </node>
       </node>
@@ -16533,12 +16518,12 @@
       <node concept="3ZAF1B" id="1TD_kqsGBKs" role="3ZAC$U">
         <node concept="3_J27D" id="1TD_kqsGBKt" role="3ZAF1W">
           <node concept="3Mxwew" id="1TD_kqsGBKu" role="3MwsjC">
-            <property role="3MwjfP" value="2023" />
+            <property role="3MwjfP" value="2024" />
           </node>
         </node>
         <node concept="3_J27D" id="1TD_kqsGBKv" role="3ZAF13">
           <node concept="3Mxwew" id="7Nv7YQoyFIY" role="3MwsjC">
-            <property role="3MwjfP" value="2" />
+            <property role="3MwjfP" value="1" />
           </node>
         </node>
         <node concept="NbPM2" id="1TD_kqsGBKy" role="3ZAF11" />
@@ -16759,7 +16744,7 @@
                 </node>
               </node>
               <node concept="1zDrgl" id="42jqVeFkUvE" role="39821P">
-                <ref role="1zDrgn" node="42jqVeFkUtq" resolve="FASTEN 2023.2" />
+                <ref role="1zDrgn" node="42jqVeFkUtq" resolve="FASTEN 2024.1" />
               </node>
             </node>
           </node>
@@ -16884,9 +16869,6 @@
             <node concept="3_I8Xc" id="5cnt3YQx_6V" role="39821P">
               <ref role="3_I8Xa" to="90a9:31bAEZ0ssNL" resolve="mps-apache-commons" />
             </node>
-            <node concept="3_I8Xc" id="5cnt3YQuxUQ" role="39821P">
-              <ref role="3_I8Xa" to="90a9:2H_mjOXw4dd" resolve="de.itemis.mps.nativelibs" />
-            </node>
             <node concept="3_I8Xc" id="5cnt3YQuxZk" role="39821P">
               <ref role="3_I8Xa" to="90a9:7szUFELHiFQ" resolve="de.itemis.mps.editor.widgets" />
             </node>
@@ -16995,8 +16977,8 @@
             <node concept="3_I8Xc" id="6Kf5KB6RmeW" role="39821P">
               <ref role="3_I8Xa" to="ffeo:1nJh0raVyYj" resolve="modelchecker.jar" />
             </node>
-            <node concept="3_I8Xc" id="7Nv7YQoAn1l" role="39821P">
-              <ref role="3_I8Xa" to="ffeo:ymnOULAZ8H" resolve="mps-testing" />
+            <node concept="3_I8Xc" id="2i2e8U1mF1i" role="39821P">
+              <ref role="3_I8Xa" to="ffeo:6jDaT$jlXhe" resolve="mps-testing" />
             </node>
             <node concept="3_I8Xc" id="7he_lUutsoc" role="39821P">
               <ref role="3_I8Xa" node="7he_lUumPyH" resolve="com.mpsbasics" />
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 2ee85a15..87cdeaf2 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
@@ -72,7 +72,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
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 49c2dd03..a466c71d 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
@@ -132,20 +132,20 @@
       <node concept="37mRIm" id="3jaLROLvqOs" role="37mRID">
         <property role="37mO49" value="3804072175782964459" />
         <node concept="gqqVs" id="3jaLROLvqOq" role="37mO4d">
-          <property role="gqqTZ" value="28.0" />
-          <property role="gqqTW" value="141.0" />
-          <property role="gqqTX" value="212.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="22.0" />
+          <property role="gqqTW" value="139.00029836425782" />
+          <property role="gqqTX" value="198.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3jaLROLvqTD" role="37mRID">
         <property role="37mO49" value="3804072175782964790" />
         <node concept="gqqVs" id="3jaLROLvqTC" role="37mO4d">
-          <property role="gqqTZ" value="30.5" />
-          <property role="gqqTW" value="13.0" />
-          <property role="gqqTX" value="194.0" />
-          <property role="gqqTy" value="50.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -156,8 +156,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="3jaLROLvqZw" role="3ul5Gz">
               <node concept="2VclrF" id="3jaLROLvqZx" role="3wpmZR">
-                <property role="2Vclpx" value="119.25" />
-                <property role="2Vclpz" value="90.5" />
+                <property role="2Vclpx" value="57.00005" />
+                <property role="2Vclpz" value="84.00019836425781" />
               </node>
               <node concept="2VclrF" id="3jaLROLvqZy" role="3wpmZP">
                 <property role="2Vclpx" value="0.0" />
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 45d5d2b9..6070221e 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
@@ -44,7 +44,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
   </dependencyVersions>
 </solution>
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 bd790b26..bbf446dd 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
@@ -79,6 +79,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -109,7 +110,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
   </dependencyVersions>
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 7fcd9d2c..394a3ed5 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
@@ -635,110 +635,110 @@
       <node concept="37mRIm" id="3yPz2by7H5J" role="37mRID">
         <property role="37mO49" value="4086326318359040070" />
         <node concept="gqqVs" id="3yPz2by7H5I" role="37mO4d">
-          <property role="gqqTZ" value="272.99995" />
+          <property role="gqqTZ" value="132.5" />
           <property role="gqqTW" value="12.000100000000003" />
-          <property role="gqqTX" value="102.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTX" value="180.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5L" role="37mRID">
         <property role="37mO49" value="4086326318359040072" />
         <node concept="gqqVs" id="3yPz2by7H5K" role="37mO4d">
-          <property role="gqqTZ" value="278.49995" />
-          <property role="gqqTW" value="134.00029836425782" />
-          <property role="gqqTX" value="108.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="125.5" />
+          <property role="gqqTW" value="126.00029836425782" />
+          <property role="gqqTX" value="194.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5N" role="37mRID">
         <property role="37mO49" value="4086326318359040074" />
         <node concept="gqqVs" id="3yPz2by7H5M" role="37mO4d">
-          <property role="gqqTZ" value="264.99995" />
-          <property role="gqqTW" value="262.0004967285156" />
-          <property role="gqqTX" value="118.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="226.0" />
+          <property role="gqqTW" value="239.00049672851563" />
+          <property role="gqqTX" value="220.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5P" role="37mRID">
         <property role="37mO49" value="4086326318359040075" />
         <node concept="gqqVs" id="3yPz2by7H5O" role="37mO4d">
-          <property role="gqqTZ" value="133.99995" />
-          <property role="gqqTW" value="262.0004967285156" />
-          <property role="gqqTX" value="113.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="239.00049672851563" />
+          <property role="gqqTX" value="194.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5R" role="37mRID">
         <property role="37mO49" value="4086326318359040078" />
         <node concept="gqqVs" id="3yPz2by7H5Q" role="37mO4d">
-          <property role="gqqTZ" value="32.99995000000001" />
-          <property role="gqqTW" value="682.0011375976562" />
-          <property role="gqqTX" value="162.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTZ" value="695.0" />
+          <property role="gqqTW" value="642.0011375976562" />
+          <property role="gqqTX" value="266.0" />
+          <property role="gqqTy" value="115.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5T" role="37mRID">
         <property role="37mO49" value="4086326318359040079" />
         <node concept="gqqVs" id="3yPz2by7H5S" role="37mO4d">
-          <property role="gqqTZ" value="265.99995" />
-          <property role="gqqTW" value="682.0011375976562" />
-          <property role="gqqTX" value="160.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="409.0" />
+          <property role="gqqTW" value="642.0011375976562" />
+          <property role="gqqTX" value="266.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5V" role="37mRID">
         <property role="37mO49" value="4086326318359040080" />
         <node concept="gqqVs" id="3yPz2by7H5U" role="37mO4d">
-          <property role="gqqTZ" value="233.99995" />
-          <property role="gqqTW" value="384.0007103515625" />
-          <property role="gqqTX" value="202.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="166.0" />
+          <property role="gqqTW" value="353.0007103515625" />
+          <property role="gqqTX" value="340.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5X" role="37mRID">
         <property role="37mO49" value="4086326318359040082" />
         <node concept="gqqVs" id="3yPz2by7H5W" role="37mO4d">
-          <property role="gqqTZ" value="274.49995" />
-          <property role="gqqTW" value="540.0009544921875" />
-          <property role="gqqTX" value="99.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="406.5" />
+          <property role="gqqTW" value="508.00092397460935" />
+          <property role="gqqTX" value="178.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H5Z" role="37mRID">
         <property role="37mO49" value="4086326318359040086" />
         <node concept="gqqVs" id="3yPz2by7H5Y" role="37mO4d">
-          <property role="gqqTZ" value="140.49995" />
-          <property role="gqqTW" value="526.0009544921875" />
-          <property role="gqqTX" value="116.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTZ" value="200.5" />
+          <property role="gqqTW" value="487.00092397460935" />
+          <property role="gqqTX" value="186.0" />
+          <property role="gqqTy" value="115.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H61" role="37mRID">
         <property role="37mO49" value="4086326318359040088" />
         <node concept="gqqVs" id="3yPz2by7H60" role="37mO4d">
-          <property role="gqqTZ" value="508.99995" />
-          <property role="gqqTW" value="634.0011375976562" />
-          <property role="gqqTX" value="79.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="133.0" />
+          <property role="gqqTW" value="642.0011375976562" />
+          <property role="gqqTX" value="122.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H63" role="37mRID">
         <property role="37mO49" value="4086326318359040089" />
         <node concept="gqqVs" id="3yPz2by7H62" role="37mO4d">
-          <property role="gqqTZ" value="508.99995" />
-          <property role="gqqTW" value="540.0009544921875" />
-          <property role="gqqTX" value="79.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="275.0" />
+          <property role="gqqTW" value="642.0011375976562" />
+          <property role="gqqTX" value="114.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -776,18 +776,26 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfn" role="2Vcluh">
+            <property role="2Vclpx" value="223.50005" />
+            <property role="2Vclpz" value="219.00039672851562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfo" role="2Vcluh">
+            <property role="2Vclpx" value="337.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H6h" role="37mRID">
         <property role="37mO49" value="4086326318359040077" />
         <node concept="2VclpC" id="3yPz2by7H6g" role="37mO4d">
           <node concept="2VclrF" id="3yPz2by7H6i" role="2Vcluh">
-            <property role="2Vclpx" value="324.0" />
-            <property role="2Vclpz" value="207.00039672851562" />
+            <property role="2Vclpx" value="223.50005" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
           <node concept="2VclrF" id="3yPz2by7H6j" role="2Vcluh">
-            <property role="2Vclpx" value="190.5" />
-            <property role="2Vclpz" value="207.00039672851562" />
+            <property role="2Vclpx" value="110.00004999999999" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
           <node concept="3ul5H1" id="3yPz2by7H6k" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
@@ -838,18 +846,26 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfp" role="2Vcluh">
+            <property role="2Vclpx" value="337.00005" />
+            <property role="2Vclpz" value="467.0008239746094" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfq" role="2Vcluh">
+            <property role="2Vclpx" value="496.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H6_" role="37mRID">
         <property role="37mO49" value="4086326318359040084" />
         <node concept="2VclpC" id="3yPz2by7H6$" role="37mO4d">
           <node concept="2VclrF" id="3yPz2by7H6A" role="2Vcluh">
-            <property role="2Vclpx" value="324.0" />
-            <property role="2Vclpz" value="627.0010375976562" />
+            <property role="2Vclpx" value="496.50005" />
+            <property role="2Vclpz" value="622.0010375976562" />
           </node>
           <node concept="2VclrF" id="3yPz2by7H6B" role="2Vcluh">
-            <property role="2Vclpx" value="92.0" />
-            <property role="2Vclpz" value="627.0010375976562" />
+            <property role="2Vclpx" value="829.00005" />
+            <property role="2Vclpz" value="622.0010375976562" />
           </node>
           <node concept="3ul5H1" id="3yPz2by7H6C" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
@@ -882,18 +898,26 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfr" role="2Vcluh">
+            <property role="2Vclpx" value="496.50005" />
+            <property role="2Vclpz" value="622.0010375976562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U1Fwfs" role="2Vcluh">
+            <property role="2Vclpx" value="543.00005" />
+            <property role="2Vclpz" value="622.0010375976562" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3yPz2by7H6N" role="37mRID">
         <property role="37mO49" value="4086326318359040087" />
         <node concept="2VclpC" id="3yPz2by7H6M" role="37mO4d">
           <node concept="2VclrF" id="3yPz2by7H6O" role="2Vcluh">
-            <property role="2Vclpx" value="324.0" />
-            <property role="2Vclpz" value="471.0008239746094" />
+            <property role="2Vclpx" value="337.00005" />
+            <property role="2Vclpz" value="467.0008239746094" />
           </node>
           <node concept="2VclrF" id="3yPz2by7H6P" role="2Vcluh">
-            <property role="2Vclpx" value="198.5" />
-            <property role="2Vclpz" value="471.0008239746094" />
+            <property role="2Vclpx" value="294.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
           </node>
           <node concept="3ul5H1" id="3yPz2by7H6Q" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
@@ -914,12 +938,12 @@
         <property role="37mO49" value="4086326318359040090" />
         <node concept="2VclpC" id="3yPz2by7H6U" role="37mO4d">
           <node concept="2VclrF" id="3yPz2by7H6W" role="2Vcluh">
-            <property role="2Vclpx" value="439.5" />
-            <property role="2Vclpz" value="606.993751300338" />
+            <property role="2Vclpx" value="496.50005" />
+            <property role="2Vclpz" value="622.0010375976562" />
           </node>
           <node concept="2VclrF" id="3yPz2by7H6X" role="2Vcluh">
-            <property role="2Vclpx" value="509.5756591505782" />
-            <property role="2Vclpz" value="641.1486588702361" />
+            <property role="2Vclpx" value="195.00005" />
+            <property role="2Vclpz" value="622.0010375976562" />
           </node>
           <node concept="3ul5H1" id="3yPz2by7H6Y" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
@@ -940,8 +964,8 @@
         <property role="37mO49" value="4086326318359040091" />
         <node concept="2VclpC" id="3yPz2by7H72" role="37mO4d">
           <node concept="2VclrF" id="3yPz2by7H74" role="2Vcluh">
-            <property role="2Vclpx" value="463.0" />
-            <property role="2Vclpz" value="556.0" />
+            <property role="2Vclpx" value="496.50005" />
+            <property role="2Vclpz" value="622.0010375976562" />
           </node>
           <node concept="3ul5H1" id="3yPz2by7H76" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
@@ -956,6 +980,10 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U1Fwft" role="2Vcluh">
+            <property role="2Vclpx" value="333.00005" />
+            <property role="2Vclpz" value="622.0010375976562" />
+          </node>
         </node>
       </node>
     </node>
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 a1d7441e..25b335cf 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
@@ -32,6 +32,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
@@ -70,7 +71,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
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 d0bde5f0..328a5f27 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
@@ -24,6 +24,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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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="6" />
@@ -61,7 +62,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
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 ace0420b..ff75e0e4 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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet languageLevel="JAVA_8" type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -74,7 +74,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="5fa23c0a-216d-4571-a163-e286643e6f5f(jetbrains.mps.generator)" version="0" />
     <module reference="339c3a3d-4c7f-4727-bc4f-f1abb19286a3(jetbrains.mps.ide.httpsupport.nodeaccess)" version="0" />
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 d287b509..d2c7c49c 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
@@ -3,30 +3,24 @@
   <persistence version="9" />
   <languages>
     <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
-  <imports>
-    <import index="hbry" ref="r:bf658a5c-3bda-4f96-8dda-0c8202ea6196(com.mbeddr.formal.safety.gsn.web.templates@generator)" />
-  </imports>
+  <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="1152961914448142326" name="entries" index="2Qf7GQ" />
+      <concept id="8296877263936070001" name="jetbrains.mps.lang.generator.plan.structure.ApplyGenerators" flags="ng" index="3uMcMo">
+        <child id="8296877263936660572" name="generator" index="3uOsAP" />
       </concept>
     </language>
-    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen">
-      <concept id="961590472824346305" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
-        <child id="7786846688815598697" name="mappingConfigurations" index="3VlUeB" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="427659576753752243" name="jetbrains.mps.lang.smodel.structure.ModulePointer" flags="ng" index="20RdaH">
+        <property id="427659576753753627" name="moduleId" index="20Rdg5" />
+        <property id="427659576753753625" name="moduleName" index="20Rdg7" />
       </concept>
-      <concept id="961590472824361214" name="de.itemis.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
-      <concept id="7786846688815408482" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
-        <reference id="7786846688815408483" name="mc" index="3Vl8EH" />
+      <concept id="8296877263936075789" name="jetbrains.mps.lang.smodel.structure.GeneratorModulePointer" flags="ng" index="3uMdn$">
+        <child id="8296877263936075892" name="module" index="3uMdmt" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -37,12 +31,12 @@
   </registry>
   <node concept="2VgMpV" id="kPkqqqMHTt">
     <property role="TrG5h" value="generateGSNGenplan" />
-    <node concept="2Pg1uL" id="kPkqqqMW0U" role="2VgMA7">
-      <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 concept="3uMcMo" id="2i2e8U23x0W" role="2VgMA7">
+      <node concept="3uMdn$" id="2i2e8U23x0Z" role="3uOsAP">
+        <node concept="20RdaH" id="2i2e8U23x10" role="3uMdmt">
+          <property role="20Rdg5" value="31b0df10-2d1f-4744-8de7-461666d7c2d1" />
+          <property role="20Rdg7" value="com.mbeddr.formal.safety.gsn.web#01" />
+        </node>
       </node>
     </node>
   </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.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 656917e6..82422146 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
@@ -12,6 +12,7 @@
     <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" />
+    <engage id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" />
   </languages>
   <imports>
     <import index="tpcq" ref="r:00000000-0000-4000-0000-011c89590286(jetbrains.mps.lang.core.plugin)" />
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 f09757c3..1cc00cf1 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
@@ -39,7 +39,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
   </dependencyVersions>
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 2653b233..67c965ee 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
@@ -54,7 +54,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="1cdcf8bf-1992-44e7-8edd-65fdea10e4a4(test.com.mbeddr.formal.safety.argument.runtime)" version="0" />
   </dependencyVersions>
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 935f2a7d..5a4aafb1 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
@@ -48,6 +48,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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -76,11 +77,11 @@
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
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 2a593a44..b4fbbffa 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
@@ -334,8 +334,35 @@
         </node>
         <node concept="1_05Uv" id="36k0PnKKx6n" role="3CrHoS">
           <property role="TrG5h" value="intermediate" />
-          <ref role="1_em_T" node="36k0PnKKRxX" resolve="Gate 1" />
+          <ref role="1_em_T" node="28r411pzCTW" resolve="Gate 1" />
         </node>
+        <node concept="4e07$" id="28r411pzCTU" role="3CrHoS" />
+        <node concept="cEgko" id="28r411pzCTW" role="3CrHoS">
+          <property role="TrG5h" value="Gate 1" />
+          <node concept="7CXmI" id="28r411pzCTX" role="lGtFl">
+            <node concept="1TM$A" id="28r411pzCTY" role="7EUXB">
+              <node concept="2PYRI3" id="28r411pzCTZ" role="3lydEf">
+                <ref role="39XzEq" to="n7z1:36k0PnKKpfY" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="21ATtL" id="28r411pzCU0" role="3CrHoS">
+          <property role="TrG5h" value="ev1" />
+        </node>
+        <node concept="21ATtL" id="28r411pzCU1" role="3CrHoS">
+          <property role="TrG5h" value="ev2" />
+        </node>
+        <node concept="4e07$" id="28r411pzCU2" role="3CrHoS" />
+        <node concept="21oswF" id="28r411pzCU3" role="3CrHoS">
+          <ref role="21oszt" node="28r411pzCTW" resolve="Gate 1" />
+          <ref role="21oszj" node="28r411pzCU0" resolve="ev1" />
+        </node>
+        <node concept="21oswF" id="28r411pzCU4" role="3CrHoS">
+          <ref role="21oszt" node="28r411pzCTW" resolve="Gate 1" />
+          <ref role="21oszj" node="28r411pzCU1" resolve="ev2" />
+        </node>
+        <node concept="4e07$" id="28r411pzCTV" role="3CrHoS" />
         <node concept="7CXmI" id="36k0PnKKuO7" role="lGtFl">
           <node concept="7OXhh" id="36k0PnKKuO9" role="7EUXB">
             <property role="GvXf4" value="true" />
@@ -345,174 +372,178 @@
           <node concept="37mRIm" id="36k0PnKKx6O" role="37mRID">
             <property role="37mO49" value="3572484072057567018" />
             <node concept="gqqVs" id="36k0PnKKx6M" role="37mO4d">
-              <property role="gqqTZ" value="313.46835937500003" />
-              <property role="gqqTW" value="115.0" />
-              <property role="gqqTX" value="60.0" />
-              <property role="gqqTy" value="60.0" />
+              <property role="gqqTZ" value="188.52499999999998" />
+              <property role="gqqTW" value="294.1999969482422" />
+              <property role="gqqTX" value="476.0" />
+              <property role="gqqTy" value="64.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx6P" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="1250389671" />
+                <property role="2gRgW$" value="910434227" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx6Q" role="1pap1a">
                 <property role="1pa3iD" value="24" />
-                <property role="2gRgW$" value="2005472630" />
+                <property role="2gRgW$" value="1789903249" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx6R" role="1pap1a">
                 <property role="1pa3iD" value="25" />
-                <property role="2gRgW$" value="1442624094" />
+                <property role="2gRgW$" value="1361305049" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx6S" role="1pap1a">
                 <property role="1pa3iD" value="02" />
-                <property role="2gRgW$" value="1806310840" />
+                <property role="2gRgW$" value="1575604149" />
+              </node>
+              <node concept="1pa3jb" id="28r411pzEnd" role="1pap1a">
+                <property role="1pa3iD" value="65" />
+                <property role="2gRgW$" value="1147005949" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx6U" role="37mRID">
             <property role="37mO49" value="3572484072057567019" />
             <node concept="gqqVs" id="36k0PnKKx6T" role="37mO4d">
-              <property role="gqqTZ" value="162.91835937500002" />
-              <property role="gqqTW" value="12.0" />
-              <property role="gqqTX" value="353.0" />
-              <property role="gqqTy" value="63.0" />
+              <property role="gqqTZ" value="12.0" />
+              <property role="gqqTW" value="190.1999969482422" />
+              <property role="gqqTX" value="476.0" />
+              <property role="gqqTy" value="64.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx6V" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="909655924" />
+                <property role="2gRgW$" value="910434227" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx6W" role="1pap1a">
                 <property role="1pa3iD" value="26" />
-                <property role="2gRgW$" value="1636554709" />
+                <property role="2gRgW$" value="1647037182" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx6X" role="1pap1a">
                 <property role="1pa3iD" value="27" />
-                <property role="2gRgW$" value="1297796725" />
+                <property role="2gRgW$" value="1289872015" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx6Z" role="37mRID">
             <property role="37mO49" value="3572484072057781862" />
             <node concept="gqqVs" id="36k0PnKKx6Y" role="37mO4d">
-              <property role="gqqTZ" value="170.0" />
-              <property role="gqqTW" value="215.0" />
-              <property role="gqqTX" value="347.0" />
-              <property role="gqqTy" value="63.0" />
+              <property role="gqqTZ" value="296.99999999999994" />
+              <property role="gqqTW" value="418.8666636149089" />
+              <property role="gqqTX" value="468.0" />
+              <property role="gqqTy" value="64.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx70" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="855916834" />
+                <property role="2gRgW$" value="856708901" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx71" role="1pap1a">
                 <property role="1pa3iD" value="01" />
-                <property role="2gRgW$" value="1561176117" />
+                <property role="2gRgW$" value="1571830647" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx72" role="1pap1a">
                 <property role="1pa3iD" value="36" />
-                <property role="2gRgW$" value="1222747463" />
+                <property role="2gRgW$" value="1214678225" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx74" role="37mRID">
             <property role="37mO49" value="3572484072057567020" />
             <node concept="gqqVs" id="36k0PnKKx73" role="37mO4d">
-              <property role="gqqTZ" value="537.0" />
-              <property role="gqqTW" value="215.8" />
+              <property role="gqqTZ" value="785.0" />
+              <property role="gqqTW" value="420.8999969482422" />
               <property role="gqqTX" value="50.0" />
               <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx75" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="830085024" />
+                <property role="2gRgW$" value="644245093" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx76" role="1pap1a">
                 <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="1701467811" />
+                <property role="2gRgW$" value="1515627880" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx78" role="37mRID">
             <property role="37mO49" value="3572484072057567021" />
             <node concept="gqqVs" id="36k0PnKKx77" role="37mO4d">
-              <property role="gqqTZ" value="100.0" />
-              <property role="gqqTW" value="215.8" />
+              <property role="gqqTZ" value="226.99999999999994" />
+              <property role="gqqTW" value="420.8999969482422" />
               <property role="gqqTX" value="50.0" />
               <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx79" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="830085024" />
+                <property role="2gRgW$" value="644245093" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx7a" role="1pap1a">
                 <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="1701467811" />
+                <property role="2gRgW$" value="1515627880" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx7c" role="37mRID">
             <property role="37mO49" value="3572484072057567022" />
             <node concept="gqqVs" id="36k0PnKKx7b" role="37mO4d">
-              <property role="gqqTZ" value="243.46835937500003" />
-              <property role="gqqTW" value="115.8" />
+              <property role="gqqTZ" value="118.52499999999998" />
+              <property role="gqqTW" value="294.9999969482422" />
               <property role="gqqTX" value="50.0" />
               <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx7d" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="830085024" />
+                <property role="2gRgW$" value="644245093" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx7e" role="1pap1a">
                 <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="1701467811" />
+                <property role="2gRgW$" value="1515627880" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx7g" role="37mRID">
             <property role="37mO49" value="3572484072057781917" />
             <node concept="gqqVs" id="36k0PnKKx7f" role="37mO4d">
-              <property role="gqqTZ" value="322.55000000000007" />
-              <property role="gqqTW" value="318.8" />
+              <property role="gqqTZ" value="541.0" />
+              <property role="gqqTW" value="525.7000091552734" />
               <property role="gqqTX" value="50.0" />
               <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx7h" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="830085024" />
+                <property role="2gRgW$" value="644245093" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx7i" role="1pap1a">
                 <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="1701467811" />
+                <property role="2gRgW$" value="1515627880" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx7k" role="37mRID">
             <property role="37mO49" value="3572484072057781932" />
             <node concept="gqqVs" id="36k0PnKKx7j" role="37mO4d">
-              <property role="gqqTZ" value="252.55000000000007" />
-              <property role="gqqTW" value="318.8" />
+              <property role="gqqTZ" value="470.99999999999994" />
+              <property role="gqqTW" value="525.7000091552734" />
               <property role="gqqTX" value="50.0" />
               <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx7l" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="830085024" />
+                <property role="2gRgW$" value="644245093" />
               </node>
               <node concept="1pa3jb" id="36k0PnKKx7m" role="1pap1a">
                 <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="1701467811" />
+                <property role="2gRgW$" value="1515627880" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="36k0PnKKx7o" role="37mRID">
             <property role="37mO49" value="3572484072057999767" />
             <node concept="gqqVs" id="36k0PnKKx7n" role="37mO4d">
-              <property role="gqqTZ" value="12.0" />
-              <property role="gqqTW" value="14.75" />
-              <property role="gqqTX" value="68.0" />
-              <property role="gqqTy" value="63.0" />
+              <property role="gqqTZ" value="92.0" />
+              <property role="gqqTW" value="420.8999969482422" />
+              <property role="gqqTX" value="115.0" />
+              <property role="gqqTy" value="64.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="36k0PnKKx7p" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="590558002" />
+                <property role="2gRgW$" value="581380722" />
               </node>
             </node>
           </node>
@@ -520,12 +551,12 @@
             <property role="37mO49" value="3572484072057567024" />
             <node concept="2VclpC" id="36k0PnKKx7q" role="37mO4d">
               <node concept="2VclrF" id="36k0PnKKx7s" role="2Vcluh">
-                <property role="2Vclpx" value="352.50507812500007" />
-                <property role="2Vclpz" value="195.0" />
+                <property role="2Vclpx" value="439.59589843749995" />
+                <property role="2Vclpz" value="378.1999969482422" />
               </node>
               <node concept="2VclrF" id="36k0PnKKx7t" role="2Vcluh">
-                <property role="2Vclpx" value="563.0" />
-                <property role="2Vclpz" value="195.0" />
+                <property role="2Vclpx" value="811.0" />
+                <property role="2Vclpz" value="378.1999969482422" />
               </node>
             </node>
           </node>
@@ -533,12 +564,12 @@
             <property role="37mO49" value="3572484072057567025" />
             <node concept="2VclpC" id="36k0PnKKx7u" role="37mO4d">
               <node concept="2VclrF" id="36k0PnKKx7w" role="2Vcluh">
-                <property role="2Vclpx" value="336.40000000000003" />
-                <property role="2Vclpz" value="195.0" />
+                <property role="2Vclpx" value="423.47499999999997" />
+                <property role="2Vclpz" value="398.1999969482422" />
               </node>
               <node concept="2VclrF" id="36k0PnKKx7x" role="2Vcluh">
-                <property role="2Vclpx" value="126.0" />
-                <property role="2Vclpz" value="195.0" />
+                <property role="2Vclpx" value="252.99999999999994" />
+                <property role="2Vclpz" value="398.1999969482422" />
               </node>
             </node>
           </node>
@@ -546,12 +577,12 @@
             <property role="37mO49" value="3572484072057782036" />
             <node concept="2VclpC" id="36k0PnKKx7y" role="37mO4d">
               <node concept="2VclrF" id="36k0PnKKx7$" role="2Vcluh">
-                <property role="2Vclpx" value="340.45" />
-                <property role="2Vclpz" value="298.0" />
+                <property role="2Vclpx" value="527.9499999999999" />
+                <property role="2Vclpz" value="504.90000915527344" />
               </node>
               <node concept="2VclrF" id="36k0PnKKx7_" role="2Vcluh">
-                <property role="2Vclpx" value="278.55000000000007" />
-                <property role="2Vclpz" value="298.0" />
+                <property role="2Vclpx" value="496.99999999999994" />
+                <property role="2Vclpz" value="504.90000915527344" />
               </node>
             </node>
           </node>
@@ -559,48 +590,150 @@
             <property role="37mO49" value="3572484072057567027" />
             <node concept="2VclpC" id="36k0PnKKx7A" role="37mO4d">
               <node concept="2VclrF" id="36k0PnKKx7C" role="2Vcluh">
-                <property role="2Vclpx" value="336.368359375" />
-                <property role="2Vclpz" value="95.0" />
+                <property role="2Vclpx" value="246.95" />
+                <property role="2Vclpz" value="274.1999969482422" />
               </node>
               <node concept="2VclrF" id="36k0PnKKx7D" role="2Vcluh">
-                <property role="2Vclpx" value="269.46835937500003" />
-                <property role="2Vclpz" value="95.0" />
+                <property role="2Vclpx" value="144.52499999999998" />
+                <property role="2Vclpz" value="274.1999969482422" />
               </node>
             </node>
           </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="36k0PnKKRwy" role="1SKRRt">
-      <node concept="21ASy4" id="36k0PnKKRxV" role="1qenE9">
-        <node concept="cEgko" id="36k0PnKKRxX" role="3CrHoS">
-          <property role="TrG5h" value="Gate 1" />
-          <node concept="7CXmI" id="36k0PnKKSK9" role="lGtFl">
-            <node concept="1TM$A" id="36k0PnKKSKa" role="7EUXB">
-              <node concept="2PYRI3" id="36k0PnKKSKe" role="3lydEf">
-                <ref role="39XzEq" to="n7z1:36k0PnKKpfY" />
+          <node concept="37mRIm" id="28r411pzEnf" role="37mRID">
+            <property role="37mO49" value="2457575684068773500" />
+            <node concept="gqqVs" id="28r411pzEne" role="37mO4d">
+              <property role="gqqTZ" value="12.0" />
+              <property role="gqqTW" value="12.0" />
+              <property role="gqqTX" value="468.0" />
+              <property role="gqqTy" value="64.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+              <node concept="1pa3jb" id="28r411pzEng" role="1pap1a">
+                <property role="1pa3iD" value="port" />
+                <property role="2gRgW$" value="910395992" />
+              </node>
+              <node concept="1pa3jb" id="28r411pzEnh" role="1pap1a">
+                <property role="1pa3iD" value="07" />
+                <property role="2gRgW$" value="1289840153" />
+              </node>
+              <node concept="1pa3jb" id="28r411pzEni" role="1pap1a">
+                <property role="1pa3iD" value="08" />
+                <property role="2gRgW$" value="1646992575" />
               </node>
             </node>
           </node>
-        </node>
-        <node concept="21ATtL" id="36k0PnKKRy2" role="3CrHoS">
-          <property role="TrG5h" value="ev1" />
-        </node>
-        <node concept="21ATtL" id="36k0PnKKRya" role="3CrHoS">
-          <property role="TrG5h" value="ev2" />
-        </node>
-        <node concept="4e07$" id="36k0PnKKRyf" role="3CrHoS" />
-        <node concept="21oswF" id="36k0PnKKRyq" role="3CrHoS">
-          <ref role="21oszt" node="36k0PnKKRxX" resolve="Gate 1" />
-          <ref role="21oszj" node="36k0PnKKRy2" resolve="ev1" />
-        </node>
-        <node concept="21oswF" id="36k0PnKKRyx" role="3CrHoS">
-          <ref role="21oszt" node="36k0PnKKRxX" resolve="Gate 1" />
-          <ref role="21oszj" node="36k0PnKKRya" resolve="ev2" />
-        </node>
-        <node concept="7CXmI" id="36k0PnKKSKg" role="lGtFl">
-          <node concept="7OXhh" id="36k0PnKKSKi" role="7EUXB">
-            <property role="GvXf4" value="true" />
+          <node concept="37mRIm" id="28r411pzEnk" role="37mRID">
+            <property role="37mO49" value="2457575684068773504" />
+            <node concept="gqqVs" id="28r411pzEnj" role="37mO4d">
+              <property role="gqqTZ" value="186.0" />
+              <property role="gqqTW" value="116.8" />
+              <property role="gqqTX" value="50.0" />
+              <property role="gqqTy" value="50.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+              <node concept="1pa3jb" id="28r411pzEnl" role="1pap1a">
+                <property role="1pa3iD" value="target_port" />
+                <property role="2gRgW$" value="644245093" />
+              </node>
+              <node concept="1pa3jb" id="28r411pzEnm" role="1pap1a">
+                <property role="1pa3iD" value="source_port" />
+                <property role="2gRgW$" value="1515627880" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEno" role="37mRID">
+            <property role="37mO49" value="2457575684068773505" />
+            <node concept="gqqVs" id="28r411pzEnn" role="37mO4d">
+              <property role="gqqTZ" value="256.0" />
+              <property role="gqqTW" value="116.8" />
+              <property role="gqqTX" value="50.0" />
+              <property role="gqqTy" value="50.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+              <node concept="1pa3jb" id="28r411pzEnp" role="1pap1a">
+                <property role="1pa3iD" value="target_port" />
+                <property role="2gRgW$" value="644245093" />
+              </node>
+              <node concept="1pa3jb" id="28r411pzEnq" role="1pap1a">
+                <property role="1pa3iD" value="source_port" />
+                <property role="2gRgW$" value="1515627880" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEns" role="37mRID">
+            <property role="37mO49" value="3572484072057782001" />
+            <node concept="2VclpC" id="28r411pzEnr" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnB" role="2Vcluh">
+                <property role="2Vclpx" value="536.05" />
+                <property role="2Vclpz" value="504.90000915527344" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnC" role="2Vcluh">
+                <property role="2Vclpx" value="567.0" />
+                <property role="2Vclpz" value="504.90000915527344" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEnu" role="37mRID">
+            <property role="37mO49" value="3572484072057781902" />
+            <node concept="2VclpC" id="28r411pzEnt" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnD" role="2Vcluh">
+                <property role="2Vclpx" value="431.575" />
+                <property role="2Vclpz" value="398.1999969482422" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnE" role="2Vcluh">
+                <property role="2Vclpx" value="532.0" />
+                <property role="2Vclpz" value="398.1999969482422" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEnw" role="37mRID">
+            <property role="37mO49" value="3572484072057567026" />
+            <node concept="2VclpC" id="28r411pzEnv" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnF" role="2Vcluh">
+                <property role="2Vclpx" value="255.05" />
+                <property role="2Vclpz" value="274.1999969482422" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnG" role="2Vcluh">
+                <property role="2Vclpx" value="427.525" />
+                <property role="2Vclpz" value="274.1999969482422" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEny" role="37mRID">
+            <property role="37mO49" value="3572484072058135765" />
+            <node concept="2VclpC" id="28r411pzEnx" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnH" role="2Vcluh">
+                <property role="2Vclpx" value="415.4541015625" />
+                <property role="2Vclpz" value="378.1999969482422" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnI" role="2Vcluh">
+                <property role="2Vclpx" value="150.5" />
+                <property role="2Vclpz" value="378.1999969482422" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEn$" role="37mRID">
+            <property role="37mO49" value="2457575684068773507" />
+            <node concept="2VclpC" id="28r411pzEnz" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnJ" role="2Vcluh">
+                <property role="2Vclpx" value="242.95" />
+                <property role="2Vclpz" value="96.0" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnK" role="2Vcluh">
+                <property role="2Vclpx" value="212.0" />
+                <property role="2Vclpz" value="96.0" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="28r411pzEnA" role="37mRID">
+            <property role="37mO49" value="2457575684068773508" />
+            <node concept="2VclpC" id="28r411pzEn_" role="37mO4d">
+              <node concept="2VclrF" id="28r411pzEnL" role="2Vcluh">
+                <property role="2Vclpx" value="251.05" />
+                <property role="2Vclpz" value="96.0" />
+              </node>
+              <node concept="2VclrF" id="28r411pzEnM" role="2Vcluh">
+                <property role="2Vclpx" value="282.0" />
+                <property role="2Vclpz" value="96.0" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
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 8f316dab..58f1b23b 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
@@ -38,7 +38,6 @@
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="ee83f675-925e-4829-ac73-32c7bec10bfc(test.com.mbeddr.formal.safety.stamp)" version="0" />
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 7caf98ae..dc1a16e7 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
@@ -73,7 +73,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="7b6c8ca6-a1af-41c8-8f20-5581cca1b013(test.mbeddr.formal.gsn.patterns)" version="0" />
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 960930e3..da0809ba 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
@@ -74,6 +74,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <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" />
@@ -122,7 +123,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
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 a98b3181..807b4479 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
@@ -59,7 +59,6 @@
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" 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 d62e30e5..5524d8e3 100644
--- a/code/languages/com.mbeddr.formal.smt/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.smt/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 5b4ce648..14c1ecb0 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
@@ -86,6 +86,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
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 cbf15f65..ea98bcd3 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
@@ -25,6 +25,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
diff --git a/code/languages/com.mbeddr.formal.spin/.mps/migration.xml b/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
index a2e96ad5..475d1f0b 100644
--- a/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.spin/.mps/migration.xml
@@ -12,6 +12,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </component>
 </project>
\ No newline at end of file
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 a536868f..75ce0e8c 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
@@ -166,6 +166,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
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 61ff439e..a7a4b0d6 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
@@ -93,6 +93,7 @@
     <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" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
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 37792a5c..47a0feb3 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
@@ -13,7 +13,6 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="tpcq" ref="r:00000000-0000-4000-0000-011c89590286(jetbrains.mps.lang.core.plugin)" />
     <import index="fn29" ref="r:6ba2667b-185e-45cd-ac65-e4b9d66da28e(jetbrains.mps.smodel.resources)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -25,7 +24,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="b0pz" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.facets(MPS.Core/)" />
     <import index="8oaq" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:org.apache.commons.io(MPS.ThirdParty/)" />
-    <import index="n8ay" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:org.apache.commons.lang(MPS.ThirdParty/)" />
+    <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="3ju5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs(MPS.Core/)" implicit="true" />
   </imports>
@@ -2288,9 +2287,9 @@
               </node>
             </node>
           </node>
-          <node concept="10M0yZ" id="jZav4mCYas" role="3clFbw">
-            <ref role="3cqZAo" to="n8ay:~SystemUtils.IS_OS_WINDOWS" resolve="IS_OS_WINDOWS" />
-            <ref role="1PxDUh" to="n8ay:~SystemUtils" resolve="SystemUtils" />
+          <node concept="10M0yZ" id="2i2e8U0Y7wQ" role="3clFbw">
+            <ref role="3cqZAo" to="zn9m:~SystemInfo.isWindows" resolve="isWindows" />
+            <ref role="1PxDUh" to="zn9m:~SystemInfo" resolve="SystemInfo" />
           </node>
         </node>
         <node concept="3clFbF" id="5y2MdLwLeET" role="3cqZAp">
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 6c76f701..38e7692a 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
@@ -4,7 +4,6 @@
   <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="2" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
     <import index="7qe3" ref="r:65dc22a9-884e-4aad-aa27-16060900ad59(_010_spin_hdl_high_prio@generator)" />
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 ca64c91c..af552ba8 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
@@ -29,6 +29,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
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 9994fbe2..4bcdd238 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
@@ -33,6 +33,7 @@
     <import index="kle0" ref="r:e64c059a-e646-49b9-a694-43206fe0e74b(com.mbeddr.formal.base.tooling.nodes)" />
     <import index="iwwu" ref="r:2c4d9270-b6d6-44af-aecd-e01a223680db(jetbrains.mps.kernel.model)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="vt3w" ref="r:adc36c3c-4daf-4fb6-87db-41b3b762af25(com.mbeddr.formal.spin.analyses.behavior)" implicit="true" />
     <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" implicit="true" />
     <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
@@ -3750,13 +3751,15 @@
         </node>
         <node concept="3clFbJ" id="2yuIwRziK2J" role="3cqZAp">
           <node concept="3clFbS" id="2yuIwRziK2L" role="3clFbx">
-            <node concept="3clFbF" id="2yuIwRziMsg" role="3cqZAp">
-              <node concept="2YIFZM" id="2yuIwRziMte" role="3clFbG">
-                <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object)" resolve="showMessageDialog" />
-                <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                <node concept="10Nm6u" id="2yuIwRziMv8" role="37wK5m" />
-                <node concept="Xl_RD" id="2yuIwRziMxl" role="37wK5m">
-                  <property role="Xl_RC" value="Error: at most one assertion analysis configuration referencing this environment can be present." />
+            <node concept="3clFbF" id="2i2e8U2FaKK" role="3cqZAp">
+              <node concept="2YIFZM" id="2i2e8U2Fb44" role="3clFbG">
+                <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
+                <node concept="Xl_RD" id="2i2e8U2Fbt6" role="37wK5m">
+                  <property role="Xl_RC" value="At most one assertion analysis configuration referencing this environment can be present." />
+                </node>
+                <node concept="Xl_RD" id="2i2e8U2Fe5P" role="37wK5m">
+                  <property role="Xl_RC" value="Error" />
                 </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 e1a11176..72de04c1 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
@@ -22,6 +22,7 @@
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="vxn5" ref="r:a3aca88b-58e4-4e34-884c-ec641c87bfca(com.mbeddr.formal.base.tooling.results_ui)" />
     <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="v4mk" ref="e9ce245b-3106-45ed-8e5b-aff820d09b85/java:org.jdesktop.swingx(com.mbeddr.formal.base.tooling/)" implicit="true" />
@@ -71,9 +72,6 @@
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -1038,27 +1036,23 @@
                               </node>
                             </node>
                             <node concept="3clFbS" id="2k2dPZH6$th" role="1zc67A">
-                              <node concept="3clFbF" id="2k2dPZH6$ti" role="3cqZAp">
-                                <node concept="2YIFZM" id="2k2dPZH6$tj" role="3clFbG">
-                                  <ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
-                                  <ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
+                              <node concept="3clFbF" id="2i2e8U2Fvd2" role="3cqZAp">
+                                <node concept="2YIFZM" id="2i2e8U2Fxdy" role="3clFbG">
+                                  <ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.awt.Component,java.lang.String,java.lang.String)" resolve="showErrorDialog" />
+                                  <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
                                   <node concept="37vLTw" id="4_pH3zvo18A" role="37wK5m">
                                     <ref role="3cqZAo" to="vxn5:JsaLOcnA09" resolve="analysesResultsTable" />
                                   </node>
-                                  <node concept="2OqwBi" id="2k2dPZH6$tl" role="37wK5m">
-                                    <node concept="37vLTw" id="2k2dPZH6$tm" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="2i2e8U2G1Sw" role="37wK5m">
+                                    <node concept="37vLTw" id="2i2e8U2G0CW" role="2Oq$k0">
                                       <ref role="3cqZAo" node="2k2dPZH6$tf" resolve="ex" />
                                     </node>
-                                    <node concept="liA8E" id="2k2dPZH6$tn" role="2OqNvi">
+                                    <node concept="liA8E" id="2i2e8U2G49C" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                     </node>
                                   </node>
-                                  <node concept="Xl_RD" id="2k2dPZH6$to" role="37wK5m">
-                                    <property role="Xl_RC" value="Error" />
-                                  </node>
-                                  <node concept="10M0yZ" id="2k2dPZH6$tp" role="37wK5m">
-                                    <ref role="3cqZAo" to="dxuu:~JOptionPane.ERROR_MESSAGE" resolve="ERROR_MESSAGE" />
-                                    <ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
+                                  <node concept="Xl_RD" id="2i2e8U2FGih" role="37wK5m">
+                                    <property role="Xl_RC" value="Error reunning last analysis" />
                                   </node>
                                 </node>
                               </node>
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 f389f897..28b3bb2a 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
@@ -38,6 +38,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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <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/libraries.xml b/code/languages/com.mpsbasics/.mps/libraries.xml
new file mode 100644
index 00000000..6b84430d
--- /dev/null
+++ b/code/languages/com.mpsbasics/.mps/libraries.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLibraryManager">
+    <option name="libraries">
+      <map>
+        <entry key="dependencies">
+          <value>
+            <Library>
+              <option name="name" value="dependencies" />
+              <option name="path" value="${mbeddr.formal.home}/build/dependencies" />
+            </Library>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/languages/com.mpsbasics/.mps/migration.xml b/code/languages/com.mpsbasics/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/languages/com.mpsbasics/.mps/migration.xml
+++ b/code/languages/com.mpsbasics/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 30932c7f..6adaa93f 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
@@ -15,7 +15,7 @@
   </dependencies>
   <languageVersions>
     <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:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
   <dependencyVersions>
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 2fda4818..0b988674 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
@@ -2,7 +2,7 @@
 <model ref="r:ef07c49a-32d8-46ff-a533-57b4dbca7bb4(com.mpsbasics.build.build)">
   <persistence version="9" />
   <languages>
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
   </languages>
   <imports>
@@ -115,7 +115,7 @@
       </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" />
+        <property id="2928402740576877067" name="javaCode" index="3vZFNd" />
         <child id="5253498789149547825" name="sources" index="3bR31x" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
@@ -455,7 +455,7 @@
         <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" />
+        <property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
         <node concept="398BVA" id="6mm$FLYQztb" role="3LF7KH">
           <ref role="398BVh" node="6mm$FLYQyYs" resolve="mpsbasics.code" />
           <node concept="2Ry0Ak" id="6mm$FLYQztg" role="iGT6I">
@@ -1147,7 +1147,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.diffx.lib" />
         <property role="3LESm3" value="1cb48442-05da-4cad-b5c5-e31ddd69e322" />
-        <property role="2GAjPV" value="true" />
+        <property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
         <node concept="398BVA" id="2MrvZqtDh3X" role="3LF7KH">
           <ref role="398BVh" node="6mm$FLYQyYs" resolve="mpsbasics.code" />
           <node concept="2Ry0Ak" id="2MrvZqtDhmt" role="iGT6I">
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
index 2d26bb5b..5d0fea12 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
@@ -13,10 +13,10 @@
   <dependencies>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
-    <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
     <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -44,6 +44,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)" version="0" />
+    <module reference="563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)" version="0" />
     <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
     <module reference="5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.screenshooter.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.screenshooter.mps
index 0f981b76..3307b47d 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.screenshooter.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.screenshooter.mps
@@ -16,11 +16,8 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
-    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="jan3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.image(JDK/)" />
     <import index="oqcp" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.imageio(JDK/)" />
@@ -32,11 +29,11 @@
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
     <import index="lhjl" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:org.w3c.dom(JDK/)" />
-    <import index="ujg5" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.dom(org.apache.batik/)" />
-    <import index="nxzt" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.svggen(org.apache.batik/)" />
     <import index="5yhu" ref="r:019d0cc6-143d-4aa3-9dc5-d01fd5b71098(com.mpsbasics.editor.utils.notifications)" />
     <import index="agne" ref="r:2538c08a-32a3-4d93-89c3-b508268173db(com.mpsbasics.project.utils.project_finder)" />
-    <import index="idqn" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.ext.awt.g2d(org.apache.batik/)" implicit="true" />
+    <import index="nxzt" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.svggen(de.itemis.stubs.batik/)" />
+    <import index="ujg5" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.dom(de.itemis.stubs.batik/)" />
+    <import index="idqn" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.ext.awt.g2d(de.itemis.stubs.batik/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -3138,7 +3135,7 @@
               <ref role="3uigEE" to="nxzt:~GenericImageHandler" resolve="GenericImageHandler" />
             </node>
             <node concept="2ShNRf" id="26AplbI234r" role="33vP2m">
-              <node concept="1pGfFk" id="26AplbI234s" role="2ShVmc">
+              <node concept="1pGfFk" id="2i2e8U03AEX" role="2ShVmc">
                 <ref role="37wK5l" to="nxzt:~CachedImageHandlerBase64Encoder.&lt;init&gt;()" resolve="CachedImageHandlerBase64Encoder" />
               </node>
             </node>
@@ -3638,7 +3635,7 @@
       <node concept="3uibUv" id="6v3euY35s_8" role="Sfmx6">
         <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
       </node>
-      <node concept="3uibUv" id="6v3euY35s_9" role="Sfmx6">
+      <node concept="3uibUv" id="2i2e8U04xkK" role="Sfmx6">
         <ref role="3uigEE" to="nxzt:~SVGGraphics2DIOException" resolve="SVGGraphics2DIOException" />
       </node>
     </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.pluginSolution/models/com.mpsbasics.jira.pluginSolution.util.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.pluginSolution/models/com.mpsbasics.jira.pluginSolution.util.mps
index 794afadc..48941876 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.pluginSolution/models/com.mpsbasics.jira.pluginSolution.util.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.pluginSolution/models/com.mpsbasics.jira.pluginSolution.util.mps
@@ -10,12 +10,12 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="mkxq" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.api(com.fasten.jira/)" />
+    <import index="mkxq" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.api(com.mpsbasics.jira.pluginSolution/)" />
     <import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
     <import index="lagk" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.api.domain(com.mpsbasics.jira.pluginSolution/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="xbmv" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.internal.async(com.fasten.jira/)" />
-    <import index="oqtg" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.auth(com.fasten.jira.pluginSolution/)" />
+    <import index="xbmv" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.internal.async(com.mpsbasics.jira.pluginSolution/)" />
+    <import index="oqtg" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.jira.rest.client.auth(com.mpsbasics.jira.pluginSolution/)" />
     <import index="cxdr" ref="r:10e9be3d-5ae8-41d9-9554-78e944872df2(com.mpsbasics.jira.structure)" />
     <import index="ct1y" ref="47b4ca2d-4ed7-41a6-b64f-df36b50a3c95/java:com.atlassian.util.concurrent(com.mpsbasics.jira.pluginSolution/)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd
index bab47a5e..a4b5b9a1 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd
@@ -24,7 +24,6 @@
     <dependency reexport="false">ece26728-2885-4b26-9f61-67d2821fc361(com.mpsbasics.pdfexporter)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
-    <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
@@ -33,7 +32,6 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-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:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
index 7ac02f2d..3aa0adb3 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
@@ -3,16 +3,13 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="yid2" ref="bc7d0863-298c-41cf-984f-a0421e757da5/java:org.apache.pdfbox.pdmodel(com.fasten.safety.pdfbox/)" />
+    <import index="yid2" ref="bc7d0863-298c-41cf-984f-a0421e757da5/java:org.apache.pdfbox.pdmodel(com.mpsbasics.pdfbox/)" />
     <import index="r4xz" ref="bc7d0863-298c-41cf-984f-a0421e757da5/java:org.apache.pdfbox.pdmodel.font(com.mpsbasics.pdfbox/)" />
     <import index="8l7n" ref="bc7d0863-298c-41cf-984f-a0421e757da5/java:org.apache.pdfbox.pdmodel.common(com.mpsbasics.pdfbox/)" />
     <import index="1ob6" ref="r:f44404ed-5270-44f9-8e19-281b0df5835d(com.mpsbasics.pdfexporter.structure)" />
diff --git a/code/tutorial-mdcc/.mps/migration.xml b/code/tutorial-mdcc/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/tutorial-mdcc/.mps/migration.xml
+++ b/code/tutorial-mdcc/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </component>
 </project>
\ No newline at end of file
diff --git a/code/tutorial-safety/.mps/migration.xml b/code/tutorial-safety/.mps/migration.xml
index d62e30e5..5524d8e3 100644
--- a/code/tutorial-safety/.mps/migration.xml
+++ b/code/tutorial-safety/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 ae071af9..580c9e01 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
@@ -102,6 +102,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <language slang="l:1839bec5-cea6-41df-b9e0-c405ff35c41e:jetbrains.mps.lang.editor.imageGen" version="0" />
@@ -134,7 +135,6 @@
     <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
     <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)" version="0" />
   </dependencyVersions>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
index c20c35c5..ab11b50a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
@@ -175,7 +175,7 @@
           <node concept="37mRIm" id="6kDcQMvl83" role="37mRID">
             <property role="37mO49" value="113897093960913325" />
             <node concept="gqqVs" id="6kDcQMvl81" role="37mO4d">
-              <property role="gqqTZ" value="12.0" />
+              <property role="gqqTZ" value="92.5" />
               <property role="gqqTW" value="12.0" />
               <property role="gqqTX" value="165.0" />
               <property role="gqqTy" value="50.0" />
@@ -193,7 +193,7 @@
           <node concept="37mRIm" id="6kDcQMvl87" role="37mRID">
             <property role="37mO49" value="113897093960913335" />
             <node concept="gqqVs" id="6kDcQMvl86" role="37mO4d">
-              <property role="gqqTZ" value="36.400000000000006" />
+              <property role="gqqTZ" value="12.0" />
               <property role="gqqTW" value="282.8" />
               <property role="gqqTX" value="100.0" />
               <property role="gqqTy" value="50.0" />
@@ -211,7 +211,7 @@
           <node concept="37mRIm" id="6kDcQMvl8b" role="37mRID">
             <property role="37mO49" value="113897093960913337" />
             <node concept="gqqVs" id="6kDcQMvl8a" role="37mO4d">
-              <property role="gqqTZ" value="156.4" />
+              <property role="gqqTZ" value="132.0" />
               <property role="gqqTW" value="282.8" />
               <property role="gqqTX" value="104.0" />
               <property role="gqqTy" value="50.0" />
@@ -229,29 +229,29 @@
           <node concept="37mRIm" id="6kDcQMvl8f" role="37mRID">
             <property role="37mO49" value="113897093960913334" />
             <node concept="gqqVs" id="6kDcQMvl8e" role="37mO4d">
-              <property role="gqqTZ" value="60.45" />
+              <property role="gqqTZ" value="93.0" />
               <property role="gqqTW" value="182.0" />
               <property role="gqqTX" value="60.0" />
               <property role="gqqTy" value="60.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="6kDcQMvl8g" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="1014859206" />
+                <property role="2gRgW$" value="858993458" />
               </node>
               <node concept="1pa3jb" id="6kDcQMvl8h" role="1pap1a">
                 <property role="1pa3iD" value="36" />
-                <property role="2gRgW$" value="1367462166" />
+                <property role="2gRgW$" value="1211596418" />
               </node>
               <node concept="1pa3jb" id="6kDcQMvl8i" role="1pap1a">
                 <property role="1pa3iD" value="38" />
-                <property role="2gRgW$" value="1731148913" />
+                <property role="2gRgW$" value="1575283164" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="6kDcQMvl8k" role="37mRID">
             <property role="37mO49" value="113897093960913340" />
             <node concept="gqqVs" id="6kDcQMvl8j" role="37mO4d">
-              <property role="gqqTZ" value="140.45" />
+              <property role="gqqTZ" value="173.0" />
               <property role="gqqTW" value="182.8" />
               <property role="gqqTX" value="108.0" />
               <property role="gqqTy" value="50.0" />
@@ -269,22 +269,22 @@
           <node concept="37mRIm" id="6kDcQMvl8o" role="37mRID">
             <property role="37mO49" value="113897093960913333" />
             <node concept="gqqVs" id="6kDcQMvl8n" role="37mO4d">
-              <property role="gqqTZ" value="64.5" />
+              <property role="gqqTZ" value="145.0" />
               <property role="gqqTW" value="82.0" />
               <property role="gqqTX" value="60.0" />
               <property role="gqqTy" value="60.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
               <node concept="1pa3jb" id="6kDcQMvl8p" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="1014859206" />
+                <property role="2gRgW$" value="858993458" />
               </node>
               <node concept="1pa3jb" id="6kDcQMvl8q" role="1pap1a">
                 <property role="1pa3iD" value="39" />
-                <property role="2gRgW$" value="1367462166" />
+                <property role="2gRgW$" value="1211596418" />
               </node>
               <node concept="1pa3jb" id="6kDcQMvl8r" role="1pap1a">
                 <property role="1pa3iD" value="41" />
-                <property role="2gRgW$" value="1731148913" />
+                <property role="2gRgW$" value="1575283164" />
               </node>
             </node>
           </node>
@@ -292,11 +292,11 @@
             <property role="37mO49" value="113897093960913338" />
             <node concept="2VclpC" id="6kDcQMvl8s" role="37mO4d">
               <node concept="2VclrF" id="6kDcQMvl8u" role="2Vcluh">
-                <property role="2Vclpx" value="95.5" />
+                <property role="2Vclpx" value="128.05" />
                 <property role="2Vclpz" value="262.0" />
               </node>
               <node concept="2VclrF" id="6kDcQMvl8v" role="2Vcluh">
-                <property role="2Vclpx" value="209.4" />
+                <property role="2Vclpx" value="185.0" />
                 <property role="2Vclpz" value="262.0" />
               </node>
             </node>
@@ -305,15 +305,45 @@
             <property role="37mO49" value="113897093960913341" />
             <node concept="2VclpC" id="6kDcQMvl8w" role="37mO4d">
               <node concept="2VclrF" id="6kDcQMvl8y" role="2Vcluh">
-                <property role="2Vclpx" value="99.55" />
+                <property role="2Vclpx" value="180.05" />
                 <property role="2Vclpz" value="162.0" />
               </node>
               <node concept="2VclrF" id="6kDcQMvl8z" role="2Vcluh">
-                <property role="2Vclpx" value="195.45" />
+                <property role="2Vclpx" value="228.0" />
                 <property role="2Vclpz" value="162.0" />
               </node>
             </node>
           </node>
+          <node concept="37mRIm" id="2i2e8U23MV0" role="37mRID">
+            <property role="37mO49" value="113897093960913336" />
+            <node concept="2VclpC" id="2i2e8U23MUZ" role="37mO4d">
+              <node concept="2VclrF" id="2i2e8U23MV5" role="2Vcluh">
+                <property role="2Vclpx" value="119.95" />
+                <property role="2Vclpz" value="262.0" />
+              </node>
+              <node concept="2VclrF" id="2i2e8U23MV6" role="2Vcluh">
+                <property role="2Vclpx" value="63.0" />
+                <property role="2Vclpz" value="262.0" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="2i2e8U23MV2" role="37mRID">
+            <property role="37mO49" value="113897093960913339" />
+            <node concept="2VclpC" id="2i2e8U23MV1" role="37mO4d">
+              <node concept="2VclrF" id="2i2e8U23MV7" role="2Vcluh">
+                <property role="2Vclpx" value="171.95" />
+                <property role="2Vclpz" value="162.0" />
+              </node>
+              <node concept="2VclrF" id="2i2e8U23MV8" role="2Vcluh">
+                <property role="2Vclpx" value="124.0" />
+                <property role="2Vclpz" value="162.0" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="2i2e8U23MV4" role="37mRID">
+            <property role="37mO49" value="113897093960913342" />
+            <node concept="2VclpC" id="2i2e8U23MV3" role="37mO4d" />
+          </node>
         </node>
       </node>
     </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
index b181a5c3..8cbe47de 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
@@ -101,30 +101,30 @@
       <node concept="37mRIm" id="7L33HENdux3" role="37mRID">
         <property role="37mO49" value="8954016816614991919" />
         <node concept="gqqVs" id="7L33HENdux1" role="37mO4d">
-          <property role="gqqTZ" value="152.0" />
-          <property role="gqqTW" value="60.0" />
-          <property role="gqqTX" value="136.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="100.0" />
+          <property role="gqqTW" value="105.00029836425782" />
+          <property role="gqqTX" value="234.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="7L33HENduxA" role="37mRID">
         <property role="37mO49" value="8954016816614991952" />
         <node concept="gqqVs" id="7L33HENdux_" role="37mO4d">
-          <property role="gqqTZ" value="149.0" />
-          <property role="gqqTW" value="144.0" />
-          <property role="gqqTX" value="142.0" />
-          <property role="gqqTy" value="42.0" />
+          <property role="gqqTZ" value="378.0" />
+          <property role="gqqTW" value="228.5004967285156" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="7L33HENduyp" role="37mRID">
         <property role="37mO49" value="8954016816614992000" />
         <node concept="gqqVs" id="7L33HENduyo" role="37mO4d">
-          <property role="gqqTZ" value="110.0" />
-          <property role="gqqTW" value="214.0" />
-          <property role="gqqTX" value="93.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="139.0" />
+          <property role="gqqTW" value="331.0006950927734" />
+          <property role="gqqTX" value="132.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -132,12 +132,12 @@
         <property role="37mO49" value="8954016816614991992" />
         <node concept="2VclpC" id="7L33HENduyq" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWn" role="2Vcluh">
-            <property role="2Vclpx" value="219.0" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="218.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="2VclrF" id="336$aoTKiWo" role="2Vcluh">
-            <property role="2Vclpx" value="219.0" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="488.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiWp" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWq" role="3ul5Gz">
@@ -157,12 +157,12 @@
         <property role="37mO49" value="8954016816614992071" />
         <node concept="2VclpC" id="7L33HENduzg" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWt" role="2Vcluh">
-            <property role="2Vclpx" value="219.0" />
-            <property role="2Vclpz" value="199.0" />
+            <property role="2Vclpx" value="488.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="2VclrF" id="336$aoTKiWu" role="2Vcluh">
-            <property role="2Vclpx" value="155.0" />
-            <property role="2Vclpz" value="199.0" />
+            <property role="2Vclpx" value="206.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiWv" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWw" role="3ul5Gz">
@@ -181,10 +181,10 @@
       <node concept="37mRIm" id="3jaLROLvqyK" role="37mRID">
         <property role="37mO49" value="3804072175782963270" />
         <node concept="gqqVs" id="3jaLROLvqyJ" role="37mO4d">
-          <property role="gqqTZ" value="246.0" />
-          <property role="gqqTW" value="214.0" />
-          <property role="gqqTX" value="85.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="529.0" />
+          <property role="gqqTW" value="331.0006950927734" />
+          <property role="gqqTX" value="122.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -192,12 +192,12 @@
         <property role="37mO49" value="3804072175782963490" />
         <node concept="2VclpC" id="3jaLROLvq_j" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWz" role="2Vcluh">
-            <property role="2Vclpx" value="219.0" />
-            <property role="2Vclpz" value="199.0" />
+            <property role="2Vclpx" value="488.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="2VclrF" id="336$aoTKiW$" role="2Vcluh">
-            <property role="2Vclpx" value="287.0" />
-            <property role="2Vclpz" value="199.0" />
+            <property role="2Vclpx" value="591.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiW_" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWA" role="3ul5Gz">
@@ -310,10 +310,10 @@
       <node concept="37mRIm" id="2hB9zGID8DR" role="37mRID">
         <property role="37mO49" value="2623107343594064426" />
         <node concept="gqqVs" id="2hB9zGID8DQ" role="37mO4d">
-          <property role="gqqTZ" value="18.0" />
-          <property role="gqqTW" value="60.0" />
-          <property role="gqqTX" value="76.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="250.0" />
+          <property role="gqqTW" value="218.00049672851563" />
+          <property role="gqqTX" value="108.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -321,12 +321,12 @@
         <property role="37mO49" value="2623107343594064619" />
         <node concept="2VclpC" id="2hB9zGID8GE" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWJ" role="2Vcluh">
-            <property role="2Vclpx" value="152.0" />
-            <property role="2Vclpz" value="87.0" />
+            <property role="2Vclpx" value="218.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="2VclrF" id="336$aoTKiWK" role="2Vcluh">
-            <property role="2Vclpx" value="102.0" />
-            <property role="2Vclpz" value="87.0" />
+            <property role="2Vclpx" value="305.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiWL" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWM" role="3ul5Gz">
@@ -345,10 +345,10 @@
       <node concept="37mRIm" id="2hB9zGID8QN" role="37mRID">
         <property role="37mO49" value="2623107343594065251" />
         <node concept="gqqVs" id="2hB9zGID8QM" role="37mO4d">
-          <property role="gqqTZ" value="339.0" />
-          <property role="gqqTW" value="144.0" />
-          <property role="gqqTX" value="152.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="291.0" />
+          <property role="gqqTW" value="331.0006950927734" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -356,12 +356,12 @@
         <property role="37mO49" value="2623107343594065572" />
         <node concept="2VclpC" id="2hB9zGID8V$" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWP" role="2Vcluh">
-            <property role="2Vclpx" value="289.0" />
-            <property role="2Vclpz" value="164.0" />
+            <property role="2Vclpx" value="488.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="2VclrF" id="336$aoTKiWQ" role="2Vcluh">
-            <property role="2Vclpx" value="339.0" />
-            <property role="2Vclpz" value="171.0" />
+            <property role="2Vclpx" value="401.00005" />
+            <property role="2Vclpz" value="311.00059509277344" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiWR" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWS" role="3ul5Gz">
@@ -380,24 +380,16 @@
       <node concept="37mRIm" id="2hB9zGID932" role="37mRID">
         <property role="37mO49" value="2623107343594066031" />
         <node concept="gqqVs" id="2hB9zGID931" role="37mO4d">
-          <property role="gqqTZ" value="221.0" />
-          <property role="gqqTW" value="298.0" />
-          <property role="gqqTX" value="135.0" />
-          <property role="gqqTy" value="42.0" />
+          <property role="gqqTZ" value="489.0" />
+          <property role="gqqTW" value="424.0009087158203" />
+          <property role="gqqTX" value="202.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2hB9zGID96a" role="37mRID">
         <property role="37mO49" value="2623107343594066248" />
         <node concept="2VclpC" id="2hB9zGID969" role="37mO4d">
-          <node concept="2VclrF" id="336$aoTKiWD" role="2Vcluh">
-            <property role="2Vclpx" value="287.0" />
-            <property role="2Vclpz" value="283.0" />
-          </node>
-          <node concept="2VclrF" id="336$aoTKiWE" role="2Vcluh">
-            <property role="2Vclpx" value="287.0" />
-            <property role="2Vclpz" value="283.0" />
-          </node>
           <node concept="3ul5H1" id="336$aoTKiWF" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWG" role="3ul5Gz">
               <node concept="2VclrF" id="336$aoTKiWH" role="3wpmZR">
@@ -415,10 +407,10 @@
       <node concept="37mRIm" id="2hB9zGID9bQ" role="37mRID">
         <property role="37mO49" value="2623107343594066592" />
         <node concept="gqqVs" id="2hB9zGID9bP" role="37mO4d">
-          <property role="gqqTZ" value="336.0" />
-          <property role="gqqTW" value="60.0" />
-          <property role="gqqTX" value="144.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="218.00049672851563" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -426,12 +418,12 @@
         <property role="37mO49" value="2623107343594066820" />
         <node concept="2VclpC" id="2hB9zGID9f6" role="37mO4d">
           <node concept="2VclrF" id="336$aoTKiWV" role="2Vcluh">
-            <property role="2Vclpx" value="286.0" />
-            <property role="2Vclpz" value="87.0" />
+            <property role="2Vclpx" value="218.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="2VclrF" id="336$aoTKiWW" role="2Vcluh">
-            <property role="2Vclpx" value="336.0" />
-            <property role="2Vclpz" value="87.0" />
+            <property role="2Vclpx" value="122.00004999999999" />
+            <property role="2Vclpz" value="198.00039672851562" />
           </node>
           <node concept="3ul5H1" id="336$aoTKiWX" role="3ul5Gx">
             <node concept="3wpmZ1" id="336$aoTKiWY" role="3ul5Gz">
@@ -460,10 +452,10 @@
       <node concept="37mRIm" id="336$aoTKiLa" role="37mRID">
         <property role="37mO49" value="3514655602817182745" />
         <node concept="gqqVs" id="336$aoTKiL9" role="37mO4d">
-          <property role="gqqTZ" value="163.0" />
-          <property role="gqqTW" value="-22.99999999999997" />
-          <property role="gqqTX" value="194.0" />
-          <property role="gqqTy" value="60.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="252.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
index 69335c30..3818de32 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
@@ -99,40 +99,40 @@
       <node concept="37mRIm" id="2ojFC2Jbcf8" role="37mRID">
         <property role="37mO49" value="2743728465716757429" />
         <node concept="gqqVs" id="2ojFC2Jbcf6" role="37mO4d">
-          <property role="gqqTZ" value="233.0" />
-          <property role="gqqTW" value="-10.0" />
-          <property role="gqqTX" value="137.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="149.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="196.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2ojFC2JbcfJ" role="37mRID">
         <property role="37mO49" value="2743728465716757466" />
         <node concept="gqqVs" id="2ojFC2JbcfI" role="37mO4d">
-          <property role="gqqTZ" value="249.5" />
-          <property role="gqqTW" value="109.0001" />
-          <property role="gqqTX" value="91.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="166.0" />
+          <property role="gqqTW" value="105.00029836425782" />
+          <property role="gqqTX" value="162.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2ojFC2Jbcgz" role="37mRID">
         <property role="37mO49" value="2743728465716757515" />
         <node concept="gqqVs" id="2ojFC2Jbcgy" role="37mO4d">
-          <property role="gqqTZ" value="324.0" />
-          <property role="gqqTW" value="254.0002983642578" />
-          <property role="gqqTX" value="99.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="24.0" />
+          <property role="gqqTW" value="239.00049672851563" />
+          <property role="gqqTX" value="154.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2ojFC2Jbchh" role="37mRID">
         <property role="37mO49" value="2743728465716757558" />
         <node concept="gqqVs" id="2ojFC2Jbchg" role="37mO4d">
-          <property role="gqqTZ" value="169.0" />
-          <property role="gqqTW" value="254.0002983642578" />
-          <property role="gqqTX" value="83.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="198.0" />
+          <property role="gqqTW" value="239.00049672851563" />
+          <property role="gqqTX" value="116.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -219,10 +219,10 @@
       <node concept="37mRIm" id="2ojFC2Jc9Xa" role="37mRID">
         <property role="37mO49" value="2743728465717010219" />
         <node concept="gqqVs" id="2ojFC2Jc9X9" role="37mO4d">
-          <property role="gqqTZ" value="626.0" />
-          <property role="gqqTW" value="109.0" />
-          <property role="gqqTX" value="184.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="334.0" />
+          <property role="gqqTW" value="239.00049672851563" />
+          <property role="gqqTX" value="282.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -300,30 +300,30 @@
       <node concept="37mRIm" id="75La0fJ$qQc" role="37mRID">
         <property role="37mO49" value="8174358796023473452" />
         <node concept="gqqVs" id="75La0fJ$qQb" role="37mO4d">
-          <property role="gqqTZ" value="459.454188671569" />
-          <property role="gqqTW" value="264.0" />
-          <property role="gqqTX" value="192.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="373.0007103515625" />
+          <property role="gqqTX" value="292.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="75La0fJ_lRE" role="37mRID">
         <property role="37mO49" value="8174358796023717267" />
         <node concept="gqqVs" id="75La0fJ_lRD" role="37mO4d">
-          <property role="gqqTZ" value="669.3089006248368" />
-          <property role="gqqTW" value="261.0" />
-          <property role="gqqTX" value="184.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="324.0" />
+          <property role="gqqTW" value="373.0007103515625" />
+          <property role="gqqTX" value="284.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="75La0fJ_n7i" role="37mRID">
         <property role="37mO49" value="8174358796023722359" />
         <node concept="gqqVs" id="75La0fJ_n7h" role="37mO4d">
-          <property role="gqqTZ" value="860.0" />
-          <property role="gqqTW" value="264.0" />
-          <property role="gqqTX" value="179.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="628.0" />
+          <property role="gqqTW" value="373.0007103515625" />
+          <property role="gqqTX" value="282.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -331,12 +331,12 @@
         <property role="37mO49" value="8174358796023687712" />
         <node concept="2VclpC" id="75La0fJ_nhY" role="37mO4d">
           <node concept="2VclrF" id="75La0fJ_ni0" role="2Vcluh">
-            <property role="2Vclpx" value="667.5386652397209" />
-            <property role="2Vclpz" value="193.4863679352659" />
+            <property role="2Vclpx" value="476.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
           </node>
           <node concept="2VclrF" id="75La0fJ_nsd" role="2Vcluh">
-            <property role="2Vclpx" value="623.6066828570415" />
-            <property role="2Vclpz" value="252.73981443342933" />
+            <property role="2Vclpx" value="159.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
           </node>
         </node>
       </node>
@@ -344,22 +344,22 @@
         <property role="37mO49" value="8174358796023723515" />
         <node concept="2VclpC" id="75La0fJ_np1" role="37mO4d">
           <node concept="2VclrF" id="75La0fJ_np3" role="2Vcluh">
-            <property role="2Vclpx" value="770.492962508431" />
-            <property role="2Vclpz" value="186.58586157547842" />
+            <property role="2Vclpx" value="476.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
           </node>
           <node concept="2VclrF" id="75La0fJ_nr9" role="2Vcluh">
-            <property role="2Vclpx" value="851.7190138282062" />
-            <property role="2Vclpz" value="251.0896760777241" />
+            <property role="2Vclpx" value="770.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="75La0fJ_nDS" role="37mRID">
         <property role="37mO49" value="8174358796023724570" />
         <node concept="gqqVs" id="75La0fJ_nDR" role="37mO4d">
-          <property role="gqqTZ" value="902.5" />
-          <property role="gqqTW" value="387.9765150920164" />
-          <property role="gqqTX" value="94.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="692.0" />
+          <property role="gqqTW" value="487.00092397460935" />
+          <property role="gqqTX" value="154.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -367,12 +367,12 @@
         <property role="37mO49" value="8174358796023732745" />
         <node concept="2VclpC" id="75La0fJ_pEm" role="37mO4d">
           <node concept="2VclrF" id="75La0fJ_pEo" role="2Vcluh">
-            <property role="2Vclpx" value="278.27430242706504" />
-            <property role="2Vclpz" value="198.1779168488618" />
+            <property role="2Vclpx" value="248.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
           <node concept="2VclrF" id="75La0fJ_pG_" role="2Vcluh">
-            <property role="2Vclpx" value="218.0" />
-            <property role="2Vclpz" value="220.0" />
+            <property role="2Vclpx" value="257.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
         </node>
       </node>
@@ -380,15 +380,49 @@
         <property role="37mO49" value="8174358796023732815" />
         <node concept="2VclpC" id="75La0fJ_pHD" role="37mO4d">
           <node concept="2VclrF" id="75La0fJ_pHF" role="2Vcluh">
-            <property role="2Vclpx" value="314.5940721635904" />
-            <property role="2Vclpz" value="197.72696019614878" />
+            <property role="2Vclpx" value="248.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
           <node concept="2VclrF" id="75La0fJ_pJW" role="2Vcluh">
-            <property role="2Vclpx" value="362.0" />
-            <property role="2Vclpz" value="216.0" />
+            <property role="2Vclpx" value="102.00004999999999" />
+            <property role="2Vclpz" value="219.00039672851562" />
+          </node>
+        </node>
+      </node>
+      <node concept="37mRIm" id="2i2e8U23MVa" role="37mRID">
+        <property role="37mO49" value="8174358796023716827" />
+        <node concept="2VclpC" id="2i2e8U23MV9" role="37mO4d">
+          <node concept="2VclrF" id="2i2e8U23MVh" role="2Vcluh">
+            <property role="2Vclpx" value="248.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVi" role="2Vcluh">
+            <property role="2Vclpx" value="476.00005" />
+            <property role="2Vclpz" value="219.00039672851562" />
           </node>
         </node>
       </node>
+      <node concept="37mRIm" id="2i2e8U23MVc" role="37mRID">
+        <property role="37mO49" value="8174358796023721170" />
+        <node concept="2VclpC" id="2i2e8U23MVb" role="37mO4d">
+          <node concept="2VclrF" id="2i2e8U23MVj" role="2Vcluh">
+            <property role="2Vclpx" value="476.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVk" role="2Vcluh">
+            <property role="2Vclpx" value="467.00005" />
+            <property role="2Vclpz" value="353.0006103515625" />
+          </node>
+        </node>
+      </node>
+      <node concept="37mRIm" id="2i2e8U23MVe" role="37mRID">
+        <property role="37mO49" value="8174358796023732397" />
+        <node concept="2VclpC" id="2i2e8U23MVd" role="37mO4d" />
+      </node>
+      <node concept="37mRIm" id="2i2e8U23MVg" role="37mRID">
+        <property role="37mO49" value="8174358796023732537" />
+        <node concept="2VclpC" id="2i2e8U23MVf" role="37mO4d" />
+      </node>
     </node>
     <node concept="29edHe" id="2ojFC2Jbcfq" role="2vn1q5">
       <property role="TrG5h" value="A01" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
index 8bffd4f8..8def22d0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
@@ -113,10 +113,10 @@
       <node concept="37mRIm" id="3jaLROLvr4n" role="37mRID">
         <property role="37mO49" value="3804072175782965478" />
         <node concept="gqqVs" id="3jaLROLvr4l" role="37mO4d">
-          <property role="gqqTZ" value="158.5" />
-          <property role="gqqTW" value="67.59420289855072" />
-          <property role="gqqTX" value="113.0" />
-          <property role="gqqTy" value="79.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="186.0" />
+          <property role="gqqTy" value="105.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -179,10 +179,10 @@
       <node concept="37mRIm" id="WKGDODSTle" role="37mRID">
         <property role="37mO49" value="1094571097533420732" />
         <node concept="gqqVs" id="WKGDODSTld" role="37mO4d">
-          <property role="gqqTZ" value="28.5" />
-          <property role="gqqTW" value="171.0" />
-          <property role="gqqTX" value="379.0" />
-          <property role="gqqTy" value="278.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="270.0006950927734" />
+          <property role="gqqTX" value="482.0" />
+          <property role="gqqTy" value="276.0032000000001" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -207,60 +207,60 @@
       <node concept="37mRIm" id="WKGDODSTIu" role="37mRID">
         <property role="37mO49" value="1094571097533422409" />
         <node concept="gqqVs" id="WKGDODSTIt" role="37mO4d">
-          <property role="gqqTZ" value="52.999999999999986" />
-          <property role="gqqTW" value="474.09420289855075" />
-          <property role="gqqTX" value="117.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="560.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="202.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="WKGDODSTKi" role="37mRID">
         <property role="37mO49" value="1094571097533422495" />
         <node concept="gqqVs" id="WKGDODSTKh" role="37mO4d">
-          <property role="gqqTZ" value="247.5" />
-          <property role="gqqTW" value="474.09420289855075" />
-          <property role="gqqTX" value="132.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="254.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="202.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="WKGDODSTP9" role="37mRID">
         <property role="37mO49" value="1094571097533422830" />
         <node concept="gqqVs" id="WKGDODSTP8" role="37mO4d">
-          <property role="gqqTZ" value="52.999999999999986" />
-          <property role="gqqTW" value="559.5942028985507" />
-          <property role="gqqTX" value="137.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="551.0" />
+          <property role="gqqTW" value="84.00029836425782" />
+          <property role="gqqTX" value="220.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="WKGDODSTRO" role="37mRID">
         <property role="37mO49" value="1094571097533423000" />
         <node concept="gqqVs" id="WKGDODSTRN" role="37mO4d">
-          <property role="gqqTZ" value="225.5" />
-          <property role="gqqTW" value="559.5942028985507" />
-          <property role="gqqTX" value="158.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="218.0" />
+          <property role="gqqTW" value="84.00029836425782" />
+          <property role="gqqTX" value="274.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="WKGDODSTXy" role="37mRID">
         <property role="37mO49" value="1094571097533423361" />
         <node concept="gqqVs" id="WKGDODSTXx" role="37mO4d">
-          <property role="gqqTZ" value="19.999999999999986" />
-          <property role="gqqTW" value="695.0942028985507" />
-          <property role="gqqTX" value="174.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="512.0" />
+          <property role="gqqTW" value="198.00049672851563" />
+          <property role="gqqTX" value="298.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="WKGDODSU3l" role="37mRID">
         <property role="37mO49" value="1094571097533423680" />
         <node concept="gqqVs" id="WKGDODSU3k" role="37mO4d">
-          <property role="gqqTZ" value="229.5" />
-          <property role="gqqTW" value="691.5942028985507" />
-          <property role="gqqTX" value="159.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="230.0" />
+          <property role="gqqTW" value="198.00049672851563" />
+          <property role="gqqTX" value="250.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -370,20 +370,20 @@
           <node concept="37mRIm" id="WKGDODSTji" role="37mRID">
             <property role="37mO49" value="1094571097533420734" />
             <node concept="gqqVs" id="WKGDODSTjj" role="37mO4d">
-              <property role="gqqTZ" value="27.0" />
-              <property role="gqqTW" value="130.0" />
-              <property role="gqqTX" value="117.0" />
-              <property role="gqqTy" value="79.0" />
+              <property role="gqqTZ" value="270.0" />
+              <property role="gqqTW" value="22.000100000000003" />
+              <property role="gqqTX" value="188.0" />
+              <property role="gqqTy" value="105.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="WKGDODSTjk" role="37mRID">
             <property role="37mO49" value="1094571097533420737" />
             <node concept="gqqVs" id="WKGDODSTjl" role="37mO4d">
-              <property role="gqqTZ" value="104.0" />
-              <property role="gqqTW" value="19.0" />
-              <property role="gqqTX" value="155.0" />
-              <property role="gqqTy" value="65.0" />
+              <property role="gqqTZ" value="32.0" />
+              <property role="gqqTW" value="43.0001" />
+              <property role="gqqTX" value="218.0" />
+              <property role="gqqTy" value="84.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
@@ -404,22 +404,30 @@
                 </node>
               </node>
               <node concept="2VclrF" id="WKGDODSTto" role="2Vcluh">
-                <property role="2Vclpx" value="157.88759343953467" />
-                <property role="2Vclpz" value="109.38759343953473" />
+                <property role="2Vclpx" value="142.00005" />
+                <property role="2Vclpz" value="137.0002" />
               </node>
               <node concept="2VclrF" id="3ALtb$im2bK" role="2Vcluh">
-                <property role="2Vclpx" value="123.3875934395347" />
-                <property role="2Vclpz" value="109.38759343953473" />
+                <property role="2Vclpx" value="260.0" />
+                <property role="2Vclpz" value="137.0002" />
+              </node>
+              <node concept="2VclrF" id="2i2e8U23MVx" role="2Vcluh">
+                <property role="2Vclpx" value="260.0" />
+                <property role="2Vclpz" value="12.0" />
+              </node>
+              <node concept="2VclrF" id="2i2e8U23MVy" role="2Vcluh">
+                <property role="2Vclpx" value="365.00005" />
+                <property role="2Vclpz" value="12.0" />
               </node>
             </node>
           </node>
           <node concept="37mRIm" id="WKGDODSTv2" role="37mRID">
             <property role="37mO49" value="1094571097533421504" />
             <node concept="gqqVs" id="WKGDODSTv1" role="37mO4d">
-              <property role="gqqTZ" value="194.0" />
-              <property role="gqqTW" value="130.0" />
-              <property role="gqqTX" value="109.0" />
-              <property role="gqqTy" value="79.0" />
+              <property role="gqqTZ" value="282.0" />
+              <property role="gqqTW" value="147.0003" />
+              <property role="gqqTX" value="164.0" />
+              <property role="gqqTy" value="105.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
@@ -440,12 +448,12 @@
                 </node>
               </node>
               <node concept="2VclrF" id="WKGDODSTAw" role="2Vcluh">
-                <property role="2Vclpx" value="201.62307275267457" />
-                <property role="2Vclpz" value="113.0" />
+                <property role="2Vclpx" value="142.00005" />
+                <property role="2Vclpz" value="137.0002" />
               </node>
               <node concept="2VclrF" id="3ALtb$im2bp" role="2Vcluh">
-                <property role="2Vclpx" value="230.0" />
-                <property role="2Vclpz" value="113.0" />
+                <property role="2Vclpx" value="365.00005" />
+                <property role="2Vclpz" value="137.0002" />
               </node>
             </node>
           </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
index c7301a68..f6bee277 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
@@ -37,6 +37,7 @@
         <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
+        <child id="2319506556913311101" name="anchors" index="2Vcluh" />
         <child id="4767615435799372763" name="labels" index="3ul5Gx" />
       </concept>
       <concept id="2319506556913310727" name="de.itemis.mps.editor.diagram.layout.structure.Point" flags="ng" index="2VclrF">
@@ -97,50 +98,50 @@
       <node concept="37mRIm" id="2czCwT$U5Vm" role="37mRID">
         <property role="37mO49" value="2532045598218542790" />
         <node concept="gqqVs" id="2czCwT$U5Vk" role="37mO4d">
-          <property role="gqqTZ" value="280.5" />
-          <property role="gqqTW" value="16.0" />
-          <property role="gqqTX" value="105.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="341.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="170.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U5VJ" role="37mRID">
         <property role="37mO49" value="2532045598218542807" />
         <node concept="gqqVs" id="2czCwT$U5VI" role="37mO4d">
-          <property role="gqqTZ" value="257.0" />
-          <property role="gqqTW" value="120.0" />
-          <property role="gqqTX" value="152.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="353.0" />
+          <property role="gqqTW" value="105.00029836425782" />
+          <property role="gqqTX" value="146.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U5Wa" role="37mRID">
         <property role="37mO49" value="2532045598218542832" />
         <node concept="gqqVs" id="2czCwT$U5W9" role="37mO4d">
-          <property role="gqqTZ" value="101.0" />
-          <property role="gqqTW" value="243.0" />
-          <property role="gqqTX" value="110.0" />
-          <property role="gqqTy" value="75.0" />
+          <property role="gqqTZ" value="69.0" />
+          <property role="gqqTW" value="218.00049672851563" />
+          <property role="gqqTX" value="178.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U5WE" role="37mRID">
         <property role="37mO49" value="2532045598218542859" />
         <node concept="gqqVs" id="2czCwT$U5WD" role="37mO4d">
-          <property role="gqqTZ" value="286.5" />
-          <property role="gqqTW" value="245.0" />
-          <property role="gqqTX" value="99.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="361.0" />
+          <property role="gqqTW" value="228.5004967285156" />
+          <property role="gqqTX" value="130.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U5XJ" role="37mRID">
         <property role="37mO49" value="2532045598218542932" />
         <node concept="gqqVs" id="2czCwT$U5XI" role="37mO4d">
-          <property role="gqqTZ" value="60.0" />
-          <property role="gqqTW" value="360.0" />
-          <property role="gqqTX" value="214.0" />
-          <property role="gqqTy" value="75.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="332.0007103515625" />
+          <property role="gqqTX" value="292.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -178,6 +179,14 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U23MVt" role="2Vcluh">
+            <property role="2Vclpx" value="427.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVu" role="2Vcluh">
+            <property role="2Vclpx" value="159.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U60t" role="37mRID">
@@ -219,10 +228,10 @@
       <node concept="37mRIm" id="2czCwT$U65H" role="37mRID">
         <property role="37mO49" value="2532045598218543412" />
         <node concept="gqqVs" id="2czCwT$U65G" role="37mO4d">
-          <property role="gqqTZ" value="286.5" />
-          <property role="gqqTW" value="374.0" />
-          <property role="gqqTX" value="155.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="324.0" />
+          <property role="gqqTW" value="332.0007103515625" />
+          <property role="gqqTX" value="204.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -247,10 +256,10 @@
       <node concept="37mRIm" id="2czCwT$U69W" role="37mRID">
         <property role="37mO49" value="2532045598218543705" />
         <node concept="gqqVs" id="2czCwT$U69V" role="37mO4d">
-          <property role="gqqTZ" value="446.0" />
-          <property role="gqqTW" value="252.0" />
-          <property role="gqqTX" value="94.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="573.0" />
+          <property role="gqqTW" value="228.5004967285156" />
+          <property role="gqqTX" value="130.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -270,15 +279,23 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U23MVv" role="2Vcluh">
+            <property role="2Vclpx" value="427.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVw" role="2Vcluh">
+            <property role="2Vclpx" value="639.00005" />
+            <property role="2Vclpz" value="198.00039672851562" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="2czCwT$U6dZ" role="37mRID">
         <property role="37mO49" value="2532045598218543961" />
         <node concept="gqqVs" id="2czCwT$U6dY" role="37mO4d">
-          <property role="gqqTZ" value="446.0" />
-          <property role="gqqTW" value="374.0" />
-          <property role="gqqTX" value="145.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTZ" value="548.0" />
+          <property role="gqqTW" value="332.0007103515625" />
+          <property role="gqqTX" value="180.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
index 75802ae8..17829495 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
@@ -98,20 +98,20 @@
       <node concept="37mRIm" id="1TD_kqsR938" role="37mRID">
         <property role="37mO49" value="2191446824204406910" />
         <node concept="gqqVs" id="1TD_kqsR937" role="37mO4d">
-          <property role="gqqTZ" value="199.0" />
-          <property role="gqqTW" value="32.0" />
-          <property role="gqqTX" value="105.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="85.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="186.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1TD_kqsR981" role="37mRID">
         <property role="37mO49" value="2191446824204407167" />
         <node concept="gqqVs" id="1TD_kqsR980" role="37mO4d">
-          <property role="gqqTZ" value="150.0" />
-          <property role="gqqTW" value="178.0" />
-          <property role="gqqTX" value="214.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="105.00029836425782" />
+          <property role="gqqTX" value="332.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
index ed0161b8..f9f26173 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
@@ -139,10 +139,10 @@
       <node concept="37mRIm" id="3I9hGreIU3D" role="37mRID">
         <property role="37mO49" value="4290037939732979875" />
         <node concept="gqqVs" id="3I9hGreIU3C" role="37mO4d">
-          <property role="gqqTZ" value="263.0" />
-          <property role="gqqTW" value="20.000100000000003" />
-          <property role="gqqTX" value="122.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="84.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="220.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -177,10 +177,10 @@
       <node concept="37mRIm" id="3I9hGreIU9h" role="37mRID">
         <property role="37mO49" value="4290037939732980237" />
         <node concept="gqqVs" id="3I9hGreIU9g" role="37mO4d">
-          <property role="gqqTZ" value="211.0" />
-          <property role="gqqTW" value="172.0" />
-          <property role="gqqTX" value="226.0" />
-          <property role="gqqTy" value="114.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="126.00029836425782" />
+          <property role="gqqTX" value="364.0" />
+          <property role="gqqTy" value="157.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
index 2ddc3d43..d229884f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
@@ -702,100 +702,100 @@
       <node concept="37mRIm" id="1$lk9M6601a" role="37mRID">
         <property role="37mO49" value="1807439458653961897" />
         <node concept="gqqVs" id="1$lk9M66019" role="37mO4d">
-          <property role="gqqTZ" value="271.0" />
-          <property role="gqqTW" value="50.0" />
-          <property role="gqqTX" value="136.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="128.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="234.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601c" role="37mRID">
         <property role="37mO49" value="1807439458653961899" />
         <node concept="gqqVs" id="1$lk9M6601b" role="37mO4d">
-          <property role="gqqTZ" value="242.0" />
-          <property role="gqqTW" value="136.0" />
-          <property role="gqqTX" value="194.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="400.0" />
+          <property role="gqqTW" value="125.00029836425782" />
+          <property role="gqqTX" value="322.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601e" role="37mRID">
         <property role="37mO49" value="1807439458653961901" />
         <node concept="gqqVs" id="1$lk9M6601d" role="37mO4d">
-          <property role="gqqTZ" value="320.0" />
-          <property role="gqqTW" value="222.0" />
-          <property role="gqqTX" value="169.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="524.0" />
+          <property role="gqqTW" value="238.00049672851563" />
+          <property role="gqqTX" value="262.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601g" role="37mRID">
         <property role="37mO49" value="1807439458653961903" />
         <node concept="gqqVs" id="1$lk9M6601f" role="37mO4d">
-          <property role="gqqTZ" value="505.0" />
-          <property role="gqqTW" value="222.0" />
-          <property role="gqqTX" value="182.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="806.0" />
+          <property role="gqqTW" value="259.0004967285156" />
+          <property role="gqqTX" value="262.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601i" role="37mRID">
         <property role="37mO49" value="1807439458653961905" />
         <node concept="gqqVs" id="1$lk9M6601h" role="37mO4d">
-          <property role="gqqTZ" value="130.0" />
-          <property role="gqqTW" value="50.0" />
-          <property role="gqqTX" value="91.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="125.00029836425782" />
+          <property role="gqqTX" value="130.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601k" role="37mRID">
         <property role="37mO49" value="1807439458653961907" />
         <node concept="gqqVs" id="1$lk9M6601j" role="37mO4d">
-          <property role="gqqTZ" value="486.0" />
-          <property role="gqqTW" value="136.0" />
-          <property role="gqqTX" value="152.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="88.0" />
+          <property role="gqqTW" value="238.00049672851563" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601m" role="37mRID">
         <property role="37mO49" value="1807439458653961909" />
         <node concept="gqqVs" id="1$lk9M6601l" role="37mO4d">
-          <property role="gqqTZ" value="549.0" />
-          <property role="gqqTW" value="308.0" />
-          <property role="gqqTX" value="135.0" />
-          <property role="gqqTy" value="42.0" />
+          <property role="gqqTZ" value="836.0" />
+          <property role="gqqTW" value="373.0007103515625" />
+          <property role="gqqTX" value="202.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601o" role="37mRID">
         <property role="37mO49" value="1807439458653961911" />
         <node concept="gqqVs" id="1$lk9M6601n" role="37mO4d">
-          <property role="gqqTZ" value="457.0" />
-          <property role="gqqTW" value="50.0" />
-          <property role="gqqTX" value="144.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="162.0" />
+          <property role="gqqTW" value="125.00029836425782" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601q" role="37mRID">
         <property role="37mO49" value="1807439458653961913" />
         <node concept="gqqVs" id="1$lk9M6601p" role="37mO4d">
-          <property role="gqqTZ" value="171.0" />
-          <property role="gqqTW" value="222.0" />
-          <property role="gqqTX" value="108.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTZ" value="326.0" />
+          <property role="gqqTW" value="238.00049672851563" />
+          <property role="gqqTX" value="178.0" />
+          <property role="gqqTy" value="115.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M6601s" role="37mRID">
         <property role="37mO49" value="1807439458653961914" />
         <node concept="gqqVs" id="1$lk9M6601r" role="37mO4d">
-          <property role="gqqTZ" value="154.0" />
-          <property role="gqqTW" value="336.0" />
-          <property role="gqqTX" value="142.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="306.0" />
+          <property role="gqqTW" value="373.0007103515625" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -803,12 +803,12 @@
         <property role="37mO49" value="1807439458653961902" />
         <node concept="2VclpC" id="1$lk9M6601t" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66iho" role="2Vcluh">
-            <property role="2Vclpx" value="339.0" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="562.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihp" role="2Vcluh">
-            <property role="2Vclpx" value="402.1268564083465" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="656.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihq" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihr" role="3ul5Gz">
@@ -828,12 +828,12 @@
         <property role="37mO49" value="1807439458653961906" />
         <node concept="2VclpC" id="1$lk9M6601x" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ii2" role="2Vcluh">
-            <property role="2Vclpx" value="271" />
-            <property role="2Vclpz" value="78" />
+            <property role="2Vclpx" value="246.00005" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ii3" role="2Vcluh">
-            <property role="2Vclpx" value="221" />
-            <property role="2Vclpz" value="78" />
+            <property role="2Vclpx" value="78.00004999999999" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ii4" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ii5" role="3ul5Gz">
@@ -853,12 +853,12 @@
         <property role="37mO49" value="1807439458653961908" />
         <node concept="2VclpC" id="1$lk9M6601_" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ii8" role="2Vcluh">
-            <property role="2Vclpx" value="436" />
-            <property role="2Vclpz" value="164" />
+            <property role="2Vclpx" value="562.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ii9" role="2Vcluh">
-            <property role="2Vclpx" value="486" />
-            <property role="2Vclpz" value="164" />
+            <property role="2Vclpx" value="198.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66iia" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66iib" role="3ul5Gz">
@@ -878,12 +878,12 @@
         <property role="37mO49" value="1807439458653961912" />
         <node concept="2VclpC" id="1$lk9M6601D" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66iie" role="2Vcluh">
-            <property role="2Vclpx" value="407" />
-            <property role="2Vclpz" value="78" />
+            <property role="2Vclpx" value="246.00005" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="2VclrF" id="1$lk9M66iif" role="2Vcluh">
-            <property role="2Vclpx" value="457" />
-            <property role="2Vclpz" value="78" />
+            <property role="2Vclpx" value="272.00005" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66iig" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66iih" role="3ul5Gz">
@@ -902,20 +902,20 @@
       <node concept="37mRIm" id="1$lk9M6608G" role="37mRID">
         <property role="37mO49" value="1807439458653962740" />
         <node concept="gqqVs" id="1$lk9M6608F" role="37mO4d">
-          <property role="gqqTZ" value="44.0" />
-          <property role="gqqTW" value="446.0" />
-          <property role="gqqTX" value="171.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="425.0" />
+          <property role="gqqTW" value="507.00092397460935" />
+          <property role="gqqTX" value="250.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1$lk9M660cO" role="37mRID">
         <property role="37mO49" value="1807439458653962797" />
         <node concept="gqqVs" id="1$lk9M660cN" role="37mO4d">
-          <property role="gqqTZ" value="235.0" />
-          <property role="gqqTW" value="446.0" />
-          <property role="gqqTX" value="171.0" />
-          <property role="gqqTy" value="56.0" />
+          <property role="gqqTZ" value="155.0" />
+          <property role="gqqTW" value="507.00092397460935" />
+          <property role="gqqTX" value="250.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -923,12 +923,12 @@
         <property role="37mO49" value="1807439458653961900" />
         <node concept="2VclpC" id="1$lk9M660i2" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ihi" role="2Vcluh">
-            <property role="2Vclpx" value="339" />
-            <property role="2Vclpz" value="121" />
+            <property role="2Vclpx" value="246.00005" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihj" role="2Vcluh">
-            <property role="2Vclpx" value="339" />
-            <property role="2Vclpz" value="121" />
+            <property role="2Vclpx" value="562.00005" />
+            <property role="2Vclpz" value="105.00019836425781" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihk" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihl" role="3ul5Gz">
@@ -948,12 +948,12 @@
         <property role="37mO49" value="1807439458653961904" />
         <node concept="2VclpC" id="1$lk9M660ig" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ihu" role="2Vcluh">
-            <property role="2Vclpx" value="339.0" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="562.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihv" role="2Vcluh">
-            <property role="2Vclpx" value="570.0541062175697" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="938.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihw" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihx" role="3ul5Gz">
@@ -972,14 +972,6 @@
       <node concept="37mRIm" id="1$lk9M660in" role="37mRID">
         <property role="37mO49" value="1807439458653961910" />
         <node concept="2VclpC" id="1$lk9M660io" role="37mO4d">
-          <node concept="2VclrF" id="1$lk9M66ih$" role="2Vcluh">
-            <property role="2Vclpx" value="616.0" />
-            <property role="2Vclpz" value="293.0" />
-          </node>
-          <node concept="2VclrF" id="1$lk9M66ih_" role="2Vcluh">
-            <property role="2Vclpx" value="616.0" />
-            <property role="2Vclpz" value="293.0" />
-          </node>
           <node concept="3ul5H1" id="1$lk9M66ihA" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihB" role="3ul5Gz">
               <node concept="2VclrF" id="1$lk9M66ihC" role="3wpmZR">
@@ -998,12 +990,12 @@
         <property role="37mO49" value="1807439458653962643" />
         <node concept="2VclpC" id="1$lk9M660iw" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ihE" role="2Vcluh">
-            <property role="2Vclpx" value="339.0" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="562.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihF" role="2Vcluh">
-            <property role="2Vclpx" value="220.8941153032585" />
-            <property role="2Vclpz" value="207.0" />
+            <property role="2Vclpx" value="416.00005" />
+            <property role="2Vclpz" value="218.00039672851562" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihG" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihH" role="3ul5Gz">
@@ -1022,14 +1014,6 @@
       <node concept="37mRIm" id="1$lk9M660iB" role="37mRID">
         <property role="37mO49" value="1807439458653962691" />
         <node concept="2VclpC" id="1$lk9M660iC" role="37mO4d">
-          <node concept="2VclrF" id="1$lk9M66ihK" role="2Vcluh">
-            <property role="2Vclpx" value="225.0" />
-            <property role="2Vclpz" value="321.0" />
-          </node>
-          <node concept="2VclrF" id="1$lk9M66ihL" role="2Vcluh">
-            <property role="2Vclpx" value="225.0" />
-            <property role="2Vclpz" value="321.0" />
-          </node>
           <node concept="3ul5H1" id="1$lk9M66ihM" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihN" role="3ul5Gz">
               <node concept="2VclrF" id="1$lk9M66ihO" role="3wpmZR">
@@ -1048,12 +1032,12 @@
         <property role="37mO49" value="1807439458653963319" />
         <node concept="2VclpC" id="1$lk9M660iK" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ihQ" role="2Vcluh">
-            <property role="2Vclpx" value="225.0" />
-            <property role="2Vclpz" value="421.0" />
+            <property role="2Vclpx" value="416.00005" />
+            <property role="2Vclpz" value="487.0008239746094" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihR" role="2Vcluh">
-            <property role="2Vclpx" value="129.0" />
-            <property role="2Vclpz" value="421.0" />
+            <property role="2Vclpx" value="551.00005" />
+            <property role="2Vclpz" value="487.0008239746094" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihS" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihT" role="3ul5Gz">
@@ -1073,12 +1057,12 @@
         <property role="37mO49" value="1807439458653963343" />
         <node concept="2VclpC" id="1$lk9M660iS" role="37mO4d">
           <node concept="2VclrF" id="1$lk9M66ihW" role="2Vcluh">
-            <property role="2Vclpx" value="225.0" />
-            <property role="2Vclpz" value="421.0" />
+            <property role="2Vclpx" value="416.00005" />
+            <property role="2Vclpz" value="487.0008239746094" />
           </node>
           <node concept="2VclrF" id="1$lk9M66ihX" role="2Vcluh">
-            <property role="2Vclpx" value="320.0" />
-            <property role="2Vclpz" value="421.0" />
+            <property role="2Vclpx" value="281.00005" />
+            <property role="2Vclpz" value="487.0008239746094" />
           </node>
           <node concept="3ul5H1" id="1$lk9M66ihY" role="3ul5Gx">
             <node concept="3wpmZ1" id="1$lk9M66ihZ" role="3ul5Gz">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr
index b7124492..c3239977 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr	
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr	
@@ -80,20 +80,20 @@
       <node concept="37mRIm" id="x1FXqIk$i" role="37mRID">
         <property role="37mO49" value="9296093162063940" />
         <node concept="gqqVs" id="x1FXqIk$g" role="37mO4d">
-          <property role="gqqTZ" value="11.0" />
-          <property role="gqqTW" value="25.0" />
-          <property role="gqqTX" value="148.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="244.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="x1FXqIuPI" role="37mRID">
         <property role="37mO49" value="9296093162106145" />
         <node concept="gqqVs" id="x1FXqIuPH" role="37mO4d">
-          <property role="gqqTZ" value="11.0" />
-          <property role="gqqTW" value="150.0" />
-          <property role="gqqTX" value="288.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="126.00029836425782" />
+          <property role="gqqTX" value="456.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
index 0c83aad2..7f5291a4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
@@ -3846,10 +3846,10 @@
       <node concept="37mRIm" id="2iCnExZHY5R" role="37mRID">
         <property role="37mO49" value="2641465259243069637" />
         <node concept="gqqVs" id="2iCnExZHY5Q" role="37mO4d">
-          <property role="gqqTZ" value="349.0" />
-          <property role="gqqTW" value="378.0007103515625" />
-          <property role="gqqTX" value="267.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="801.5" />
+          <property role="gqqTW" value="353.0007103515625" />
+          <property role="gqqTX" value="398.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3914,10 +3914,10 @@
       <node concept="37mRIm" id="2iCnExZHZsC" role="37mRID">
         <property role="37mO49" value="2641465259243075250" />
         <node concept="gqqVs" id="2iCnExZHZsB" role="37mO4d">
-          <property role="gqqTZ" value="381.5" />
-          <property role="gqqTW" value="518.0009239746093" />
-          <property role="gqqTX" value="202.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="1010.5" />
+          <property role="gqqTW" value="487.00092397460935" />
+          <property role="gqqTX" value="252.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3937,6 +3937,14 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U23MVp" role="2Vcluh">
+            <property role="2Vclpx" value="1001.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVq" role="2Vcluh">
+            <property role="2Vclpx" value="1137.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3O4VKknI_4F" role="37mRID">
@@ -3952,10 +3960,10 @@
       <node concept="37mRIm" id="3O4VKknI_ur" role="37mRID">
         <property role="37mO49" value="4396901941372409612" />
         <node concept="gqqVs" id="3O4VKknI_uq" role="37mO4d">
-          <property role="gqqTZ" value="161.5" />
-          <property role="gqqTW" value="518.0009239746093" />
-          <property role="gqqTX" value="202.0" />
-          <property role="gqqTy" value="41.0" />
+          <property role="gqqTZ" value="738.5" />
+          <property role="gqqTW" value="487.00092397460935" />
+          <property role="gqqTX" value="252.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3976,22 +3984,22 @@
             </node>
           </node>
           <node concept="2VclrF" id="4y8PK53YkI1" role="2Vcluh">
-            <property role="2Vclpx" value="482.50005" />
-            <property role="2Vclpz" value="465.0008239746094" />
+            <property role="2Vclpx" value="1001.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
           </node>
           <node concept="2VclrF" id="4y8PK53YkI2" role="2Vcluh">
-            <property role="2Vclpx" value="262.50005" />
-            <property role="2Vclpz" value="465.0008239746094" />
+            <property role="2Vclpx" value="865.50005" />
+            <property role="2Vclpz" value="467.0008239746094" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="6yFQEkQTDyd" role="37mRID">
         <property role="37mO49" value="7542362404087568401" />
         <node concept="gqqVs" id="6yFQEkQTDyc" role="37mO4d">
-          <property role="gqqTZ" value="370.5" />
+          <property role="gqqTZ" value="425.25" />
           <property role="gqqTW" value="12.000100000000003" />
-          <property role="gqqTX" value="224.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTX" value="418.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4016,10 +4024,10 @@
       <node concept="37mRIm" id="1Y8zh0mgcWX" role="37mRID">
         <property role="37mO49" value="2272221112240754345" />
         <node concept="gqqVs" id="1Y8zh0mgcWW" role="37mO4d">
-          <property role="gqqTZ" value="401.0" />
-          <property role="gqqTW" value="272.0004967285156" />
-          <property role="gqqTX" value="163.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="899.0" />
+          <property role="gqqTW" value="260.0004967285156" />
+          <property role="gqqTX" value="203.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4036,30 +4044,30 @@
       <node concept="37mRIm" id="1Y8zh0mgcX1" role="37mRID">
         <property role="37mO49" value="2272221112240754358" />
         <node concept="gqqVs" id="1Y8zh0mgcX0" role="37mO4d">
-          <property role="gqqTZ" value="582.0" />
-          <property role="gqqTW" value="272.0004967285156" />
-          <property role="gqqTX" value="197.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="260.0004967285156" />
+          <property role="gqqTX" value="326.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1Y8zh0mgcX3" role="37mRID">
         <property role="37mO49" value="2272221112240754364" />
         <node concept="gqqVs" id="1Y8zh0mgcX2" role="37mO4d">
-          <property role="gqqTZ" value="12.0" />
-          <property role="gqqTW" value="272.0004967285156" />
-          <property role="gqqTX" value="164.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="358.0" />
+          <property role="gqqTW" value="260.0004967285156" />
+          <property role="gqqTX" value="282.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1Y8zh0mgcX5" role="37mRID">
         <property role="37mO49" value="2272221112240754340" />
         <node concept="gqqVs" id="1Y8zh0mgcX4" role="37mO4d">
-          <property role="gqqTZ" value="363.0" />
-          <property role="gqqTW" value="132.00029836425782" />
-          <property role="gqqTX" value="239.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="475.25" />
+          <property role="gqqTW" value="126.00029836425782" />
+          <property role="gqqTX" value="318.0" />
+          <property role="gqqTy" value="94.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4079,6 +4087,14 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="2i2e8U23MVr" role="2Vcluh">
+            <property role="2Vclpx" value="635.25005" />
+            <property role="2Vclpz" value="240.00039672851562" />
+          </node>
+          <node concept="2VclrF" id="2i2e8U23MVs" role="2Vcluh">
+            <property role="2Vclpx" value="1001.50005" />
+            <property role="2Vclpz" value="240.00039672851562" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="1Y8zh0mgcXd" role="37mRID">
@@ -4116,12 +4132,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="1Y8zh0mglHY" role="2Vcluh">
-            <property role="2Vclpx" value="482.50005" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="635.25005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
           <node concept="2VclrF" id="1Y8zh0mglJ6" role="2Vcluh">
-            <property role="2Vclpx" value="680.50005" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="176.00005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
         </node>
       </node>
@@ -4142,12 +4158,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="1rijVap8tIO" role="2Vcluh">
-            <property role="2Vclpx" value="482.50005" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="635.25005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
           <node concept="2VclrF" id="4y8PK53YkI3" role="2Vcluh">
-            <property role="2Vclpx" value="94.00004999999999" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="500.00005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
         </node>
       </node>
@@ -4190,10 +4206,10 @@
       <node concept="37mRIm" id="55oVyA0rn5e" role="37mRID">
         <property role="37mO49" value="5861696777038426332" />
         <node concept="gqqVs" id="55oVyA0rn5d" role="37mO4d">
-          <property role="gqqTZ" value="194.0" />
-          <property role="gqqTW" value="272.0004967285156" />
-          <property role="gqqTX" value="189.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="660.0" />
+          <property role="gqqTW" value="260.0004967285156" />
+          <property role="gqqTX" value="219.0" />
+          <property role="gqqTy" value="73.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4214,12 +4230,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="55oVyA0rnLm" role="2Vcluh">
-            <property role="2Vclpx" value="482.50005" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="635.25005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
           <node concept="2VclrF" id="55oVyA0rnMt" role="2Vcluh">
-            <property role="2Vclpx" value="288.50005" />
-            <property role="2Vclpz" value="219.00039672851562" />
+            <property role="2Vclpx" value="770.50005" />
+            <property role="2Vclpz" value="240.00039672851562" />
           </node>
         </node>
       </node>
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 79f9fbb3..8b269d88 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
@@ -30,6 +30,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/tutorial/.mps/migration.xml b/code/tutorial/.mps/migration.xml
index a2e96ad5..475d1f0b 100644
--- a/code/tutorial/.mps/migration.xml
+++ b/code/tutorial/.mps/migration.xml
@@ -12,6 +12,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="241" />
   </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 04d1181e..bf10e83f 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
@@ -15,6 +15,7 @@
     <dependency reexport="false">2dd5dace-06d5-4283-a878-7272f2df6d4b(com.mbeddr.formal.nusmv.operatorspanel)</dependency>
   </dependencies>
   <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" />
     <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/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 e49d0f8a..db060a00 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
@@ -150,7 +150,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 a786edc1..2d18becb 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
@@ -140,7 +140,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 b948f885..bd5e7c2e 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
@@ -108,7 +108,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 5cb595fa..92a54b5d 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
@@ -139,7 +139,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
         <child id="2319506556913311101" name="anchors" index="2Vcluh" />
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 7b187356..13802276 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
@@ -218,7 +218,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 079d73aa..05b276fc 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
@@ -167,7 +167,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
         <child id="2319506556913311101" name="anchors" index="2Vcluh" />
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 9a1f3acf..781305e8 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
@@ -52,7 +52,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
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 dcdc1448..526930b0 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
@@ -87,7 +87,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
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 9dd87d61..dab21862 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
@@ -132,7 +132,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 600d34a9..f2913040 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
@@ -96,7 +96,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 14d79243..7679889a 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
@@ -203,7 +203,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
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 801ff9ea..4dc9529f 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
@@ -147,7 +147,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
         <child id="2319506556913311101" name="anchors" index="2Vcluh" />
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 db567121..8014ab66 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
@@ -18,7 +18,7 @@
     <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="4" />
     <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
     <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="1" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
@@ -29,9 +29,11 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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" />
     <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" />
   </languageVersions>
   <dependencyVersions>
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 7c8adffb..d8a577b4 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
@@ -17,7 +17,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
@@ -92,7 +92,7 @@
       <concept id="6955693250238922838" name="com.mbeddr.doc.structure.ModelContentRefWord" flags="ng" index="3z_lpY">
         <child id="6955693250238922839" name="modelContentPtr" index="3z_lpZ" />
       </concept>
-      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NullRenderer" flags="ng" index="1_05Lf" />
+      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NoOutputRenderer" flags="ng" index="1_05Lf" />
       <concept id="3350625596580256366" name="com.mbeddr.doc.structure.DocumentExport" flags="ng" index="1_08Dk">
         <property id="126932837435324910" name="title" index="WqcPg" />
       </concept>
diff --git a/gradle.lockfile b/gradle.lockfile
index 35dcca6c..1d1e9613 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -7,16 +7,16 @@ com.fasterxml.jackson.core:jackson-databind:2.13.5=modelcheckBackend
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5=modelcheckBackend
 com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend
 com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend
-com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin
-com.jetbrains:mps:2023.2.1=mps
-com.mbeddr:platform:2023.2.24906.0fb1edb=languageLibs
+com.jetbrains.jdk:jbr_jcef:17.0.11-b1207.30=jbrLinux,jbrMac,jbrWin
+com.jetbrains:mps:2024.1.1=mps
+com.mbeddr:platform:2024.1.24974.4be9b18=languageLibs
 com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-de.itemis.mps.build-backends:execute-generators:1.15.1.98.8f853d3=generateBackend
-de.itemis.mps.build-backends:execute:1.15.1.98.8f853d3=executeBackend
-de.itemis.mps.build-backends:modelcheck:1.15.1.98.8f853d3=modelcheckBackend
-de.itemis.mps.build-backends:project-loader:2.3.0.98.8f853d3=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-de.itemis.mps.build-backends:remigrate:0.0.4.98.8f853d3=remigrateBackend
+de.itemis.mps.build-backends:execute-generators:1.18.0.112.164de65=generateBackend
+de.itemis.mps.build-backends:execute:1.18.0.112.164de65=executeBackend
+de.itemis.mps.build-backends:modelcheck:1.18.0.112.164de65=modelcheckBackend
+de.itemis.mps.build-backends:project-loader:2.3.1.112.164de65=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
+de.itemis.mps.build-backends:remigrate:0.0.5.112.164de65=remigrateBackend
 junit:junit:4.12=antLib
 org.apache.ant:ant-junit:1.10.6=antLib
 org.apache.ant:ant-launcher:1.10.6=antLib
@@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend
 org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-org.mpsqa:all-in-one:2023.2.752.8c191d0=languageLibs
+org.mpsqa:all-in-one:2024.1.832.579f392=languageLibs
 empty=