diff --git a/.gitignore b/.gitignore
index 9aadc1a3d..3c28ab78b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ code/model-api/org.modelix.model.api/lib
 code/dependencies.txt
 .idea/
 *.iml
+
+TEST*.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d7051324..cb9953532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). 
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## April 2024
+
+### Fixed
+
+- com.mbeddr.mpsutil.projectview: Class reloading of project views now works.
+- com.mbeddr.mpsutil.editor.querylist: Query lists now support model checking for non-dynamically generated nodes and `collapse by default` is generated correctly.
+- com.mbeddr.mpsutil.editor.querylist: The element's concept is not automatically forced anymore but is now rather a suggestion.
+- de.slisson.mps.reflection: To fix the compilatation issues, the language is now generated earlier in the generation plan.
+- de.slisson.mps.richtext: The duplicate action that overwrites the MPS action was added back and now duplicating lines should work again.
+
+### Added
+
+- com.mbeddr.mpsutil.editor.querylist: the `insert new` and `delete element` blocks now have an `editorContext` parameter.
+
 ## March 2024
 
 ### Added
@@ -16,12 +30,17 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - de.slisson.mps.richtext: Various small issues were fixed (e.g. NullPointerExceptions, usability problems).
 - de.slisson.mps.editor.multiline: Selections are now correctly painted.
+- com.mbeddr.mpsutil.editor.querylist: return null in the query shows the empty cell again (regression).
 
 ### Changed
 
 - de.slisson.mps.richtext: Words are automatically insert as the default concept for IWord.
 - de.slisson.mps.richtext: The faulty duplicate line action was removed.
 
+### Removed
+
+- com.mbeddr.mpsutil.projectview: The broken parameter `project` from the `Is Default` condition was removed. Use the variable `mpsProject` instead. 
+
 ## February 2024
 
 ### Added
@@ -54,28 +73,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - com.mbeddr.mpsutil.modellisteners: The newly supported interface listeners are now backward compatible and doesn't require regenerating the listener aspects anymore.
 
-### Changed
-
-- de.itemis.editor.diagram: The ELK dependencies were updated to the latest version.
-- de.itemis.mps.debug: The editor debug expressions were moved to a new plugin to avoid introducing a dependency to the MPS console in the celllayout language.
-
 ## December 2023
 
-### Fixed
-
-- de.itemis.editor.diagram: Further improvements to make the auto-layouter more stable.
-- de.itemis.editor.diagram: Tooltips for edge and vertex buttons work again.
-- de.itemis.editor.diagram: The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
-- The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
-
 ### Added
 
 - A new language `de.itemis.mps.statistics` was added that adds a new menu `MPS Statistics` to the `Tools`  menu. The containing action writes a file `dependencies.txt` to the root folder. It contains all the used dependencies of the current project. 
 - de.slisson.mps.tables: tables now support a new property `column UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new column above/below the current column or to delete the current column. These actions only work for simple tables that are based on rows (default: *false*).
-- de.slisson.mps.richtext: The shortcuts are now documented.
-- A new action `Copy Cell Reference` is available in the editor menu in `Language Debug` that creates a reference to the current select editor cell. It can be pasted into the MPS console to debug editor cells. It can be activated through ctrl/cmd+alt+c.
-- A new action `Copy Editor Component Reference` is available in the editor menu in `Language Debug` that creates a reference to the current editor component. It can be pasted into the MPS console to debug editor cells. To refer to the current opened editor component, use the expression `#currentEditorComponent` in the MPS console.
-- de.itemis.mps.editor.pagination: The ability to search was added.
 
 ### Fixed
 
@@ -83,16 +86,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ### Changed
 
-- de.slisson.mps.richtext: The code completion entries of word cells are now clearer and unnecessary entries were removed.
 - mpsutil.intentions: Intentions available in read-only cells are not available anymore when the annotation showIntentionInReadyOnlyCell is not added.
-- de.itemis.mps.editor.pagination: The UI was cleaned up.
 
 ## November 2023
 
-### Fixed
-
-- app.jar from the platform lib folder is not exported to platform_lib_app/app.jar anymore.
-
 ### Changed
 
 - mpsutil.modellisteners: listeners on interface concepts are now supported.
@@ -104,7 +101,6 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells. Single intentions can also be enabled or disabled in those cells through the intention "Toggle Show Intention In Read-Only Cell Annotation".
 - com.mbeddr.mpsutil.editor.querylist: Default editor cells now support style attributes.
 - de.slisson.mps.tables: tables now support a new property `row UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new row above/below the current row or to delete the current row. These actions only work for simple tables that are based on rows (default: *false*).
-- de.itemis.mps.editor.pagination: The page number can now be entered directly.
 
 ## October 2023
 
diff --git a/build.gradle b/build.gradle
index 47d4e0537..8f84f3cb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,14 @@
 plugins {
-    id 'de.itemis.mps.gradle.common' version '1.13.+'
+    id 'de.itemis.mps.gradle.common' version '1.24.0.+'
     id "com.github.breadmoirai.github-release" version "2.4.1"
     id 'maven-publish'
     id 'base'
+    id 'de.itemis.mps.gradle.launcher' version '2.3.0.+'
 }
 
 import de.itemis.mps.gradle.*
+import de.itemis.mps.gradle.tasks.MpsMigrate
+import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
 import groovy.xml.XmlSlurper
 
 import java.time.LocalDateTime
@@ -56,13 +59,14 @@ if (ciBuild) {
     if (branch.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) {
         version = "$buildMajor.$buildMinor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
     } else {
-        version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber)
+        def isSnapshot = !(branch.equals("master"))
+        version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
     }
 
     println "##teamcity[buildNumber '${version}']"
 } else {
-    println "Local build detected, version will be SNAPSHOT"
     version = ext.mpsMajor + appendOpt(ext.mpsMinor , '.') + "-SNAPSHOT"
+    println "Local build detected, version will be $version"
 }
 
 def userHome = System.properties['user.home']
@@ -500,3 +504,71 @@ githubRelease {
 tasks.named('githubRelease').configure {
     dependsOn packageExtensions
 }
+
+configurations {
+    rerunMigrationsBackend
+}
+
+dependencies {
+    rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.3.+")
+}
+
+def usedPluginRoots = [
+        new File(mpsHomeDir, 'plugins/mps-build'),
+        new File(mpsHomeDir, 'plugins/mps-console'),
+        new File(mpsHomeDir, 'plugins/mps-tooltips'),
+        new File(mpsHomeDir, 'plugins/mps-vcs'),
+        new File(mpsHomeDir, 'plugins/mps-git4idea'),
+]
+
+tasks.register('migrate', MpsMigrate) {
+    dependsOn(resolveMps, 'downloadJbr', 'build_languages', 'build_tests')
+    javaExecutable = layout.file(
+            tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable })
+
+    haltOnPrecheckFailure = true
+    haltOnDependencyError = true
+
+    mpsHome = mpsHomeDir
+
+    projectDirectories.from('code')
+
+    pluginRoots.from(usedPluginRoots)
+
+    maxHeapSize = '4G'
+}
+
+
+tasks.register('rerunMigrations', JavaExec) {
+    mustRunAfter('migrate')
+    mustRunAfter('build_languages', 'build_tests')
+
+    dependsOn(resolveMps, 'downloadJbr')
+    mpsBackendLauncher.builder()
+            .withMpsHome(mpsHomeDir)
+            .withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path })
+            .configure(it)
+
+    classpath(fileTree(mpsHomeDir) {
+        include("lib/**/*.jar")
+    })
+    classpath(configurations.rerunMigrationsBackend)
+    mainClass = 'de.itemis.mps.gradle.migrate.MainKt'
+
+    args("--project=${file('code')}")
+
+    // rerun-migrations needs its own jar added as a plugin
+    argumentProviders.add(new CommandLineArgumentProvider() {
+        @Override
+        Iterable<String> asArguments() {
+            def config = configurations.rerunMigrationsBackend
+
+            ["--plugin=de.itemis.mps.buildbackends.rerun-migrations::" +
+                     configurations.rerunMigrationsBackend.files(config.dependencies.first()).first()]
+        }
+    })
+
+    args(usedPluginRoots.collect { "--plugin-root=$it".toString() })
+
+    maxHeapSize = "4G"
+}
diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
index 5e4d28224..961926553 100644
--- a/code/.mps/modules.xml
+++ b/code/.mps/modules.xml
@@ -21,7 +21,6 @@
       <modulePath path="$PROJECT_DIR$/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd" folder="celllayout" />
-      <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl" folder="conditional-editor" />
       <modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl" folder="conditional-editor" />
@@ -196,7 +195,6 @@
       <modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd" folder="tables" />
       <modulePath path="$PROJECT_DIR$/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd" folder="tables" />
       <modulePath path="$PROJECT_DIR$/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd" folder="tables" />
-      <modulePath path="$PROJECT_DIR$/testing/languages/de.itemis.mps.testing/de.itemis.mps.testing.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd" folder="3rd-party" />
       <modulePath path="$PROJECT_DIR$/third-party/solutions/third.party.usage.test/third.party.usage.test.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd" folder="tooltips" />
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps
index 67de299d7..0d37ae2ac 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps
@@ -4,10 +4,11 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -18,13 +19,20 @@
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="m373" ref="r:4095af4f-a097-4799-aaa9-03df087ddfa6(jetbrains.mps.baseLanguage.javadoc.structure)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="hba4" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
-    <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
+    <import index="hba4" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
+    <import index="2k9e" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -38,11 +46,21 @@
       <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="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
@@ -52,10 +70,15 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <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="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="4269842503726207156" name="jetbrains.mps.baseLanguage.structure.LongLiteral" flags="nn" index="1adDum">
+        <property id="4269842503726207157" name="value" index="1adDun" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
@@ -66,15 +89,27 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -88,6 +123,11 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -97,11 +137,16 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
+      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
+        <child id="1144231399730" name="condition" index="1Dwp0S" />
+        <child id="1144231408325" name="iteration" index="1Dwrff" />
+      </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
         <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
       </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="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -109,6 +154,31 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
+        <property id="5858074156537516431" name="text" index="x79VB" />
+      </concept>
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
     <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
       <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
         <reference id="8880393040217294897" name="decl" index="ffrpq" />
@@ -181,6 +251,7 @@
       </concept>
       <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
       <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
+      <concept id="7504436213544206332" name="jetbrains.mps.lang.smodel.structure.Node_ContainingLinkOperation" flags="nn" index="2NL2c5" />
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
@@ -216,6 +287,9 @@
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -424,13 +498,36 @@
           <node concept="3clFbS" id="4mjBAwsqfO4" role="2LFqv$">
             <node concept="3clFbF" id="4mjBAwsqfO5" role="3cqZAp">
               <node concept="2OqwBi" id="4mjBAwsqfO6" role="3clFbG">
-                <node concept="2OqwBi" id="4mjBAwsqfO7" role="2Oq$k0">
-                  <node concept="37vLTw" id="4mjBAwsqfO8" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4mjBAwsqfOt" resolve="model" />
+                <node concept="2OqwBi" id="aREAMnUcI8" role="2Oq$k0">
+                  <node concept="2OqwBi" id="4mjBAwsqfO7" role="2Oq$k0">
+                    <node concept="37vLTw" id="4mjBAwsqfO8" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4mjBAwsqfOt" resolve="model" />
+                    </node>
+                    <node concept="2SmgA7" id="4mjBAwsqfO9" role="2OqNvi">
+                      <node concept="chp4Y" id="4mjBAwsqfOa" role="1dBWTz">
+                        <ref role="cht4Q" to="hba4:5A94f9Eu4RV" resolve="MethodLineDoc" />
+                      </node>
+                    </node>
                   </node>
-                  <node concept="2SmgA7" id="4mjBAwsqfO9" role="2OqNvi">
-                    <node concept="chp4Y" id="4mjBAwsqfOa" role="1dBWTz">
-                      <ref role="cht4Q" to="hba4:5A94f9Eu4RV" resolve="MethodLineDoc" />
+                  <node concept="3zZkjj" id="aREAMnUgSY" role="2OqNvi">
+                    <node concept="1bVj0M" id="aREAMnUgT0" role="23t8la">
+                      <node concept="3clFbS" id="aREAMnUgT1" role="1bW5cS">
+                        <node concept="3clFbF" id="aREAMnUhbs" role="3cqZAp">
+                          <node concept="3fqX7Q" id="aREAMnUhbq" role="3clFbG">
+                            <node concept="2YIFZM" id="aREAMnUh$V" role="3fr31v">
+                              <ref role="37wK5l" node="aREAMnU2Wa" resolve="isInMigrationTestCase" />
+                              <ref role="1Pybhc" node="aREAMnU0sV" resolve="TestCaseDetection" />
+                              <node concept="37vLTw" id="aREAMnUhK4" role="37wK5m">
+                                <ref role="3cqZAo" node="aREAMnUgT2" resolve="it" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="aREAMnUgT2" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="aREAMnUgT3" role="1tU5fm" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -895,39 +992,50 @@
                     <node concept="1bVj0M" id="1LCsd5kqV29" role="23t8la">
                       <node concept="3clFbS" id="1LCsd5kqV2a" role="1bW5cS">
                         <node concept="3clFbF" id="1LCsd5kqVMq" role="3cqZAp">
-                          <node concept="2OqwBi" id="1LCsd5kqVMs" role="3clFbG">
-                            <node concept="2OqwBi" id="1LCsd5kqVMt" role="2Oq$k0">
-                              <node concept="2OqwBi" id="1LCsd5kqVMu" role="2Oq$k0">
-                                <node concept="37vLTw" id="1LCsd5kqVMv" role="2Oq$k0">
+                          <node concept="1Wc70l" id="aREAMnUivO" role="3clFbG">
+                            <node concept="3fqX7Q" id="aREAMnUiNJ" role="3uHU7B">
+                              <node concept="2YIFZM" id="aREAMnUkS0" role="3fr31v">
+                                <ref role="37wK5l" node="aREAMnU2Wa" resolve="isInMigrationTestCase" />
+                                <ref role="1Pybhc" node="aREAMnU0sV" resolve="TestCaseDetection" />
+                                <node concept="37vLTw" id="aREAMnUlaW" role="37wK5m">
                                   <ref role="3cqZAo" node="1LCsd5kqV2b" resolve="it" />
                                 </node>
-                                <node concept="3TrEf2" id="1LCsd5kqVMw" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="hba4:3d2YJYTUdjv" resolve="text" />
-                                </node>
-                              </node>
-                              <node concept="3Tsc0h" id="1LCsd5kqVMx" role="2OqNvi">
-                                <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
                               </node>
                             </node>
-                            <node concept="2HxqBE" id="1LCsd5kqVMy" role="2OqNvi">
-                              <node concept="1bVj0M" id="1LCsd5kqVMz" role="23t8la">
-                                <node concept="3clFbS" id="1LCsd5kqVM$" role="1bW5cS">
-                                  <node concept="3clFbF" id="1LCsd5kqVM_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1LCsd5kqVMH" role="3clFbG">
-                                      <node concept="37vLTw" id="1LCsd5kqVMI" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1LCsd5kqVML" resolve="it" />
-                                      </node>
-                                      <node concept="1mIQ4w" id="1LCsd5kqVMJ" role="2OqNvi">
-                                        <node concept="chp4Y" id="1LCsd5kqVMK" role="cj9EA">
-                                          <ref role="cht4Q" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                            <node concept="2OqwBi" id="1LCsd5kqVMs" role="3uHU7w">
+                              <node concept="2OqwBi" id="1LCsd5kqVMt" role="2Oq$k0">
+                                <node concept="2OqwBi" id="1LCsd5kqVMu" role="2Oq$k0">
+                                  <node concept="37vLTw" id="1LCsd5kqVMv" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1LCsd5kqV2b" resolve="it" />
+                                  </node>
+                                  <node concept="3TrEf2" id="1LCsd5kqVMw" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="hba4:3d2YJYTUdjv" resolve="text" />
+                                  </node>
+                                </node>
+                                <node concept="3Tsc0h" id="1LCsd5kqVMx" role="2OqNvi">
+                                  <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+                                </node>
+                              </node>
+                              <node concept="2HxqBE" id="1LCsd5kqVMy" role="2OqNvi">
+                                <node concept="1bVj0M" id="1LCsd5kqVMz" role="23t8la">
+                                  <node concept="3clFbS" id="1LCsd5kqVM$" role="1bW5cS">
+                                    <node concept="3clFbF" id="1LCsd5kqVM_" role="3cqZAp">
+                                      <node concept="2OqwBi" id="1LCsd5kqVMH" role="3clFbG">
+                                        <node concept="37vLTw" id="1LCsd5kqVMI" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="1LCsd5kqVML" resolve="it" />
+                                        </node>
+                                        <node concept="1mIQ4w" id="1LCsd5kqVMJ" role="2OqNvi">
+                                          <node concept="chp4Y" id="1LCsd5kqVMK" role="cj9EA">
+                                            <ref role="cht4Q" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                </node>
-                                <node concept="Rh6nW" id="1LCsd5kqVML" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="1LCsd5kqVMM" role="1tU5fm" />
+                                  <node concept="Rh6nW" id="1LCsd5kqVML" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="1LCsd5kqVMM" role="1tU5fm" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -1281,5 +1389,172 @@
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
     </node>
   </node>
+  <node concept="312cEu" id="aREAMnU0sV">
+    <property role="TrG5h" value="TestCaseDetection" />
+    <node concept="2tJIrI" id="aREAMo0rUN" role="jymVt" />
+    <node concept="Wx3nA" id="aREAMo0idW" role="jymVt">
+      <property role="TrG5h" value="LINK_INPUT_NODES" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="aREAMo0htH" role="1B3o_S" />
+      <node concept="3uibUv" id="aREAMo0idH" role="1tU5fm">
+        <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
+      </node>
+      <node concept="2YIFZM" id="aREAMo0r6j" role="33vP2m">
+        <ref role="37wK5l" to="2k9e:~MetaAdapterFactory.getContainmentLink(long,long,long,long,java.lang.String)" resolve="getContainmentLink" />
+        <ref role="1Pybhc" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
+        <node concept="1adDum" id="aREAMo0qUe" role="37wK5m">
+          <property role="1adDun" value="-8825571760360698496L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUf" role="37wK5m">
+          <property role="1adDun" value="-7431307307277756308L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUg" role="37wK5m">
+          <property role="1adDun" value="5476670926298696679L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUh" role="37wK5m">
+          <property role="1adDun" value="5476670926298696680L" />
+        </node>
+        <node concept="Xl_RD" id="aREAMo0qUi" role="37wK5m">
+          <property role="Xl_RC" value="inputNodes" />
+        </node>
+      </node>
+      <node concept="z59LJ" id="aREAMo0s1V" role="lGtFl">
+        <node concept="TZ5HA" id="aREAMo0s1W" role="TZ5H$">
+          <node concept="1dT_AC" id="aREAMo0s1X" role="1dT_Ay">
+            <property role="1dT_AB" value="MigrationTestCase:inputNodes link, here as magic constant in order to avoid dependency on j.m.l.test." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="aREAMo0s4V" role="jymVt" />
+    <node concept="Wx3nA" id="aREAMo0imK" role="jymVt">
+      <property role="TrG5h" value="LINK_OUTPUT_NODES" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="aREAMo0imL" role="1B3o_S" />
+      <node concept="3uibUv" id="aREAMo0imM" role="1tU5fm">
+        <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
+      </node>
+      <node concept="2YIFZM" id="aREAMo0rhH" role="33vP2m">
+        <ref role="37wK5l" to="2k9e:~MetaAdapterFactory.getContainmentLink(long,long,long,long,java.lang.String)" resolve="getContainmentLink" />
+        <ref role="1Pybhc" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
+        <node concept="1adDum" id="aREAMo0qUn" role="37wK5m">
+          <property role="1adDun" value="-8825571760360698496L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUo" role="37wK5m">
+          <property role="1adDun" value="-7431307307277756308L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUp" role="37wK5m">
+          <property role="1adDun" value="5476670926298696679L" />
+        </node>
+        <node concept="1adDum" id="aREAMo0qUq" role="37wK5m">
+          <property role="1adDun" value="5476670926298698900L" />
+        </node>
+        <node concept="Xl_RD" id="aREAMo0qUr" role="37wK5m">
+          <property role="Xl_RC" value="outputNodes" />
+        </node>
+      </node>
+      <node concept="z59LJ" id="aREAMo0s94" role="lGtFl">
+        <node concept="TZ5HA" id="aREAMo0s95" role="TZ5H$">
+          <node concept="1dT_AC" id="aREAMo0s96" role="1dT_Ay">
+            <property role="1dT_AB" value="MigrationTestCase:outputNodes link, here as magic constant in order to avoid dependency on j.m.l.test." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="aREAMo0h6H" role="jymVt" />
+    <node concept="2YIFZL" id="aREAMnU2Wa" role="jymVt">
+      <property role="TrG5h" value="isInMigrationTestCase" />
+      <node concept="3clFbS" id="aREAMnU2Wd" role="3clF47">
+        <node concept="1Dw8fO" id="aREAMo0a8S" role="3cqZAp">
+          <node concept="3clFbS" id="aREAMo0a8U" role="2LFqv$">
+            <node concept="3clFbJ" id="aREAMo0e$B" role="3cqZAp">
+              <node concept="3clFbS" id="aREAMo0e$D" role="3clFbx">
+                <node concept="3cpWs6" id="aREAMo0g$P" role="3cqZAp">
+                  <node concept="3clFbT" id="aREAMo0gA2" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="22lmx$" id="aREAMo0f_h" role="3clFbw">
+                <node concept="17R0WA" id="aREAMo0g84" role="3uHU7w">
+                  <node concept="37vLTw" id="aREAMo0iAh" role="3uHU7w">
+                    <ref role="3cqZAo" node="aREAMo0imK" resolve="LINK_OUTPUT_NODES" />
+                  </node>
+                  <node concept="2OqwBi" id="aREAMo0fLg" role="3uHU7B">
+                    <node concept="37vLTw" id="aREAMo0fBJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="aREAMo0a8V" resolve="n" />
+                    </node>
+                    <node concept="2NL2c5" id="aREAMo0g68" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="17R0WA" id="aREAMo0fhw" role="3uHU7B">
+                  <node concept="2OqwBi" id="aREAMo0eC$" role="3uHU7B">
+                    <node concept="37vLTw" id="aREAMo0eA$" role="2Oq$k0">
+                      <ref role="3cqZAo" node="aREAMo0a8V" resolve="n" />
+                    </node>
+                    <node concept="2NL2c5" id="aREAMo0eQP" role="2OqNvi" />
+                  </node>
+                  <node concept="37vLTw" id="aREAMo0iuH" role="3uHU7w">
+                    <ref role="3cqZAo" node="aREAMo0idW" resolve="LINK_INPUT_NODES" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="aREAMo0a8V" role="1Duv9x">
+            <property role="TrG5h" value="n" />
+            <node concept="3Tqbb2" id="aREAMo0e4M" role="1tU5fm" />
+            <node concept="37vLTw" id="aREAMo0ea7" role="33vP2m">
+              <ref role="3cqZAo" node="aREAMnU3fh" resolve="node" />
+            </node>
+          </node>
+          <node concept="3y3z36" id="aREAMo0ecU" role="1Dwp0S">
+            <node concept="10Nm6u" id="aREAMo0ee5" role="3uHU7w" />
+            <node concept="37vLTw" id="aREAMo0ec0" role="3uHU7B">
+              <ref role="3cqZAo" node="aREAMo0a8V" resolve="n" />
+            </node>
+          </node>
+          <node concept="37vLTI" id="aREAMo0ehD" role="1Dwrff">
+            <node concept="2OqwBi" id="aREAMo0ekj" role="37vLTx">
+              <node concept="37vLTw" id="aREAMo0eiY" role="2Oq$k0">
+                <ref role="3cqZAo" node="aREAMo0a8V" resolve="n" />
+              </node>
+              <node concept="1mfA1w" id="aREAMo0ep5" role="2OqNvi" />
+            </node>
+            <node concept="37vLTw" id="aREAMo0eg3" role="37vLTJ">
+              <ref role="3cqZAo" node="aREAMo0a8V" resolve="n" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="aREAMo0gBp" role="3cqZAp" />
+        <node concept="3cpWs6" id="aREAMo0gYj" role="3cqZAp">
+          <node concept="3clFbT" id="aREAMo0h0$" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="aREAMnU0QV" role="1B3o_S" />
+      <node concept="10P_77" id="aREAMnU2VZ" role="3clF45" />
+      <node concept="37vLTG" id="aREAMnU3fh" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="aREAMnU3fg" role="1tU5fm" />
+      </node>
+      <node concept="P$JXv" id="aREAMnUlzX" role="lGtFl">
+        <node concept="TZ5HA" id="aREAMnUlzY" role="TZ5H$">
+          <node concept="1dT_AC" id="aREAMnUlzZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Do not migrate input and output nodes of migration test cases." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="aREAMnUl$0" role="3nqlJM">
+          <property role="TUZQ4" value="a node" />
+          <node concept="zr_55" id="aREAMnUl$2" role="zr_5Q">
+            <ref role="zr_51" node="aREAMnU3fh" resolve="node" />
+          </node>
+        </node>
+        <node concept="x79VA" id="aREAMnUl$3" role="3nqlJM">
+          <property role="x79VB" value="true if the node is an input or output node in a MigrationTestCase" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="aREAMnU0sW" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
index cf5cbc402..0369c2f72 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
@@ -2,7 +2,7 @@
 <model ref="r:a0ad4fb2-84d1-4370-9588-bb53940875f7(test.com.mbeddr.mpsutil.blutil.doc@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
index deecac528..b63684c97 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
@@ -6,9 +6,10 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
index 7815872ae..cb6beae50 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
@@ -6,9 +6,10 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index a60cecd5b..d12f94fa8 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -1981,6 +1981,25 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBMV" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBMW" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBMX" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBMY" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="72xJwSTmBMZ" role="iGT6I">
+                <property role="2Ry0Am" value="richtext" />
+                <node concept="2Ry0Ak" id="72xJwSTmBN0" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="72xJwSTmBN1" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.slisson.mps.richtext.test.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="7szUFELHeHf" role="3989C9">
@@ -6735,6 +6754,25 @@
             <ref role="3bR37D" node="6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBN3" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBN4" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBN5" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBN6" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="72xJwSTmBN7" role="iGT6I">
+                <property role="2Ry0Am" value="debug" />
+                <node concept="2Ry0Ak" id="72xJwSTmBN8" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="72xJwSTmBN9" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.debug.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="2NyZxKpUXYJ" role="3989C9">
@@ -9235,6 +9273,25 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNb" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNc" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBNd" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBNe" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNf" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNg" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="72xJwSTmBNh" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="2NTGYE$JTH6" role="3989C9">
@@ -13158,6 +13215,9 @@
       <node concept="m$_yC" id="6hpTCZQdXR4" role="m$_yJ">
         <ref role="m$_y1" node="2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
       </node>
+      <node concept="m$_yC" id="5fXNsKhuyab" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
+      </node>
       <node concept="3_J27D" id="6hpTCZQdXR5" role="m_cZH">
         <node concept="3Mxwew" id="6hpTCZQdXR6" role="3MwsjC">
           <property role="3MwjfP" value="com.mbeddr.mpsutil.editor.querylist" />
@@ -13209,6 +13269,7 @@
         </node>
         <node concept="1SiIV0" id="4Hbnsm4Oj7V" role="3bR37C">
           <node concept="3bR9La" id="4Hbnsm4Oj7W" role="1SiIV1">
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
@@ -13264,6 +13325,31 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="3GWIMuJ0j9F" role="3bR37C">
+          <node concept="3bR9La" id="3GWIMuJ0j9G" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3GWIMuJ8mY1" role="3bR37C">
+          <node concept="3bR9La" id="3GWIMuJ8mY2" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3GWIMuJ8mY3" role="3bR37C">
+          <node concept="3bR9La" id="3GWIMuJ8mY4" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3GWIMuJ8mY5" role="3bR37C">
+          <node concept="3bR9La" id="3GWIMuJ8mY6" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="T_6DrkEOyF" role="3bR37C">
+          <node concept="3bR9La" id="T_6DrkEOyG" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:ymnOULAU1u" resolve="jetbrains.mps.lang.test.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4Hbnsm4O7VL" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -14528,6 +14614,19 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="3Z_1kA5Z4k6" role="3bR31x">
+          <node concept="3LXTmp" id="3Z_1kA5Z4k7" role="3rtmxm">
+            <node concept="398BVA" id="3Z_1kA5Z4k8" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="3Z_1kA5Z4k9" role="iGT6I">
+                <property role="2Ry0Am" value="statistics" />
+              </node>
+            </node>
+            <node concept="3qWCbU" id="3Z_1kA5Z4kb" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="4bHoaiHvmsq" role="3989C9">
@@ -15140,6 +15239,25 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNj" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNk" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBNl" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBNm" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNn" role="iGT6I">
+                <property role="2Ry0Am" value="htmlcell" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNo" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="72xJwSTmBNp" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2_Ic$z" id="5KXebfcSw7" role="3989C9">
@@ -15698,6 +15816,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNr" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNs" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBNt" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBNu" role="3LXTmr">
+              <ref role="398BVh" node="6wECU8wth1R" resolve="thirdPartyUsage.home" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNv" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNw" role="2Ry0An">
+                  <property role="2Ry0Am" value="third.party.usage.test" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6$6tsX_CIRQ" role="3989C9">
@@ -18339,6 +18473,25 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNy" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNz" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBN$" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBN_" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNA" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNB" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="72xJwSTmBNC" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.test" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="4JmkJs3GrYV" role="3989C9">
@@ -19247,6 +19400,22 @@
             <ref role="3bR37D" node="5nOdiEvBTNY" resolve="de.slisson.mps.richtext.test.runtime" />
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNE" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNF" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBNG" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBNH" role="3LXTmr">
+              <ref role="398BVh" node="7qi8mU1Oz8V" resolve="richtext.home" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNI" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNJ" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.de.slisson.mps.richtext" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7qi8mU1Ozdr" role="3989C9">
@@ -19429,6 +19598,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="72xJwSTmBNL" role="3bR31x">
+          <node concept="3LXTmp" id="72xJwSTmBNM" role="3rtmxm">
+            <node concept="3qWCbU" id="72xJwSTmBNN" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="72xJwSTmBNO" role="3LXTmr">
+              <ref role="398BVh" node="7qi8mU1OzcE" resolve="multiline.home" />
+              <node concept="2Ry0Ak" id="72xJwSTmBNP" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="72xJwSTmBNQ" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.de.slisson.mps.editor.multiline" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7qi8mU1OznZ" role="3989C9">
@@ -20783,6 +20968,442 @@
         </node>
       </node>
     </node>
+    <node concept="2G$12M" id="4zIvKyxqSP7" role="3989C9">
+      <property role="TrG5h" value="sandboxes" />
+      <node concept="1E1JtD" id="4zIvKyxqTge" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.editor.htmlcell.demolang" />
+        <property role="3LESm3" value="4f348220-8c30-49ab-b23f-98fdc5c19b18" />
+        <node concept="398BVA" id="4zIvKyxqTjk" role="3LF7KH">
+          <ref role="398BVh" node="4zIvKyxqTit" resolve="htmlcell.home" />
+          <node concept="2Ry0Ak" id="4zIvKyxqTjq" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="4zIvKyxqTjv" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang" />
+              <node concept="2Ry0Ak" id="4zIvKyxqTj$" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyxqTE_" role="3bR37C">
+          <node concept="1BurEX" id="4zIvKyxqTEA" role="1SiIV1">
+            <node concept="398BVA" id="4zIvKyxqTEc" role="1BurEY">
+              <ref role="398BVh" node="4zIvKyxqTit" resolve="htmlcell.home" />
+              <node concept="2Ry0Ak" id="4zIvKyxqTEd" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4zIvKyxqTEe" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang" />
+                  <node concept="2Ry0Ak" id="4zIvKyxqTEf" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="4zIvKyxqTEg" role="2Ry0An">
+                      <property role="2Ry0Am" value="resources.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyxqTEW" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyxqTEX" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyxqTEB" role="3LXTmr">
+              <ref role="398BVh" node="4zIvKyxqTit" resolve="htmlcell.home" />
+              <node concept="2Ry0Ak" id="4zIvKyxqTEC" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4zIvKyxqTED" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang" />
+                  <node concept="2Ry0Ak" id="4zIvKyxqTEE" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyxqTEY" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyxqTIc" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyxqTId" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyxqTIe" role="3LXTmr">
+              <ref role="398BVh" node="4zIvKyxqTit" resolve="htmlcell.home" />
+              <node concept="2Ry0Ak" id="4zIvKyxqTIf" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4zIvKyxqTIg" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyxqTIi" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="4zIvKyx$aSl" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.modellisteners.sandboxlang" />
+        <property role="3LESm3" value="4cbe8d8b-9aa4-4342-8d1a-f3bcd858d0e8" />
+        <node concept="398BVA" id="4zIvKyx$aSM" role="3LF7KH">
+          <ref role="398BVh" node="4zIvKyx$aPF" resolve="modellisteners.home" />
+          <node concept="2Ry0Ak" id="4zIvKyx$aTE" role="iGT6I">
+            <property role="2Ry0Am" value="com.mbeddr.mpsutil.modellisteners.sandboxlang" />
+            <node concept="2Ry0Ak" id="4zIvKyx$aUx" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$big" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$bih" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyx$biz" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyx$bi$" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyx$bii" role="3LXTmr">
+              <ref role="398BVh" node="4zIvKyx$aPF" resolve="modellisteners.home" />
+              <node concept="2Ry0Ak" id="4zIvKyx$bij" role="iGT6I">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.modellisteners.sandboxlang" />
+                <node concept="2Ry0Ak" id="4zIvKyx$bik" role="2Ry0An">
+                  <property role="2Ry0Am" value="languageModels" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$bi_" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyx$bjg" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyx$bjh" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyx$bji" role="3LXTmr">
+              <ref role="398BVh" node="4zIvKyx$aPF" resolve="modellisteners.home" />
+              <node concept="2Ry0Ak" id="4zIvKyx$bjj" role="iGT6I">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.modellisteners.sandboxlang" />
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$bjl" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="4zIvKyx$bRB" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.editor.querylist.demolang" />
+        <property role="3LESm3" value="9b71d0db-bcaf-4144-bb2e-1ddef2b249b9" />
+        <node concept="398BVA" id="4zIvKyx$bSK" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="4zIvKyx$bTF" role="iGT6I">
+            <property role="2Ry0Am" value="querylist" />
+            <node concept="2Ry0Ak" id="4zIvKyx$bUy" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.querylist.demolang" />
+              <node concept="2Ry0Ak" id="4zIvKyx$bVp" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.querylist.demolang.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cjp" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cjq" role="1SiIV1">
+            <ref role="3bR37D" node="4Hbnsm4O7VL" resolve="com.mbeddr.mpsutil.editor.querylist" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cjr" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cjs" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cjt" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cju" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cjv" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cjw" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cjx" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cjy" role="1SiIV1">
+            <ref role="3bR37D" node="4Hbnsm4OhEo" resolve="com.mbeddr.mpsutil.editor.querylist.runtime" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyx$cjL" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyx$cjM" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyx$cjz" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$cj$" role="iGT6I">
+                <property role="2Ry0Am" value="querylist" />
+                <node concept="2Ry0Ak" id="4zIvKyx$cj_" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.querylist.demolang" />
+                  <node concept="2Ry0Ak" id="4zIvKyx$cjA" role="2Ry0An">
+                    <property role="2Ry0Am" value="languageModels" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$cjN" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyx$ckD" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyx$ckE" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyx$ckF" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$ckG" role="iGT6I">
+                <property role="2Ry0Am" value="querylist" />
+                <node concept="2Ry0Ak" id="4zIvKyx$ckH" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.querylist.demolang" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$ckJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="4zIvKyxCri3" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="de.itemis.mps.editor.pagination.demolang" />
+        <property role="3LESm3" value="cff30ec5-b86b-4ddf-809c-939ea4d33bab" />
+        <node concept="398BVA" id="4zIvKyxCrI3" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="4zIvKyxCrIV" role="iGT6I">
+            <property role="2Ry0Am" value="pagination" />
+            <node concept="2Ry0Ak" id="4zIvKyxCrJp" role="2Ry0An">
+              <property role="2Ry0Am" value="languages" />
+              <node concept="2Ry0Ak" id="4zIvKyxCrKg" role="2Ry0An">
+                <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.demolang" />
+                <node concept="2Ry0Ak" id="4zIvKyxCrL7" role="2Ry0An">
+                  <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.demolang.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyxCs9A" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyxCs9B" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyxCs9l" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyxCs9m" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="4zIvKyxCs9n" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="4zIvKyxCs9o" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.demolang" />
+                    <node concept="2Ry0Ak" id="4zIvKyxCs9p" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyxCs9C" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyxCsbt" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyxCsbu" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyxCsbv" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyxCsbw" role="iGT6I">
+                <property role="2Ry0Am" value="pagination" />
+                <node concept="2Ry0Ak" id="4zIvKyxCsbx" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="4zIvKyxCsby" role="2Ry0An">
+                    <property role="2Ry0Am" value="de.itemis.mps.editor.pagination.demolang" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyxCsb$" role="3LXTna">
+              <property role="3qWCbO" value="icons/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="4zIvKyx$cVb" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
+        <property role="3LESm3" value="4972ae94-72e7-499b-8766-0d6acffdb4f2" />
+        <node concept="398BVA" id="4zIvKyx$cXa" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="4zIvKyx$cY2" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="4zIvKyx$cYw" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
+              <node concept="2Ry0Ak" id="4zIvKyx$cZn" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.intentions.sandboxlang.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$dn_" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$dnA" role="1SiIV1">
+            <ref role="3bR37D" node="54z9_KDR0Ol" resolve="com.mbeddr.mpsutil.intentions" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyx$dnP" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyx$dnQ" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyx$dnB" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$dnC" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4zIvKyx$dnD" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
+                  <node concept="2Ry0Ak" id="4zIvKyx$dnE" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$dnR" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1yeLz9" id="4zIvKyx$dnS" role="1TViLv">
+          <property role="TrG5h" value="com.mbeddr.mpsutil.intentions.sandboxlang.generator" />
+          <property role="3LESm3" value="80dab4d6-7c88-4760-9a42-0338421bd077" />
+          <node concept="1BupzO" id="4zIvKyx$doa" role="3bR31x">
+            <property role="3ZfqAx" value="generator/templates" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="4zIvKyx$dob" role="1HemKq">
+              <node concept="398BVA" id="4zIvKyx$dnT" role="3LXTmr">
+                <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+                <node concept="2Ry0Ak" id="4zIvKyx$dnU" role="iGT6I">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="4zIvKyx$dnV" role="2Ry0An">
+                    <property role="2Ry0Am" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
+                    <node concept="2Ry0Ak" id="4zIvKyx$dnW" role="2Ry0An">
+                      <property role="2Ry0Am" value="generator" />
+                      <node concept="2Ry0Ak" id="4zIvKyx$dnX" role="2Ry0An">
+                        <property role="2Ry0Am" value="templates" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="4zIvKyx$doc" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyx$dr3" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyx$dr4" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyx$dr5" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$dr6" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4zIvKyx$dr7" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.intentions.sandboxlang" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$dr9" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="4zIvKyx$cn2" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.treenotation.sandboxlang" />
+        <property role="3LESm3" value="ce6e35ab-eb16-4223-b8fd-cd565ab8b2fb" />
+        <node concept="398BVA" id="4zIvKyx$coB" role="3LF7KH">
+          <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+          <node concept="2Ry0Ak" id="4zIvKyx$cr8" role="iGT6I">
+            <property role="2Ry0Am" value="treenotation" />
+            <node concept="2Ry0Ak" id="4zIvKyx$crZ" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.treenotation.sandboxlang" />
+              <node concept="2Ry0Ak" id="4zIvKyx$csQ" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.treenotation.sandboxlang.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cP4" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cP5" role="1SiIV1">
+            <ref role="3bR37D" node="2jlBy7bQp6P" resolve="com.mbeddr.mpsutil.treenotation.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cP6" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cP7" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cP8" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cP9" role="1SiIV1">
+            <ref role="3bR37D" node="PE3B26QCrP" resolve="org.apache.commons" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4zIvKyx$cPa" role="3bR37C">
+          <node concept="3bR9La" id="4zIvKyx$cPb" role="1SiIV1">
+            <ref role="3bR37D" node="2jlBy7bQtz0" resolve="com.mbeddr.mpsutil.treenotation.styles" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4zIvKyx$cPq" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4zIvKyx$cPr" role="1HemKq">
+            <node concept="398BVA" id="4zIvKyx$cPc" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$cPd" role="iGT6I">
+                <property role="2Ry0Am" value="treenotation" />
+                <node concept="2Ry0Ak" id="4zIvKyx$cPe" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.treenotation.sandboxlang" />
+                  <node concept="2Ry0Ak" id="4zIvKyx$cPf" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$cPs" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4zIvKyx$cQg" role="3bR31x">
+          <node concept="3LXTmp" id="4zIvKyx$cQh" role="3rtmxm">
+            <node concept="398BVA" id="4zIvKyx$cQi" role="3LXTmr">
+              <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="4zIvKyx$cQj" role="iGT6I">
+                <property role="2Ry0Am" value="treenotation" />
+                <node concept="2Ry0Ak" id="4zIvKyx$cQk" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.treenotation.sandboxlang" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4zIvKyx$cQm" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="10PD9b" id="6$6tsX_CF7b" role="10PD9s" />
     <node concept="3b7kt6" id="6$6tsX_CF7c" role="10PD9s" />
     <node concept="1gjT0q" id="6$6tsX_CKLI" role="10PD9s" />
@@ -20910,6 +21531,24 @@
         </node>
       </node>
     </node>
+    <node concept="398rNT" id="4zIvKyxqTit" role="1l3spd">
+      <property role="TrG5h" value="htmlcell.home" />
+      <node concept="398BVA" id="4zIvKyxqTjd" role="398pKh">
+        <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+        <node concept="2Ry0Ak" id="4zIvKyxqTji" role="iGT6I">
+          <property role="2Ry0Am" value="htmlcell" />
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="4zIvKyx$aPF" role="1l3spd">
+      <property role="TrG5h" value="modellisteners.home" />
+      <node concept="398BVA" id="4zIvKyx$aQR" role="398pKh">
+        <ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
+        <node concept="2Ry0Ak" id="4zIvKyx$aRU" role="iGT6I">
+          <property role="2Ry0Am" value="modellisteners" />
+        </node>
+      </node>
+    </node>
     <node concept="398rNT" id="OJuIQq1NW4" role="1l3spd">
       <property role="TrG5h" value="mps.macro.extensions.home" />
       <node concept="398BVA" id="OJuIQq1NY5" role="398pKh">
@@ -21061,6 +21700,29 @@
       <node concept="L2wRC" id="6wECU8wthq9" role="39821P">
         <ref role="L2wRA" node="6wECU8wth18" resolve="third.party.usage.test" />
       </node>
+      <node concept="L2wRC" id="4zIvKyxv1Hl" role="39821P">
+        <ref role="L2wRA" node="4zIvKyxqTge" resolve="de.itemis.mps.editor.htmlcell.demolang" />
+      </node>
+      <node concept="28jJK3" id="4zIvKyxw0Kx" role="39821P">
+        <node concept="398BVA" id="4zIvKyxw0LK" role="28jJRO">
+          <ref role="398BVh" node="4zIvKyxqTit" resolve="htmlcell.home" />
+          <node concept="2Ry0Ak" id="4zIvKyxw0Mf" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="4zIvKyxw0Mk" role="2Ry0An">
+              <property role="2Ry0Am" value="de.itemis.mps.editor.htmlcell.demolang" />
+              <node concept="2Ry0Ak" id="4zIvKyxw0Mp" role="2Ry0An">
+                <property role="2Ry0Am" value="lib" />
+                <node concept="2Ry0Ak" id="4zIvKyxw0Mu" role="2Ry0An">
+                  <property role="2Ry0Am" value="resources.jar" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="L2wRC" id="4zIvKyx$bNQ" role="39821P">
+        <ref role="L2wRA" node="4zIvKyx$aSl" resolve="com.mbeddr.mpsutil.modellisteners.sandboxlang" />
+      </node>
     </node>
     <node concept="22LTRH" id="6yXTMcTWb7V" role="1hWBAP">
       <property role="TrG5h" value="all" />
diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd b/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd
deleted file mode 100644
index 3f05da885..000000000
--- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="de.slisson.mps.editor.celllayout" uuid="82e207b8-5675-4dc6-8a49-c20a38dccf66" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <sourcePath />
-  <languageVersions />
-  <dependencyVersions>
-    <module reference="82e207b8-5675-4dc6-8a49-c20a38dccf66(de.slisson.mps.editor.celllayout)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl b/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl
index b3af2f8c8..634786e4f 100644
--- a/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl
+++ b/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
@@ -104,6 +104,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/debug/languages/de.itemis.mps.debug/models/de.itemis.mps.debug.typesystem.mps b/code/debug/languages/de.itemis.mps.debug/models/de.itemis.mps.debug.typesystem.mps
index 281e84b41..1a09419ec 100644
--- a/code/debug/languages/de.itemis.mps.debug/models/de.itemis.mps.debug.typesystem.mps
+++ b/code/debug/languages/de.itemis.mps.debug/models/de.itemis.mps.debug.typesystem.mps
@@ -2,10 +2,7 @@
 <model ref="r:0263ff6b-f12c-4c4d-915f-3094764bab2a(de.itemis.mps.debug.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
diff --git a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
index 355860d46..08967afd6 100644
--- a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
+++ b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
index 482c571e4..b6f3ce45d 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
@@ -1388,7 +1388,10 @@
                             <node concept="Xl_RD" id="6rPpQ1NH_wj" role="3uHU7B">
                               <property role="Xl_RC" value="returning Extends.to: " />
                             </node>
-                            <node concept="1Pxb5l" id="6rPpQ1NH_wu" role="3uHU7w" />
+                            <node concept="2OqwBi" id="6YCOCkJBDMN" role="3uHU7w">
+                              <node concept="1Pxb5l" id="6rPpQ1NH_wu" role="2Oq$k0" />
+                              <node concept="2Iv5rx" id="6YCOCkJBDMO" role="2OqNvi" />
+                            </node>
                           </node>
                         </node>
                       </node>
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps
index eeec814fc..c813c021b 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps
@@ -7,7 +7,6 @@
   </languages>
   <imports>
     <import index="7fae" ref="r:120be759-a4d3-4f3c-b9c0-033221c73671(de.itemis.mps.editor.diagram.demolang.structure)" implicit="true" />
-    <import index="yv60" ref="f:diff_diff_model_0#r:fd84401f-cd0e-49f8-9cba-254f4da8c308(de.itemis.mps.editor.diagram.demolang.typesystem@diff_model_0)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -120,7 +119,7 @@
           <node concept="3cpWs3" id="6I91F6siBD7" role="2MkJ7o">
             <node concept="2OqwBi" id="6I91F6siBIu" role="3uHU7w">
               <node concept="1YBJjd" id="6I91F6siBDH" role="2Oq$k0">
-                <ref role="1YBMHb" to="yv60:6zxgcXkK1ca" resolve="node" />
+                <ref role="1YBMHb" node="6zxgcXkK1ca" resolve="node" />
               </node>
               <node concept="3TrcHB" id="6I91F6siCc0" role="2OqNvi">
                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -131,7 +130,7 @@
             </node>
           </node>
           <node concept="1YBJjd" id="6zxgcXkK2sI" role="1urrMF">
-            <ref role="1YBMHb" to="yv60:6zxgcXkK1ca" resolve="node" />
+            <ref role="1YBMHb" node="6zxgcXkK1ca" resolve="node" />
           </node>
         </node>
       </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index dc5304262..b4510e445 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -3239,6 +3239,34 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3BzrucBh1rd" role="jymVt" />
+    <node concept="3clFb_" id="3BzrucBhLNi" role="jymVt">
+      <property role="TrG5h" value="getIdeaProject" />
+      <node concept="3clFbS" id="3BzrucBhLNl" role="3clF47">
+        <node concept="3clFbF" id="3BzrucBiHWI" role="3cqZAp">
+          <node concept="2YIFZM" id="3kITFmIEFID" role="3clFbG">
+            <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
+            <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+            <node concept="2YIFZM" id="3BzrucBg3Ag" role="37wK5m">
+              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+              <ref role="37wK5l" to="alof:~ProjectHelper.getProject(org.jetbrains.mps.openapi.module.SRepository)" resolve="getProject" />
+              <node concept="2OqwBi" id="3BzrucBgFay" role="37wK5m">
+                <node concept="1rXfSq" id="3BzrucBg3Ah" role="2Oq$k0">
+                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
+                </node>
+                <node concept="liA8E" id="3BzrucBgMq5" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3BzrucBhnO6" role="1B3o_S" />
+      <node concept="3uibUv" id="3BzrucBhIoE" role="3clF45">
+        <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="4dus55SGBy2" role="jymVt" />
     <node concept="3clFb_" id="6Bd7Vwq_Nhx" role="jymVt">
       <property role="TrG5h" value="getPalette" />
@@ -3253,22 +3281,8 @@
             <node concept="3uibUv" id="6Bd7VwqA68x" role="1tU5fm">
               <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
             </node>
-            <node concept="2YIFZM" id="6Bd7VwqA68y" role="33vP2m">
-              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-              <node concept="2OqwBi" id="6Bd7VwqA68z" role="37wK5m">
-                <node concept="liA8E" id="6Bd7VwqA68_" role="2OqNvi">
-                  <ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
-                </node>
-                <node concept="2OqwBi" id="2WtZELtyqRN" role="2Oq$k0">
-                  <node concept="1rXfSq" id="2WtZELtyqRO" role="2Oq$k0">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
-                  </node>
-                  <node concept="liA8E" id="2WtZELtyqRP" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
-                  </node>
-                </node>
-              </node>
+            <node concept="1rXfSq" id="3BzrucBjlKl" role="33vP2m">
+              <ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
             </node>
           </node>
         </node>
@@ -4839,22 +4853,8 @@
                 <node concept="3uibUv" id="3kITFmIEFIC" role="1tU5fm">
                   <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
                 </node>
-                <node concept="2YIFZM" id="3kITFmIEFID" role="33vP2m">
-                  <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-                  <node concept="2OqwBi" id="2WtZELtylOw" role="37wK5m">
-                    <node concept="2OqwBi" id="2WtZELtya0I" role="2Oq$k0">
-                      <node concept="1rXfSq" id="2WtZELty8_x" role="2Oq$k0">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
-                      </node>
-                      <node concept="liA8E" id="2WtZELtylIL" role="2OqNvi">
-                        <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="2WtZELtynhD" role="2OqNvi">
-                      <ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
-                    </node>
-                  </node>
+                <node concept="1rXfSq" id="3BzrucBi$Ur" role="33vP2m">
+                  <ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
                 </node>
               </node>
             </node>
@@ -4897,7 +4897,7 @@
                             <ref role="3cqZAo" node="2mf5oprdgmL" resolve="LOG" />
                           </node>
                           <node concept="liA8E" id="5mRiQvlulG3" role="2OqNvi">
-                            <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
+                            <ref role="37wK5l" to="q7tw:~Category.debug(java.lang.Object)" resolve="debug" />
                             <node concept="Xl_RD" id="5mRiQvlulG4" role="37wK5m">
                               <property role="Xl_RC" value="Diagram palette not found in the project" />
                             </node>
@@ -34916,7 +34916,7 @@
       </node>
       <node concept="3Tm6S6" id="2i0w9xYv51D" role="1B3o_S" />
       <node concept="2YIFZM" id="PEFON8uNcD" role="33vP2m">
-        <ref role="37wK5l" to="e8no:~ContainerUtil.createWeakValueMap():java.util.Map" resolve="createWeakValueMap" />
+        <ref role="37wK5l" to="e8no:~ContainerUtil.createWeakValueMap()" resolve="createWeakValueMap" />
         <ref role="1Pybhc" to="e8no:~ContainerUtil" resolve="ContainerUtil" />
       </node>
     </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
index fbebc5822..d8744809b 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -14743,7 +14743,7 @@
       </node>
       <node concept="3Tm6S6" id="3FRjz$v9IcG" role="1B3o_S" />
       <node concept="2YIFZM" id="PEFON8wzYr" role="33vP2m">
-        <ref role="37wK5l" to="e8no:~ContainerUtil.createWeakValueMap():java.util.Map" resolve="createWeakValueMap" />
+        <ref role="37wK5l" to="e8no:~ContainerUtil.createWeakValueMap()" resolve="createWeakValueMap" />
         <ref role="1Pybhc" to="e8no:~ContainerUtil" resolve="ContainerUtil" />
       </node>
     </node>
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
index cf7437e6e..bc7ea8f8e 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
@@ -16,6 +16,7 @@
     <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
+    <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -64,10 +65,10 @@
     <import index="pdwk" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.core.aspects.constraints.rules.kinds(jetbrains.mps.lang.constraints.rules.runtime/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="pjrh" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter(MPS.Core/)" />
-    <import index="x4mf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus(MPS.Editor/)" implicit="true" />
-    <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
-    <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" implicit="true" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
+    <import index="x4mf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus(MPS.Editor/)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
+    <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
index 820d418ed..4b333893a 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
@@ -315,6 +315,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
+      <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
@@ -25472,6 +25473,24 @@
         </node>
       </node>
       <node concept="3clFbS" id="3pFNVizDMw4" role="3clF47">
+        <node concept="3clFbF" id="6zwr99Mojd_" role="3cqZAp">
+          <node concept="3vZ8r8" id="6zwr99MojXL" role="3clFbG">
+            <node concept="3clFbC" id="6zwr99MomH6" role="37vLTx">
+              <node concept="10Nm6u" id="6zwr99Monf8" role="3uHU7w" />
+              <node concept="2OqwBi" id="6zwr99Mom4e" role="3uHU7B">
+                <node concept="1rXfSq" id="6zwr99MolmY" role="2Oq$k0">
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode()" resolve="getSNode" />
+                </node>
+                <node concept="liA8E" id="6zwr99Momq3" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6zwr99Mojdz" role="37vLTJ">
+              <ref role="3cqZAo" to="emqf:~CellProviderWithRole.myReadOnly" resolve="myReadOnly" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="3pFNVizDM$r" role="3cqZAp">
           <node concept="3cpWsn" id="3pFNVizDM$q" role="3cpWs9">
             <property role="3TUv4t" value="false" />
diff --git a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
index 08f69a486..3e5538cd8 100644
--- a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
+++ b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
@@ -28,6 +28,7 @@
         <dependency reexport="false">654422bf-e75f-44dc-936d-188890a746ce(de.slisson.mps.reflection)</dependency>
         <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
         <dependency reexport="false">7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)</dependency>
+        <dependency reexport="false" scope="design">5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -55,6 +56,7 @@
         <module reference="06d59c2a-d30e-4e81-8b45-772ebdc956f5(de.slisson.mps.reflection#5820306262934157507)" version="0" />
         <module reference="7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" 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="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -129,6 +131,20 @@
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
+        <mapping-priority-rule kind="strictly_before">
+          <greater-priority-mapping>
+            <generator generatorUID="06d59c2a-d30e-4e81-8b45-772ebdc956f5(de.slisson.mps.reflection#5820306262934157507)" />
+            <external-mapping>
+              <all-local-mappings />
+            </external-mapping>
+          </greater-priority-mapping>
+          <lesser-priority-mapping>
+            <generator generatorUID="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" />
+            <external-mapping>
+              <all-local-mappings />
+            </external-mapping>
+          </lesser-priority-mapping>
+        </mapping-priority-rule>
       </mapping-priorities>
     </generator>
   </generators>
diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
index 05ce4b17a..cc6a3fbf8 100644
--- a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
+++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cellProviders.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cellProviders.mps
index c0cb7944e..e66ddc93c 100644
--- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cellProviders.mps
+++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cellProviders.mps
@@ -14,9 +14,14 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="p9jd" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.lang.editor.cellProviders(MPS.Editor/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -53,9 +58,11 @@
       <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
         <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -80,6 +87,11 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -163,6 +175,25 @@
         </node>
       </node>
       <node concept="3clFbS" id="7Pi_Fu5SfIA" role="3clF47">
+        <node concept="3clFbF" id="6zwr99Mojd_" role="3cqZAp">
+          <node concept="3vZ8r8" id="6zwr99MojXL" role="3clFbG">
+            <node concept="3clFbC" id="6zwr99MomH6" role="37vLTx">
+              <node concept="10Nm6u" id="6zwr99Monf8" role="3uHU7w" />
+              <node concept="2OqwBi" id="6zwr99Mom4e" role="3uHU7B">
+                <node concept="1rXfSq" id="6zwr99MolmY" role="2Oq$k0">
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode()" resolve="getSNode" />
+                </node>
+                <node concept="liA8E" id="6zwr99Momq3" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6zwr99Mojdz" role="37vLTJ">
+              <ref role="3cqZAo" to="emqf:~CellProviderWithRole.myReadOnly" resolve="myReadOnly" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6zwr99Mqjm2" role="3cqZAp" />
         <node concept="3cpWs8" id="7Pi_Fu5Sqnd" role="3cqZAp">
           <node concept="3cpWsn" id="7Pi_Fu5Sqne" role="3cpWs9">
             <property role="TrG5h" value="propertyAccessor" />
diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
index 4b322a7d7..f76b9d042 100644
--- a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
+++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
@@ -6,9 +6,10 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl
index 67e336e95..4926ef82d 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -21,6 +21,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l: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" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -34,7 +35,9 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.structure.mps b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.structure.mps
index 405f362bc..cfbd5a9f1 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.structure.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:113e4461-2e6e-434f-919f-6f28fd5e4021(de.itemis.mps.editor.pagination.demolang.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.typesystem.mps b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.typesystem.mps
index e68bc3f1a..c8c09fb93 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.typesystem.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/models/de.itemis.mps.editor.pagination.demolang.typesystem.mps
@@ -2,8 +2,7 @@
 <model ref="r:83a1e550-49fc-49c5-9773-3062c63a5789(de.itemis.mps.editor.pagination.demolang.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
   <registry />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
index 6c6204c86..46087e1eb 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
@@ -95,6 +95,7 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l: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" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -108,9 +109,11 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.structure.mps b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.structure.mps
index 698ab1f3c..a6de38177 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.structure.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.structure.mps
@@ -2,8 +2,8 @@
 <model ref="r:7f43e4ab-5881-4ab5-a0b9-d27c04d2a2ce(de.itemis.mps.editor.pagination.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.typesystem.mps b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.typesystem.mps
index 8430d121c..aa9793b48 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.typesystem.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.typesystem.mps
@@ -2,8 +2,7 @@
 <model ref="r:8d3c184d-df8e-4e84-be7f-15365e75a64c(de.itemis.mps.editor.pagination.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
   <registry />
diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.demolang.sandbox/de.itemis.mps.editor.pagination.demolang.sandbox.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.demolang.sandbox/de.itemis.mps.editor.pagination.demolang.sandbox.msd
index 65845c8d6..decfe85ac 100644
--- a/code/pagination/solutions/de.itemis.mps.editor.pagination.demolang.sandbox/de.itemis.mps.editor.pagination.demolang.sandbox.msd
+++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.demolang.sandbox/de.itemis.mps.editor.pagination.demolang.sandbox.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
index 34f5f3508..b219968e7 100644
--- a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
+++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
index 58a4e5cfb..9da79e4eb 100644
--- a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
+++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
@@ -6,9 +6,10 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
index 0c5c1b657..2f365af1a 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:744546b3-28d0-4d16-91c8-8f406ef84c6e(com.mbeddr.mpsutil.projectview.runtime)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -29,7 +30,10 @@
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
     <import index="mmaq" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom(org.jdom/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
     <import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" implicit="true" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
     <language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
@@ -223,6 +227,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -6461,9 +6468,19 @@
             </node>
             <node concept="3clFbJ" id="4jHuzb0CHB_" role="3cqZAp">
               <node concept="3clFbS" id="4jHuzb0CHBB" role="3clFbx">
-                <node concept="3clFbF" id="4jHuzb0CQxg" role="3cqZAp">
-                  <node concept="1rXfSq" id="4jHuzb0CQxe" role="3clFbG">
-                    <ref role="37wK5l" node="VPgi8egh6x" resolve="dispose" />
+                <node concept="3clFbF" id="Mi95F9j2fq" role="3cqZAp">
+                  <node concept="2YIFZM" id="Mi95F9j53T" role="3clFbG">
+                    <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
+                    <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+                    <node concept="1bVj0M" id="Mi95F9j7Hv" role="37wK5m">
+                      <node concept="3clFbS" id="Mi95F9j7Hw" role="1bW5cS">
+                        <node concept="3clFbF" id="Mi95F9jaIA" role="3cqZAp">
+                          <node concept="1rXfSq" id="Mi95F9jaI_" role="3clFbG">
+                            <ref role="37wK5l" node="VPgi8egh6x" resolve="dispose" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
                 <node concept="3cpWs6" id="4jHuzb0Dm$g" role="3cqZAp" />
@@ -6499,9 +6516,19 @@
             <ref role="3cqZAo" node="7JEoLgTCJo6" resolve="unloadedModules" />
           </node>
         </node>
-        <node concept="3clFbF" id="7eKnO66oBx2" role="3cqZAp">
-          <node concept="1rXfSq" id="7eKnO66oBx0" role="3clFbG">
-            <ref role="37wK5l" node="7eKnO66ousy" resolve="syncViews" />
+        <node concept="3clFbF" id="Mi95F9jgTV" role="3cqZAp">
+          <node concept="2YIFZM" id="Mi95F9jjCn" role="3clFbG">
+            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
+            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+            <node concept="1bVj0M" id="Mi95F9jmYA" role="37wK5m">
+              <node concept="3clFbS" id="Mi95F9jmYB" role="1bW5cS">
+                <node concept="3clFbF" id="Mi95F9jp5N" role="3cqZAp">
+                  <node concept="1rXfSq" id="Mi95F9jp5M" role="3clFbG">
+                    <ref role="37wK5l" node="7eKnO66ousy" resolve="syncViews" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -6726,86 +6753,96 @@
           </node>
         </node>
         <node concept="3clFbH" id="VPgi8etLeg" role="3cqZAp" />
-        <node concept="2Gpval" id="VPgi8etM7l" role="3cqZAp">
-          <node concept="2GrKxI" id="VPgi8etM7n" role="2Gsz3X">
-            <property role="TrG5h" value="activeView" />
-          </node>
-          <node concept="3clFbS" id="VPgi8etM7p" role="2LFqv$">
-            <node concept="3clFbJ" id="VPgi8etOJu" role="3cqZAp">
-              <node concept="3clFbS" id="VPgi8etOJv" role="3clFbx">
-                <node concept="3clFbF" id="VPgi8eu5KS" role="3cqZAp">
-                  <node concept="1rXfSq" id="VPgi8eu5KR" role="3clFbG">
-                    <ref role="37wK5l" node="VPgi8eu22M" resolve="deactivateView" />
-                    <node concept="2GrUjf" id="VPgi8eu5MC" role="37wK5m">
-                      <ref role="2Gs0qQ" node="VPgi8etM7n" resolve="activeView" />
-                    </node>
-                    <node concept="37vLTw" id="VPgi8eu5WY" role="37wK5m">
-                      <ref role="3cqZAo" node="VPgi8etIG2" resolve="project" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="VPgi8etQyi" role="3clFbw">
-                <node concept="2OqwBi" id="VPgi8etQyk" role="3fr31v">
-                  <node concept="37vLTw" id="VPgi8etQyl" role="2Oq$k0">
-                    <ref role="3cqZAo" node="VPgi8etKFY" resolve="registeredViews" />
-                  </node>
-                  <node concept="3JPx81" id="VPgi8etQym" role="2OqNvi">
-                    <node concept="2GrUjf" id="VPgi8etQyn" role="25WWJ7">
-                      <ref role="2Gs0qQ" node="VPgi8etM7n" resolve="activeView" />
+        <node concept="3clFbF" id="Mi95F9iK4R" role="3cqZAp">
+          <node concept="2YIFZM" id="Mi95F9iNaP" role="3clFbG">
+            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
+            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+            <node concept="1bVj0M" id="Mi95F9iPNB" role="37wK5m">
+              <node concept="3clFbS" id="Mi95F9iPNC" role="1bW5cS">
+                <node concept="2Gpval" id="VPgi8etM7l" role="3cqZAp">
+                  <node concept="2GrKxI" id="VPgi8etM7n" role="2Gsz3X">
+                    <property role="TrG5h" value="activeView" />
+                  </node>
+                  <node concept="3clFbS" id="VPgi8etM7p" role="2LFqv$">
+                    <node concept="3clFbJ" id="VPgi8etOJu" role="3cqZAp">
+                      <node concept="3clFbS" id="VPgi8etOJv" role="3clFbx">
+                        <node concept="3clFbF" id="VPgi8eu5KS" role="3cqZAp">
+                          <node concept="1rXfSq" id="VPgi8eu5KR" role="3clFbG">
+                            <ref role="37wK5l" node="VPgi8eu22M" resolve="deactivateView" />
+                            <node concept="2GrUjf" id="VPgi8eu5MC" role="37wK5m">
+                              <ref role="2Gs0qQ" node="VPgi8etM7n" resolve="activeView" />
+                            </node>
+                            <node concept="37vLTw" id="VPgi8eu5WY" role="37wK5m">
+                              <ref role="3cqZAo" node="VPgi8etIG2" resolve="project" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="VPgi8etQyi" role="3clFbw">
+                        <node concept="2OqwBi" id="VPgi8etQyk" role="3fr31v">
+                          <node concept="37vLTw" id="VPgi8etQyl" role="2Oq$k0">
+                            <ref role="3cqZAo" node="VPgi8etKFY" resolve="registeredViews" />
+                          </node>
+                          <node concept="3JPx81" id="VPgi8etQym" role="2OqNvi">
+                            <node concept="2GrUjf" id="VPgi8etQyn" role="25WWJ7">
+                              <ref role="2Gs0qQ" node="VPgi8etM7n" resolve="activeView" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="7Agbz76VTZq" role="2GsD0m">
-            <node concept="2OqwBi" id="VPgi8etMEV" role="2Oq$k0">
-              <node concept="37vLTw" id="VPgi8etMof" role="2Oq$k0">
-                <ref role="3cqZAo" node="VPgi8etJve" resolve="activeViews" />
-              </node>
-              <node concept="3lbrtF" id="VPgi8etNSZ" role="2OqNvi" />
-            </node>
-            <node concept="ANE8D" id="7Agbz76VV3O" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="VPgi8etLQL" role="3cqZAp" />
-        <node concept="2Gpval" id="VPgi8etJvJ" role="3cqZAp">
-          <node concept="2GrKxI" id="VPgi8etJvK" role="2Gsz3X">
-            <property role="TrG5h" value="registeredView" />
-          </node>
-          <node concept="3clFbS" id="VPgi8etJvL" role="2LFqv$">
-            <node concept="3clFbJ" id="VPgi8eu7XW" role="3cqZAp">
-              <node concept="3clFbS" id="VPgi8eu7XY" role="3clFbx">
-                <node concept="3clFbF" id="VPgi8eudXF" role="3cqZAp">
-                  <node concept="1rXfSq" id="VPgi8eudXE" role="3clFbG">
-                    <ref role="37wK5l" node="VPgi8etShJ" resolve="activateView" />
-                    <node concept="2GrUjf" id="VPgi8eudZr" role="37wK5m">
-                      <ref role="2Gs0qQ" node="VPgi8etJvK" resolve="registeredView" />
-                    </node>
-                    <node concept="37vLTw" id="VPgi8eueb$" role="37wK5m">
-                      <ref role="3cqZAo" node="VPgi8etIG2" resolve="project" />
+                  <node concept="2OqwBi" id="7Agbz76VTZq" role="2GsD0m">
+                    <node concept="2OqwBi" id="VPgi8etMEV" role="2Oq$k0">
+                      <node concept="37vLTw" id="VPgi8etMof" role="2Oq$k0">
+                        <ref role="3cqZAo" node="VPgi8etJve" resolve="activeViews" />
+                      </node>
+                      <node concept="3lbrtF" id="VPgi8etNSZ" role="2OqNvi" />
                     </node>
+                    <node concept="ANE8D" id="7Agbz76VV3O" role="2OqNvi" />
                   </node>
                 </node>
-              </node>
-              <node concept="3fqX7Q" id="VPgi8eua5T" role="3clFbw">
-                <node concept="2OqwBi" id="VPgi8eucPz" role="3fr31v">
-                  <node concept="37vLTw" id="VPgi8eua5W" role="2Oq$k0">
-                    <ref role="3cqZAo" node="VPgi8etJve" resolve="activeViews" />
+                <node concept="3clFbH" id="VPgi8etLQL" role="3cqZAp" />
+                <node concept="2Gpval" id="VPgi8etJvJ" role="3cqZAp">
+                  <node concept="2GrKxI" id="VPgi8etJvK" role="2Gsz3X">
+                    <property role="TrG5h" value="registeredView" />
                   </node>
-                  <node concept="2Nt0df" id="VPgi8eudzC" role="2OqNvi">
-                    <node concept="2GrUjf" id="VPgi8eudJ1" role="38cxEo">
-                      <ref role="2Gs0qQ" node="VPgi8etJvK" resolve="registeredView" />
+                  <node concept="3clFbS" id="VPgi8etJvL" role="2LFqv$">
+                    <node concept="3clFbJ" id="VPgi8eu7XW" role="3cqZAp">
+                      <node concept="3clFbS" id="VPgi8eu7XY" role="3clFbx">
+                        <node concept="3clFbF" id="VPgi8eudXF" role="3cqZAp">
+                          <node concept="1rXfSq" id="VPgi8eudXE" role="3clFbG">
+                            <ref role="37wK5l" node="VPgi8etShJ" resolve="activateView" />
+                            <node concept="2GrUjf" id="VPgi8eudZr" role="37wK5m">
+                              <ref role="2Gs0qQ" node="VPgi8etJvK" resolve="registeredView" />
+                            </node>
+                            <node concept="37vLTw" id="VPgi8eueb$" role="37wK5m">
+                              <ref role="3cqZAo" node="VPgi8etIG2" resolve="project" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="VPgi8eua5T" role="3clFbw">
+                        <node concept="2OqwBi" id="VPgi8eucPz" role="3fr31v">
+                          <node concept="37vLTw" id="VPgi8eua5W" role="2Oq$k0">
+                            <ref role="3cqZAo" node="VPgi8etJve" resolve="activeViews" />
+                          </node>
+                          <node concept="2Nt0df" id="VPgi8eudzC" role="2OqNvi">
+                            <node concept="2GrUjf" id="VPgi8eudJ1" role="38cxEo">
+                              <ref role="2Gs0qQ" node="VPgi8etJvK" resolve="registeredView" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="VPgi8eu7lW" role="2GsD0m">
+                    <ref role="3cqZAo" node="VPgi8etKFY" resolve="registeredViews" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="VPgi8eu7lW" role="2GsD0m">
-            <ref role="3cqZAo" node="VPgi8etKFY" resolve="registeredViews" />
-          </node>
         </node>
         <node concept="3clFbH" id="2lGHmHy8F4D" role="3cqZAp" />
         <node concept="3clFbJ" id="6wPHEU$jmx_" role="3cqZAp">
@@ -6926,113 +6963,103 @@
           </node>
         </node>
         <node concept="3clFbH" id="VPgi8eufIu" role="3cqZAp" />
-        <node concept="3clFbF" id="1md9KyKAArR" role="3cqZAp">
-          <node concept="2YIFZM" id="1md9KyKAAx8" role="3clFbG">
-            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
-            <node concept="1bVj0M" id="1md9KyKAA_p" role="37wK5m">
-              <node concept="3clFbS" id="1md9KyKAA_q" role="1bW5cS">
-                <node concept="3cpWs8" id="5ecqeSaHcBo" role="3cqZAp">
-                  <node concept="3cpWsn" id="5ecqeSaHcBp" role="3cpWs9">
-                    <property role="TrG5h" value="paneState" />
-                    <node concept="3uibUv" id="5ecqeSaHcAX" role="1tU5fm">
-                      <ref role="3uigEE" to="mmaq:~Element" resolve="Element" />
+        <node concept="3cpWs8" id="5ecqeSaHcBo" role="3cqZAp">
+          <node concept="3cpWsn" id="5ecqeSaHcBp" role="3cpWs9">
+            <property role="TrG5h" value="paneState" />
+            <node concept="3uibUv" id="5ecqeSaHcAX" role="1tU5fm">
+              <ref role="3uigEE" to="mmaq:~Element" resolve="Element" />
+            </node>
+            <node concept="2OqwBi" id="5ecqeSaHcBq" role="33vP2m">
+              <node concept="2OqwBi" id="5ecqeSaHcBr" role="2Oq$k0">
+                <node concept="1eOMI4" id="5ecqeSaHcBs" role="2Oq$k0">
+                  <node concept="10QFUN" id="5ecqeSaHcBt" role="1eOMHV">
+                    <node concept="37vLTw" id="5ecqeSaHcBu" role="10QFUP">
+                      <ref role="3cqZAo" node="2ZGhpRff88S" resolve="projectView" />
                     </node>
-                    <node concept="2OqwBi" id="5ecqeSaHcBq" role="33vP2m">
-                      <node concept="2OqwBi" id="5ecqeSaHcBr" role="2Oq$k0">
-                        <node concept="1eOMI4" id="5ecqeSaHcBs" role="2Oq$k0">
-                          <node concept="10QFUN" id="5ecqeSaHcBt" role="1eOMHV">
-                            <node concept="37vLTw" id="5ecqeSaHcBu" role="10QFUP">
-                              <ref role="3cqZAo" node="2ZGhpRff88S" resolve="projectView" />
-                            </node>
-                            <node concept="3uibUv" id="5ecqeSaHcBv" role="10QFUM">
-                              <ref role="3uigEE" to="k21q:~ProjectViewImpl" resolve="ProjectViewImpl" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1PnCL0" id="5ecqeSaHcBw" role="2OqNvi">
-                          <ref role="2Oxat5" to="k21q:~ProjectViewImpl.myUninitializedPaneState" resolve="myUninitializedPaneState" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5ecqeSaHcBx" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
-                        <node concept="2OqwBi" id="5ecqeSaHcBy" role="37wK5m">
-                          <node concept="37vLTw" id="5ecqeSaHcBz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
-                          </node>
-                          <node concept="liA8E" id="5ecqeSaHcB$" role="2OqNvi">
-                            <ref role="37wK5l" to="uhdf:2ZGhpRfeyB3" resolve="getId" />
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="3uibUv" id="5ecqeSaHcBv" role="10QFUM">
+                      <ref role="3uigEE" to="k21q:~ProjectViewImpl" resolve="ProjectViewImpl" />
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbJ" id="5ecqeSaHdws" role="3cqZAp">
-                  <node concept="3clFbS" id="5ecqeSaHdwu" role="3clFbx">
-                    <node concept="3clFbF" id="5ecqeSaHf8Z" role="3cqZAp">
-                      <node concept="2OqwBi" id="5ecqeSaHf$p" role="3clFbG">
-                        <node concept="37vLTw" id="5ecqeSaHf8X" role="2Oq$k0">
-                          <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
-                        </node>
-                        <node concept="liA8E" id="5ecqeSaHg83" role="2OqNvi">
-                          <ref role="37wK5l" to="uhdf:4gq8yQBZ6YN" resolve="readExternal" />
-                          <node concept="37vLTw" id="5ecqeSaHg$1" role="37wK5m">
-                            <ref role="3cqZAo" node="5ecqeSaHcBp" resolve="paneState" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+                <node concept="1PnCL0" id="5ecqeSaHcBw" role="2OqNvi">
+                  <ref role="2Oxat5" to="k21q:~ProjectViewImpl.myUninitializedPaneState" resolve="myUninitializedPaneState" />
+                </node>
+              </node>
+              <node concept="liA8E" id="5ecqeSaHcBx" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="2OqwBi" id="5ecqeSaHcBy" role="37wK5m">
+                  <node concept="37vLTw" id="5ecqeSaHcBz" role="2Oq$k0">
+                    <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
                   </node>
-                  <node concept="3y3z36" id="5ecqeSaHe_a" role="3clFbw">
-                    <node concept="10Nm6u" id="5ecqeSaHeHo" role="3uHU7w" />
-                    <node concept="37vLTw" id="5ecqeSaHdTx" role="3uHU7B">
-                      <ref role="3cqZAo" node="5ecqeSaHcBp" resolve="paneState" />
-                    </node>
+                  <node concept="liA8E" id="5ecqeSaHcB$" role="2OqNvi">
+                    <ref role="37wK5l" to="uhdf:2ZGhpRfeyB3" resolve="getId" />
                   </node>
                 </node>
-                <node concept="3clFbF" id="63vN1tgoJVZ" role="3cqZAp">
-                  <node concept="2OqwBi" id="63vN1tgoJW0" role="3clFbG">
-                    <node concept="37vLTw" id="63vN1tgoJW1" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2ZGhpRff88S" resolve="projectView" />
-                    </node>
-                    <node concept="liA8E" id="63vN1tgoJW2" role="2OqNvi">
-                      <ref role="37wK5l" to="bnjk:~ProjectView.addProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="addProjectPane" />
-                      <node concept="37vLTw" id="63vN1tgoJW3" role="37wK5m">
-                        <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
-                      </node>
-                    </node>
-                  </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5ecqeSaHdws" role="3cqZAp">
+          <node concept="3clFbS" id="5ecqeSaHdwu" role="3clFbx">
+            <node concept="3clFbF" id="5ecqeSaHf8Z" role="3cqZAp">
+              <node concept="2OqwBi" id="5ecqeSaHf$p" role="3clFbG">
+                <node concept="37vLTw" id="5ecqeSaHf8X" role="2Oq$k0">
+                  <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
                 </node>
-                <node concept="3clFbF" id="56aJbp3MbDG" role="3cqZAp">
-                  <node concept="2OqwBi" id="56aJbp3MtJb" role="3clFbG">
-                    <node concept="2OqwBi" id="56aJbp3MhDc" role="2Oq$k0">
-                      <node concept="10M0yZ" id="56aJbp3MecH" role="2Oq$k0">
-                        <ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
-                        <ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
-                      </node>
-                      <node concept="liA8E" id="56aJbp3Ml$n" role="2OqNvi">
-                        <ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
-                        <node concept="37vLTw" id="56aJbp3M_t4" role="37wK5m">
-                          <ref role="3cqZAo" node="2ZGhpRffcqr" resolve="ideaProject" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="56aJbp3MCHq" role="2OqNvi">
-                      <ref role="37wK5l" to="9ti4:~ExtensionPoint.registerExtension(java.lang.Object,com.intellij.openapi.Disposable)" resolve="registerExtension" />
-                      <node concept="37vLTw" id="56aJbp3N5pS" role="37wK5m">
-                        <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
-                      </node>
-                      <node concept="2YIFZM" id="56aJbp3NULh" role="37wK5m">
-                        <ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
-                        <ref role="37wK5l" to="zn9m:~Disposer.newDisposable()" resolve="newDisposable" />
-                      </node>
-                    </node>
+                <node concept="liA8E" id="5ecqeSaHg83" role="2OqNvi">
+                  <ref role="37wK5l" to="uhdf:4gq8yQBZ6YN" resolve="readExternal" />
+                  <node concept="37vLTw" id="5ecqeSaHg$1" role="37wK5m">
+                    <ref role="3cqZAo" node="5ecqeSaHcBp" resolve="paneState" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3y3z36" id="5ecqeSaHe_a" role="3clFbw">
+            <node concept="10Nm6u" id="5ecqeSaHeHo" role="3uHU7w" />
+            <node concept="37vLTw" id="5ecqeSaHdTx" role="3uHU7B">
+              <ref role="3cqZAo" node="5ecqeSaHcBp" resolve="paneState" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="63vN1tgoJVZ" role="3cqZAp">
+          <node concept="2OqwBi" id="63vN1tgoJW0" role="3clFbG">
+            <node concept="37vLTw" id="63vN1tgoJW1" role="2Oq$k0">
+              <ref role="3cqZAo" node="2ZGhpRff88S" resolve="projectView" />
+            </node>
+            <node concept="liA8E" id="63vN1tgoJW2" role="2OqNvi">
+              <ref role="37wK5l" to="bnjk:~ProjectView.addProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="addProjectPane" />
+              <node concept="37vLTw" id="63vN1tgoJW3" role="37wK5m">
+                <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="56aJbp3MbDG" role="3cqZAp">
+          <node concept="2OqwBi" id="56aJbp3MtJb" role="3clFbG">
+            <node concept="2OqwBi" id="56aJbp3MhDc" role="2Oq$k0">
+              <node concept="10M0yZ" id="56aJbp3MecH" role="2Oq$k0">
+                <ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
+                <ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
+              </node>
+              <node concept="liA8E" id="56aJbp3Ml$n" role="2OqNvi">
+                <ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
+                <node concept="37vLTw" id="56aJbp3M_t4" role="37wK5m">
+                  <ref role="3cqZAo" node="2ZGhpRffcqr" resolve="ideaProject" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="56aJbp3MCHq" role="2OqNvi">
+              <ref role="37wK5l" to="9ti4:~ExtensionPoint.registerExtension(java.lang.Object,com.intellij.openapi.Disposable)" resolve="registerExtension" />
+              <node concept="37vLTw" id="56aJbp3N5pS" role="37wK5m">
+                <ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
+              </node>
+              <node concept="2YIFZM" id="56aJbp3NULh" role="37wK5m">
+                <ref role="37wK5l" to="zn9m:~Disposer.newDisposable()" resolve="newDisposable" />
+                <ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
@@ -7093,105 +7120,95 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1md9KyKAA7H" role="3cqZAp">
-          <node concept="2YIFZM" id="1md9KyKAAe4" role="3clFbG">
-            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
-            <node concept="1bVj0M" id="1md9KyKAAf1" role="37wK5m">
-              <node concept="3clFbS" id="1md9KyKAAf2" role="1bW5cS">
-                <node concept="3cpWs8" id="VPgi8eujhL" role="3cqZAp">
-                  <node concept="3cpWsn" id="VPgi8eujhM" role="3cpWs9">
-                    <property role="TrG5h" value="ideaProject" />
-                    <node concept="3uibUv" id="VPgi8eujhN" role="1tU5fm">
-                      <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-                    </node>
-                    <node concept="2YIFZM" id="VPgi8eujhO" role="33vP2m">
-                      <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                      <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-                      <node concept="37vLTw" id="VPgi8eujhP" role="37wK5m">
-                        <ref role="3cqZAo" node="VPgi8eu22P" resolve="project" />
-                      </node>
-                    </node>
-                  </node>
+        <node concept="3cpWs8" id="VPgi8eujhL" role="3cqZAp">
+          <node concept="3cpWsn" id="VPgi8eujhM" role="3cpWs9">
+            <property role="TrG5h" value="ideaProject" />
+            <node concept="3uibUv" id="VPgi8eujhN" role="1tU5fm">
+              <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+            </node>
+            <node concept="2YIFZM" id="VPgi8eujhO" role="33vP2m">
+              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
+              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+              <node concept="37vLTw" id="VPgi8eujhP" role="37wK5m">
+                <ref role="3cqZAo" node="VPgi8eu22P" resolve="project" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="__MPZJDQ31" role="3cqZAp">
+          <node concept="3clFbS" id="__MPZJDQ33" role="3clFbx">
+            <node concept="3cpWs8" id="VPgi8eujhQ" role="3cqZAp">
+              <node concept="3cpWsn" id="VPgi8eujhR" role="3cpWs9">
+                <property role="TrG5h" value="projectView" />
+                <node concept="3uibUv" id="VPgi8eujhS" role="1tU5fm">
+                  <ref role="3uigEE" to="bnjk:~ProjectView" resolve="ProjectView" />
                 </node>
-                <node concept="3clFbJ" id="__MPZJDQ31" role="3cqZAp">
-                  <node concept="3clFbS" id="__MPZJDQ33" role="3clFbx">
-                    <node concept="3cpWs8" id="VPgi8eujhQ" role="3cqZAp">
-                      <node concept="3cpWsn" id="VPgi8eujhR" role="3cpWs9">
-                        <property role="TrG5h" value="projectView" />
-                        <node concept="3uibUv" id="VPgi8eujhS" role="1tU5fm">
-                          <ref role="3uigEE" to="bnjk:~ProjectView" resolve="ProjectView" />
-                        </node>
-                        <node concept="2YIFZM" id="VPgi8eujhT" role="33vP2m">
-                          <ref role="1Pybhc" to="bnjk:~ProjectView" resolve="ProjectView" />
-                          <ref role="37wK5l" to="bnjk:~ProjectView.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
-                          <node concept="37vLTw" id="VPgi8eujhU" role="37wK5m">
-                            <ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="63vN1tgoJUw" role="3cqZAp">
-                      <node concept="2OqwBi" id="63vN1tgoJUx" role="3clFbG">
-                        <node concept="37vLTw" id="63vN1tgoJUy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="VPgi8eujhR" resolve="projectView" />
-                        </node>
-                        <node concept="liA8E" id="63vN1tgoJUz" role="2OqNvi">
-                          <ref role="37wK5l" to="bnjk:~ProjectView.removeProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="removeProjectPane" />
-                          <node concept="37vLTw" id="63vN1tgoJU$" role="37wK5m">
-                            <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="__MPZJDQGQ" role="3clFbw">
-                    <node concept="2OqwBi" id="__MPZJDQGS" role="3fr31v">
-                      <node concept="37vLTw" id="__MPZJDQGT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="VPgi8eu22P" resolve="project" />
-                      </node>
-                      <node concept="liA8E" id="__MPZJDQGU" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.isDisposed()" resolve="isDisposed" />
-                      </node>
-                    </node>
+                <node concept="2YIFZM" id="VPgi8eujhT" role="33vP2m">
+                  <ref role="37wK5l" to="bnjk:~ProjectView.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
+                  <ref role="1Pybhc" to="bnjk:~ProjectView" resolve="ProjectView" />
+                  <node concept="37vLTw" id="VPgi8eujhU" role="37wK5m">
+                    <ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
                   </node>
                 </node>
-                <node concept="3clFbF" id="56aJbp3NtF5" role="3cqZAp">
-                  <node concept="2OqwBi" id="56aJbp3NtF6" role="3clFbG">
-                    <node concept="2OqwBi" id="56aJbp3NtF7" role="2Oq$k0">
-                      <node concept="10M0yZ" id="56aJbp3NtF8" role="2Oq$k0">
-                        <ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
-                        <ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
-                      </node>
-                      <node concept="liA8E" id="56aJbp3NtF9" role="2OqNvi">
-                        <ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
-                        <node concept="37vLTw" id="56aJbp3NtFa" role="37wK5m">
-                          <ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="56aJbp3NtFb" role="2OqNvi">
-                      <ref role="37wK5l" to="9ti4:~ExtensionPoint.unregisterExtension(java.lang.Object)" resolve="unregisterExtension" />
-                      <node concept="37vLTw" id="56aJbp3NtFc" role="37wK5m">
-                        <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
-                      </node>
-                    </node>
-                  </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="63vN1tgoJUw" role="3cqZAp">
+              <node concept="2OqwBi" id="63vN1tgoJUx" role="3clFbG">
+                <node concept="37vLTw" id="63vN1tgoJUy" role="2Oq$k0">
+                  <ref role="3cqZAo" node="VPgi8eujhR" resolve="projectView" />
                 </node>
-                <node concept="3clFbH" id="56aJbp3PsVr" role="3cqZAp" />
-                <node concept="3clFbF" id="6B7erwvFIwS" role="3cqZAp">
-                  <node concept="2OqwBi" id="6B7erwvFIGa" role="3clFbG">
-                    <node concept="37vLTw" id="6B7erwvFIwQ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
-                    </node>
-                    <node concept="liA8E" id="6B7erwvFJhq" role="2OqNvi">
-                      <ref role="37wK5l" to="uhdf:6B7erwvFKhe" resolve="dispose" />
-                    </node>
+                <node concept="liA8E" id="63vN1tgoJUz" role="2OqNvi">
+                  <ref role="37wK5l" to="bnjk:~ProjectView.removeProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="removeProjectPane" />
+                  <node concept="37vLTw" id="63vN1tgoJU$" role="37wK5m">
+                    <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3fqX7Q" id="__MPZJDQGQ" role="3clFbw">
+            <node concept="2OqwBi" id="__MPZJDQGS" role="3fr31v">
+              <node concept="37vLTw" id="__MPZJDQGT" role="2Oq$k0">
+                <ref role="3cqZAo" node="VPgi8eu22P" resolve="project" />
+              </node>
+              <node concept="liA8E" id="__MPZJDQGU" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.isDisposed()" resolve="isDisposed" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="56aJbp3NtF5" role="3cqZAp">
+          <node concept="2OqwBi" id="56aJbp3NtF6" role="3clFbG">
+            <node concept="2OqwBi" id="56aJbp3NtF7" role="2Oq$k0">
+              <node concept="10M0yZ" id="56aJbp3NtF8" role="2Oq$k0">
+                <ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
+                <ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
+              </node>
+              <node concept="liA8E" id="56aJbp3NtF9" role="2OqNvi">
+                <ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
+                <node concept="37vLTw" id="56aJbp3NtFa" role="37wK5m">
+                  <ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="56aJbp3NtFb" role="2OqNvi">
+              <ref role="37wK5l" to="9ti4:~ExtensionPoint.unregisterExtension(java.lang.Object)" resolve="unregisterExtension" />
+              <node concept="37vLTw" id="56aJbp3NtFc" role="37wK5m">
+                <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="56aJbp3PsVr" role="3cqZAp" />
+        <node concept="3clFbF" id="6B7erwvFIwS" role="3cqZAp">
+          <node concept="2OqwBi" id="6B7erwvFIGa" role="3clFbG">
+            <node concept="37vLTw" id="6B7erwvFIwQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
+            </node>
+            <node concept="liA8E" id="6B7erwvFJhq" role="2OqNvi">
+              <ref role="37wK5l" to="uhdf:6B7erwvFKhe" resolve="dispose" />
+            </node>
+          </node>
         </node>
       </node>
     </node>
@@ -7226,82 +7243,72 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="2cYoH3s55BG" role="3cqZAp">
-          <node concept="2YIFZM" id="2cYoH3s55V_" role="3clFbG">
-            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadAndWait(java.lang.Runnable)" resolve="runInUIThreadAndWait" />
-            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <node concept="1bVj0M" id="2cYoH3s56ot" role="37wK5m">
-              <node concept="3clFbS" id="2cYoH3s56ou" role="1bW5cS">
-                <node concept="3cpWs8" id="2cYoH3s56SM" role="3cqZAp">
-                  <node concept="3cpWsn" id="2cYoH3s56SN" role="3cpWs9">
-                    <property role="TrG5h" value="ideaProject" />
-                    <node concept="3uibUv" id="2cYoH3s56SO" role="1tU5fm">
-                      <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-                    </node>
-                    <node concept="2YIFZM" id="2cYoH3s57d_" role="33vP2m">
-                      <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-                      <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                      <node concept="37vLTw" id="2cYoH3s57rl" role="37wK5m">
-                        <ref role="3cqZAo" node="2cYoH3s4gc1" resolve="project" />
-                      </node>
-                    </node>
-                  </node>
+        <node concept="3cpWs8" id="2cYoH3s56SM" role="3cqZAp">
+          <node concept="3cpWsn" id="2cYoH3s56SN" role="3cpWs9">
+            <property role="TrG5h" value="ideaProject" />
+            <node concept="3uibUv" id="2cYoH3s56SO" role="1tU5fm">
+              <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+            </node>
+            <node concept="2YIFZM" id="2cYoH3s57d_" role="33vP2m">
+              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
+              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+              <node concept="37vLTw" id="2cYoH3s57rl" role="37wK5m">
+                <ref role="3cqZAo" node="2cYoH3s4gc1" resolve="project" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2cYoH3s57FZ" role="3cqZAp">
+          <node concept="3clFbS" id="2cYoH3s57G1" role="3clFbx">
+            <node concept="3cpWs8" id="2cYoH3s59Hb" role="3cqZAp">
+              <node concept="3cpWsn" id="2cYoH3s59Hc" role="3cpWs9">
+                <property role="TrG5h" value="projectView" />
+                <node concept="3uibUv" id="2cYoH3s59Hd" role="1tU5fm">
+                  <ref role="3uigEE" to="bnjk:~ProjectView" resolve="ProjectView" />
                 </node>
-                <node concept="3clFbJ" id="2cYoH3s57FZ" role="3cqZAp">
-                  <node concept="3clFbS" id="2cYoH3s57G1" role="3clFbx">
-                    <node concept="3cpWs8" id="2cYoH3s59Hb" role="3cqZAp">
-                      <node concept="3cpWsn" id="2cYoH3s59Hc" role="3cpWs9">
-                        <property role="TrG5h" value="projectView" />
-                        <node concept="3uibUv" id="2cYoH3s59Hd" role="1tU5fm">
-                          <ref role="3uigEE" to="bnjk:~ProjectView" resolve="ProjectView" />
-                        </node>
-                        <node concept="2YIFZM" id="2cYoH3s5aul" role="33vP2m">
-                          <ref role="37wK5l" to="bnjk:~ProjectView.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
-                          <ref role="1Pybhc" to="bnjk:~ProjectView" resolve="ProjectView" />
-                          <node concept="37vLTw" id="2cYoH3s5aTf" role="37wK5m">
-                            <ref role="3cqZAo" node="2cYoH3s56SN" resolve="ideaProject" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="2cYoH3s5blA" role="3cqZAp">
-                      <node concept="2OqwBi" id="2cYoH3s5bDm" role="3clFbG">
-                        <node concept="37vLTw" id="2cYoH3s5bl$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2cYoH3s59Hc" resolve="projectView" />
-                        </node>
-                        <node concept="liA8E" id="2cYoH3s5bLn" role="2OqNvi">
-                          <ref role="37wK5l" to="bnjk:~ProjectView.removeProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="removeProjectPane" />
-                          <node concept="37vLTw" id="2cYoH3s5c0n" role="37wK5m">
-                            <ref role="3cqZAo" node="2cYoH3s4eCf" resolve="pane" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="2cYoH3s57TE" role="3clFbw">
-                    <node concept="2OqwBi" id="2cYoH3s58Ot" role="3fr31v">
-                      <node concept="37vLTw" id="2cYoH3s58jA" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2cYoH3s4gc1" resolve="project" />
-                      </node>
-                      <node concept="liA8E" id="2cYoH3s59gu" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.isDisposed()" resolve="isDisposed" />
-                      </node>
-                    </node>
+                <node concept="2YIFZM" id="2cYoH3s5aul" role="33vP2m">
+                  <ref role="37wK5l" to="bnjk:~ProjectView.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
+                  <ref role="1Pybhc" to="bnjk:~ProjectView" resolve="ProjectView" />
+                  <node concept="37vLTw" id="2cYoH3s5aTf" role="37wK5m">
+                    <ref role="3cqZAo" node="2cYoH3s56SN" resolve="ideaProject" />
                   </node>
                 </node>
-                <node concept="3clFbF" id="2cYoH3s5cn3" role="3cqZAp">
-                  <node concept="2OqwBi" id="2cYoH3s5cYJ" role="3clFbG">
-                    <node concept="37vLTw" id="2cYoH3s5cn1" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2cYoH3s4eCf" resolve="pane" />
-                    </node>
-                    <node concept="liA8E" id="2cYoH3s5dOq" role="2OqNvi">
-                      <ref role="37wK5l" to="uhdf:6B7erwvFKhe" resolve="dispose" />
-                    </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2cYoH3s5blA" role="3cqZAp">
+              <node concept="2OqwBi" id="2cYoH3s5bDm" role="3clFbG">
+                <node concept="37vLTw" id="2cYoH3s5bl$" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2cYoH3s59Hc" resolve="projectView" />
+                </node>
+                <node concept="liA8E" id="2cYoH3s5bLn" role="2OqNvi">
+                  <ref role="37wK5l" to="bnjk:~ProjectView.removeProjectPane(com.intellij.ide.projectView.impl.AbstractProjectViewPane)" resolve="removeProjectPane" />
+                  <node concept="37vLTw" id="2cYoH3s5c0n" role="37wK5m">
+                    <ref role="3cqZAo" node="2cYoH3s4eCf" resolve="pane" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3fqX7Q" id="2cYoH3s57TE" role="3clFbw">
+            <node concept="2OqwBi" id="2cYoH3s58Ot" role="3fr31v">
+              <node concept="37vLTw" id="2cYoH3s58jA" role="2Oq$k0">
+                <ref role="3cqZAo" node="2cYoH3s4gc1" resolve="project" />
+              </node>
+              <node concept="liA8E" id="2cYoH3s59gu" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.isDisposed()" resolve="isDisposed" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2cYoH3s5cn3" role="3cqZAp">
+          <node concept="2OqwBi" id="2cYoH3s5cYJ" role="3clFbG">
+            <node concept="37vLTw" id="2cYoH3s5cn1" role="2Oq$k0">
+              <ref role="3cqZAo" node="2cYoH3s4eCf" resolve="pane" />
+            </node>
+            <node concept="liA8E" id="2cYoH3s5dOq" role="2OqNvi">
+              <ref role="37wK5l" to="uhdf:6B7erwvFKhe" resolve="dispose" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="2cYoH3s491n" role="1B3o_S" />
@@ -7325,16 +7332,62 @@
       <node concept="3cqZAl" id="VPgi8egh2A" role="3clF45" />
       <node concept="3Tm1VV" id="VPgi8egh2B" role="1B3o_S" />
       <node concept="3clFbS" id="VPgi8egh2C" role="3clF47">
+        <node concept="3cpWs8" id="7xHPclqQt$y" role="3cqZAp">
+          <node concept="3cpWsn" id="7xHPclqQt$z" role="3cpWs9">
+            <property role="TrG5h" value="platform" />
+            <node concept="3uibUv" id="7xHPclqQtay" role="1tU5fm">
+              <ref role="3uigEE" to="4o98:~Platform" resolve="Platform" />
+            </node>
+            <node concept="2OqwBi" id="7xHPclqQt$$" role="33vP2m">
+              <node concept="2YIFZM" id="7xHPclqQt$_" role="2Oq$k0">
+                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+              </node>
+              <node concept="liA8E" id="7xHPclqQt$A" role="2OqNvi">
+                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7xHPclqPg_j" role="3cqZAp">
+          <node concept="3cpWsn" id="7xHPclqPg_k" role="3cpWs9">
+            <property role="TrG5h" value="clsLoaderManager" />
+            <node concept="2OqwBi" id="7xHPclqPg_l" role="33vP2m">
+              <node concept="37vLTw" id="7xHPclqQt$B" role="2Oq$k0">
+                <ref role="3cqZAo" node="7xHPclqQt$z" resolve="platform" />
+              </node>
+              <node concept="liA8E" id="7xHPclqPg_p" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="7xHPclqPmmm" role="37wK5m">
+                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="7xHPclqPsKE" role="1tU5fm">
+              <ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7xHPclqPRtV" role="3cqZAp">
+          <node concept="3clFbS" id="7xHPclqPRtX" role="3clFbx">
+            <node concept="3cpWs6" id="7xHPclqQ5xQ" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="7xHPclqPYf1" role="3clFbw">
+            <node concept="10Nm6u" id="7xHPclqQ1qP" role="3uHU7w" />
+            <node concept="37vLTw" id="7xHPclqPUEF" role="3uHU7B">
+              <ref role="3cqZAo" node="7xHPclqPg_k" resolve="clsLoaderManager" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="VPgi8egh9W" role="3cqZAp">
           <node concept="2OqwBi" id="VPgi8eghcQ" role="3clFbG">
-            <node concept="2YIFZM" id="VPgi8eghca" role="2Oq$k0">
-              <ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-              <ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
-            </node>
             <node concept="liA8E" id="VPgi8eghpo" role="2OqNvi">
               <ref role="37wK5l" to="3qmy:~ClassLoaderManager.addListener(jetbrains.mps.classloading.DeployListener)" resolve="addListener" />
               <node concept="Xjq3P" id="VPgi8eghqa" role="37wK5m" />
             </node>
+            <node concept="37vLTw" id="7xHPclqPI1J" role="2Oq$k0">
+              <ref role="3cqZAo" node="7xHPclqPg_k" resolve="clsLoaderManager" />
+            </node>
           </node>
         </node>
         <node concept="3cpWs8" id="2oNsb9228bs" role="3cqZAp">
@@ -7343,12 +7396,31 @@
             <node concept="3uibUv" id="2oNsb9227La" role="1tU5fm">
               <ref role="3uigEE" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
             </node>
-            <node concept="2YIFZM" id="2oNsb9228bu" role="33vP2m">
-              <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
-              <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+            <node concept="2OqwBi" id="7xHPclqQEsf" role="33vP2m">
+              <node concept="37vLTw" id="7xHPclqQBgL" role="2Oq$k0">
+                <ref role="3cqZAo" node="7xHPclqQt$z" resolve="platform" />
+              </node>
+              <node concept="liA8E" id="7xHPclqQGXR" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="7xHPclqQNUI" role="37wK5m">
+                  <ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="7xHPclqQZeW" role="3cqZAp">
+          <node concept="3clFbS" id="7xHPclqQZeY" role="3clFbx">
+            <node concept="3cpWs6" id="7xHPclqRdBl" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="7xHPclqR5qE" role="3clFbw">
+            <node concept="10Nm6u" id="7xHPclqR9el" role="3uHU7w" />
+            <node concept="37vLTw" id="7xHPclqR22t" role="3uHU7B">
+              <ref role="3cqZAo" node="2oNsb9228bt" resolve="moduleRepository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7xHPclqQVxB" role="3cqZAp" />
         <node concept="1QHqEK" id="55UUbH_65Hc" role="3cqZAp">
           <node concept="1QHqEC" id="55UUbH_65He" role="1QHqEI">
             <node concept="3clFbS" id="55UUbH_65Hg" role="1bW5cS">
@@ -7414,64 +7486,111 @@
             <ref role="3cqZAo" node="4jHuzb0E2cg" resolve="myIsDisposed" />
           </node>
         </node>
+        <node concept="3clFbH" id="7xHPclqQ91d" role="3cqZAp" />
+        <node concept="3cpWs8" id="7xHPclqQck0" role="3cqZAp">
+          <node concept="3cpWsn" id="7xHPclqQck1" role="3cpWs9">
+            <property role="TrG5h" value="clsLoaderManager" />
+            <node concept="2OqwBi" id="7xHPclqQck2" role="33vP2m">
+              <node concept="2OqwBi" id="7xHPclqQck3" role="2Oq$k0">
+                <node concept="2YIFZM" id="7xHPclqQck4" role="2Oq$k0">
+                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                  <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                </node>
+                <node concept="liA8E" id="7xHPclqQck5" role="2OqNvi">
+                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+                </node>
+              </node>
+              <node concept="liA8E" id="7xHPclqQck6" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="7xHPclqQck7" role="37wK5m">
+                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="7xHPclqQck8" role="1tU5fm">
+              <ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7xHPclqQck9" role="3cqZAp">
+          <node concept="3clFbS" id="7xHPclqQcka" role="3clFbx">
+            <node concept="3cpWs6" id="7xHPclqQckb" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="7xHPclqQckc" role="3clFbw">
+            <node concept="10Nm6u" id="7xHPclqQckd" role="3uHU7w" />
+            <node concept="37vLTw" id="7xHPclqQcke" role="3uHU7B">
+              <ref role="3cqZAo" node="7xHPclqQck1" resolve="clsLoaderManager" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7xHPclqQcjk" role="3cqZAp" />
         <node concept="3clFbF" id="VPgi8eghQA" role="3cqZAp">
           <node concept="2OqwBi" id="VPgi8eghRK" role="3clFbG">
-            <node concept="2YIFZM" id="VPgi8eghR3" role="2Oq$k0">
-              <ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-              <ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
-            </node>
             <node concept="liA8E" id="VPgi8egi4v" role="2OqNvi">
               <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
               <node concept="Xjq3P" id="VPgi8egi5o" role="37wK5m" />
             </node>
+            <node concept="37vLTw" id="7xHPclqQiMI" role="2Oq$k0">
+              <ref role="3cqZAo" node="7xHPclqQck1" resolve="clsLoaderManager" />
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="25jQj6XR7eA" role="3cqZAp" />
-        <node concept="2Gpval" id="25jQj6XR7kx" role="3cqZAp">
-          <node concept="2GrKxI" id="25jQj6XR7kz" role="2Gsz3X">
-            <property role="TrG5h" value="projectInstances" />
-          </node>
-          <node concept="3clFbS" id="25jQj6XR7k_" role="2LFqv$">
-            <node concept="2Gpval" id="25jQj6XR98v" role="3cqZAp">
-              <node concept="2GrKxI" id="25jQj6XR98w" role="2Gsz3X">
-                <property role="TrG5h" value="instance" />
-              </node>
-              <node concept="3clFbS" id="25jQj6XR98x" role="2LFqv$">
-                <node concept="3clFbF" id="25jQj6XR9xn" role="3cqZAp">
-                  <node concept="1rXfSq" id="25jQj6XR9xm" role="3clFbG">
-                    <ref role="37wK5l" node="VPgi8eu22M" resolve="deactivateView" />
-                    <node concept="2OqwBi" id="25jQj6XR9zY" role="37wK5m">
-                      <node concept="2GrUjf" id="25jQj6XR9z6" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="25jQj6XR98w" resolve="instance" />
+        <node concept="3clFbF" id="6aToSIL9fiC" role="3cqZAp">
+          <node concept="2YIFZM" id="6aToSIL9i7u" role="3clFbG">
+            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
+            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+            <node concept="1bVj0M" id="6aToSIL9kyp" role="37wK5m">
+              <node concept="3clFbS" id="6aToSIL9kyq" role="1bW5cS">
+                <node concept="2Gpval" id="25jQj6XR7kx" role="3cqZAp">
+                  <node concept="2GrKxI" id="25jQj6XR7kz" role="2Gsz3X">
+                    <property role="TrG5h" value="projectInstances" />
+                  </node>
+                  <node concept="3clFbS" id="25jQj6XR7k_" role="2LFqv$">
+                    <node concept="2Gpval" id="25jQj6XR98v" role="3cqZAp">
+                      <node concept="2GrKxI" id="25jQj6XR98w" role="2Gsz3X">
+                        <property role="TrG5h" value="instance" />
                       </node>
-                      <node concept="3AY5_j" id="25jQj6XRcnZ" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="25jQj6XRcG0" role="37wK5m">
-                      <node concept="2GrUjf" id="25jQj6XRc$3" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="25jQj6XR7kz" resolve="projectInstances" />
+                      <node concept="3clFbS" id="25jQj6XR98x" role="2LFqv$">
+                        <node concept="3clFbF" id="25jQj6XR9xn" role="3cqZAp">
+                          <node concept="1rXfSq" id="25jQj6XR9xm" role="3clFbG">
+                            <ref role="37wK5l" node="VPgi8eu22M" resolve="deactivateView" />
+                            <node concept="2OqwBi" id="25jQj6XR9zY" role="37wK5m">
+                              <node concept="2GrUjf" id="25jQj6XR9z6" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="25jQj6XR98w" resolve="instance" />
+                              </node>
+                              <node concept="3AY5_j" id="25jQj6XRcnZ" role="2OqNvi" />
+                            </node>
+                            <node concept="2OqwBi" id="25jQj6XRcG0" role="37wK5m">
+                              <node concept="2GrUjf" id="25jQj6XRc$3" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="25jQj6XR7kz" resolve="projectInstances" />
+                              </node>
+                              <node concept="3AY5_j" id="25jQj6XRdcg" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="3WhiLkabesS" role="2GsD0m">
+                        <node concept="2OqwBi" id="25jQj6XRb3x" role="2Oq$k0">
+                          <node concept="2GrUjf" id="25jQj6XR9lH" role="2Oq$k0">
+                            <ref role="2Gs0qQ" node="25jQj6XR7kz" resolve="projectInstances" />
+                          </node>
+                          <node concept="3AV6Ez" id="25jQj6XRbVr" role="2OqNvi" />
+                        </node>
+                        <node concept="ANE8D" id="3WhiLkabfhM" role="2OqNvi" />
                       </node>
-                      <node concept="3AY5_j" id="25jQj6XRdcg" role="2OqNvi" />
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="3WhiLkabesS" role="2GsD0m">
-                <node concept="2OqwBi" id="25jQj6XRb3x" role="2Oq$k0">
-                  <node concept="2GrUjf" id="25jQj6XR9lH" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="25jQj6XR7kz" resolve="projectInstances" />
+                  <node concept="2OqwBi" id="3WhiLkabfBU" role="2GsD0m">
+                    <node concept="37vLTw" id="25jQj6XR7OT" role="2Oq$k0">
+                      <ref role="3cqZAo" node="VPgi8ehRQY" resolve="myViewInstances" />
+                    </node>
+                    <node concept="ANE8D" id="3WhiLkabgHF" role="2OqNvi" />
                   </node>
-                  <node concept="3AV6Ez" id="25jQj6XRbVr" role="2OqNvi" />
                 </node>
-                <node concept="ANE8D" id="3WhiLkabfhM" role="2OqNvi" />
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="3WhiLkabfBU" role="2GsD0m">
-            <node concept="37vLTw" id="25jQj6XR7OT" role="2Oq$k0">
-              <ref role="3cqZAo" node="VPgi8ehRQY" resolve="myViewInstances" />
-            </node>
-            <node concept="ANE8D" id="3WhiLkabgHF" role="2OqNvi" />
-          </node>
         </node>
         <node concept="3clFbH" id="4jHuzb0E6N8" role="3cqZAp" />
         <node concept="3clFbF" id="4jHuzb0E8e5" role="3cqZAp">
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps
index 97dacc881..3c7d064be 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps
@@ -9,7 +9,7 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
@@ -543,7 +543,7 @@
         </node>
         <node concept="3clFbF" id="4dJXybkiqUn" role="3cqZAp">
           <node concept="1rXfSq" id="4dJXybkiqUl" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JTree.setCellRenderer(javax.swing.tree.TreeCellRenderer):void" resolve="setCellRenderer" />
+            <ref role="37wK5l" to="dxuu:~JTree.setCellRenderer(javax.swing.tree.TreeCellRenderer)" resolve="setCellRenderer" />
             <node concept="2ShNRf" id="4dJXybkirC6" role="37wK5m">
               <node concept="1pGfFk" id="4dJXybkiJOs" role="2ShVmc">
                 <ref role="37wK5l" node="4dJXybkifu8" resolve="TreeCellRenderer" />
@@ -553,7 +553,7 @@
         </node>
         <node concept="3clFbF" id="75_oBQVqnv2" role="3cqZAp">
           <node concept="1rXfSq" id="75_oBQVqnv0" role="3clFbG">
-            <ref role="37wK5l" to="dxuu:~JTree.setRootVisible(boolean):void" resolve="setRootVisible" />
+            <ref role="37wK5l" to="dxuu:~JTree.setRootVisible(boolean)" resolve="setRootVisible" />
             <node concept="3clFbT" id="75_oBQVqnLo" role="37wK5m">
               <property role="3clFbU" value="false" />
             </node>
@@ -561,7 +561,7 @@
         </node>
         <node concept="3clFbF" id="7N6jGOB4uHl" role="3cqZAp">
           <node concept="1rXfSq" id="7N6jGOB4uHj" role="3clFbG">
-            <ref role="37wK5l" to="7e8u:~MPSTree.rebuildLater():void" resolve="rebuildLater" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.rebuildLater()" resolve="rebuildLater" />
           </node>
         </node>
         <node concept="3clFbH" id="6B7erwvFpuv" role="3cqZAp" />
@@ -619,7 +619,7 @@
         <node concept="3clFbH" id="58b0Q1$tgN6" role="3cqZAp" />
         <node concept="3clFbF" id="58b0Q1$tjAC" role="3cqZAp">
           <node concept="1rXfSq" id="58b0Q1$tjAA" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener):void" resolve="addMouseListener" />
+            <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener)" resolve="addMouseListener" />
             <node concept="2ShNRf" id="58b0Q1$tkSz" role="37wK5m">
               <node concept="YeOm9" id="58b0Q1$tJLM" role="2ShVmc">
                 <node concept="1Y3b0j" id="58b0Q1$tJLP" role="YeSDq">
@@ -650,13 +650,13 @@
                             <ref role="3uigEE" to="rgfa:~TreePath" resolve="TreePath" />
                           </node>
                           <node concept="1rXfSq" id="58b0Q1$tP4A" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTree.getPathForLocation(int,int):javax.swing.tree.TreePath" resolve="getPathForLocation" />
+                            <ref role="37wK5l" to="dxuu:~JTree.getPathForLocation(int,int)" resolve="getPathForLocation" />
                             <node concept="2OqwBi" id="58b0Q1$tP4B" role="37wK5m">
                               <node concept="37vLTw" id="58b0Q1$tP4C" role="2Oq$k0">
                                 <ref role="3cqZAo" node="58b0Q1$tJNP" resolve="event" />
                               </node>
                               <node concept="liA8E" id="58b0Q1$tP4D" role="2OqNvi">
-                                <ref role="37wK5l" to="hyam:~MouseEvent.getX():int" resolve="getX" />
+                                <ref role="37wK5l" to="hyam:~MouseEvent.getX()" resolve="getX" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="58b0Q1$tP4E" role="37wK5m">
@@ -664,7 +664,7 @@
                                 <ref role="3cqZAo" node="58b0Q1$tJNP" resolve="event" />
                               </node>
                               <node concept="liA8E" id="58b0Q1$tP4G" role="2OqNvi">
-                                <ref role="37wK5l" to="hyam:~MouseEvent.getY():int" resolve="getY" />
+                                <ref role="37wK5l" to="hyam:~MouseEvent.getY()" resolve="getY" />
                               </node>
                             </node>
                           </node>
@@ -693,7 +693,7 @@
                               <ref role="3cqZAo" node="58b0Q1$tP4_" resolve="path" />
                             </node>
                             <node concept="liA8E" id="58b0Q1$tPWH" role="2OqNvi">
-                              <ref role="37wK5l" to="rgfa:~TreePath.getLastPathComponent():java.lang.Object" resolve="getLastPathComponent" />
+                              <ref role="37wK5l" to="rgfa:~TreePath.getLastPathComponent()" resolve="getLastPathComponent" />
                             </node>
                           </node>
                         </node>
@@ -902,7 +902,7 @@
       <node concept="3clFbS" id="7caYlD$jm3X" role="3clF47">
         <node concept="3clFbF" id="7caYlD$joUY" role="3cqZAp">
           <node concept="3nyPlj" id="7caYlD$joV0" role="3clFbG">
-            <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List):void" resolve="loadState" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List)" resolve="loadState" />
             <node concept="37vLTw" id="7caYlD$joV1" role="37wK5m">
               <ref role="3cqZAo" node="7caYlD$jokr" resolve="list" />
             </node>
@@ -938,7 +938,7 @@
       <node concept="3clFbS" id="6VHIYX53m0U" role="3clF47">
         <node concept="3clFbF" id="6VHIYX53m0Z" role="3cqZAp">
           <node concept="3nyPlj" id="6VHIYX53m0Y" role="3clFbG">
-            <ref role="37wK5l" to="7e8u:~MPSTree.doInit(jetbrains.mps.ide.ui.tree.MPSTreeNode,java.lang.Runnable):void" resolve="doInit" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.doInit(jetbrains.mps.ide.ui.tree.MPSTreeNode,java.lang.Runnable)" resolve="doInit" />
             <node concept="37vLTw" id="6VHIYX53m0W" role="37wK5m">
               <ref role="3cqZAo" node="6VHIYX53m0Q" resolve="node" />
             </node>
@@ -950,7 +950,7 @@
                     <ref role="3cqZAo" node="7diJr$Rjd1F" resolve="myMpsProject" />
                   </node>
                   <node concept="liA8E" id="6VHIYX53zfN" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                    <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="6VHIYX53AlZ" role="37wK5m">
@@ -988,7 +988,7 @@
       <node concept="3clFbS" id="6VHIYX538dD" role="3clF47">
         <node concept="3clFbF" id="6VHIYX538dI" role="3cqZAp">
           <node concept="3nyPlj" id="6VHIYX538dH" role="3clFbG">
-            <ref role="37wK5l" to="7e8u:~MPSTree.runRebuildAction(java.lang.Runnable,boolean):void" resolve="runRebuildAction" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.runRebuildAction(java.lang.Runnable,boolean)" resolve="runRebuildAction" />
             <node concept="2ShNRf" id="6VHIYX539Zm" role="37wK5m">
               <node concept="1pGfFk" id="6VHIYX53e_0" role="2ShVmc">
                 <ref role="37wK5l" to="w1kc:~ModelReadRunnable.&lt;init&gt;(org.jetbrains.mps.openapi.module.ModelAccess,java.lang.Runnable)" resolve="ModelReadRunnable" />
@@ -997,7 +997,7 @@
                     <ref role="3cqZAo" node="7diJr$Rjd1F" resolve="myMpsProject" />
                   </node>
                   <node concept="liA8E" id="6VHIYX53iNC" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                    <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="6VHIYX53l3_" role="37wK5m">
@@ -1148,7 +1148,7 @@
                       </node>
                       <node concept="2YIFZM" id="nuy2XHkGp3" role="37vLTx">
                         <ref role="1Pybhc" to="7bx7:~ActionUtils" resolve="ActionUtils" />
-                        <ref role="37wK5l" to="7bx7:~ActionUtils.getGroup(java.lang.String):jetbrains.mps.workbench.action.BaseGroup" resolve="getGroup" />
+                        <ref role="37wK5l" to="7bx7:~ActionUtils.getGroup(java.lang.String)" resolve="getGroup" />
                         <node concept="37vLTw" id="nuy2XHkGp4" role="37wK5m">
                           <ref role="3cqZAo" node="nuy2XHkGoT" resolve="actionGroupId" />
                         </node>
@@ -1265,7 +1265,7 @@
                             <ref role="3cqZAo" node="75_oBQVv2iH" resolve="result" />
                           </node>
                           <node concept="2YIFZM" id="75_oBQVv5og" role="37vLTx">
-                            <ref role="37wK5l" to="7bx7:~ActionUtils.getGroup(java.lang.String):jetbrains.mps.workbench.action.BaseGroup" resolve="getGroup" />
+                            <ref role="37wK5l" to="7bx7:~ActionUtils.getGroup(java.lang.String)" resolve="getGroup" />
                             <ref role="1Pybhc" to="7bx7:~ActionUtils" resolve="ActionUtils" />
                             <node concept="37vLTw" id="75_oBQVv5U0" role="37wK5m">
                               <ref role="3cqZAo" node="75_oBQVuUoK" resolve="actionGroupId" />
@@ -1288,7 +1288,7 @@
                   <ref role="3cqZAo" node="7diJr$Rjd1F" resolve="myMpsProject" />
                 </node>
                 <node concept="liA8E" id="3WhiLkaaSt3" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -1321,7 +1321,7 @@
             <node concept="3cpWs6" id="iBCgCYTGDL" role="3cqZAp" />
           </node>
           <node concept="1rXfSq" id="iBCgCYTFhX" role="3clFbw">
-            <ref role="37wK5l" to="7e8u:~MPSTree.isDisposed():boolean" resolve="isDisposed" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.isDisposed()" resolve="isDisposed" />
           </node>
         </node>
         <node concept="3clFbF" id="7PuCnELx8dn" role="3cqZAp">
@@ -1346,7 +1346,7 @@
         </node>
         <node concept="3clFbF" id="6B7erwvFBN8" role="3cqZAp">
           <node concept="3nyPlj" id="6B7erwvFBN7" role="3clFbG">
-            <ref role="37wK5l" to="7e8u:~MPSTree.dispose():void" resolve="dispose" />
+            <ref role="37wK5l" to="7e8u:~MPSTree.dispose()" resolve="dispose" />
           </node>
         </node>
       </node>
@@ -1377,7 +1377,7 @@
               <node concept="liA8E" id="7PuCnELxkg3" role="2OqNvi">
                 <ref role="37wK5l" node="3kZeI293A5A" resolve="findTreeNode" />
                 <node concept="1rXfSq" id="7PuCnELxkg4" role="37wK5m">
-                  <ref role="37wK5l" to="7e8u:~MPSTree.getRootNode():jetbrains.mps.ide.ui.tree.MPSTreeNode" resolve="getRootNode" />
+                  <ref role="37wK5l" to="7e8u:~MPSTree.getRootNode()" resolve="getRootNode" />
                 </node>
                 <node concept="3VsKOn" id="7PuCnELxkg5" role="37wK5m">
                   <ref role="3VsUkX" to="z1c3:~Project" resolve="Project" />
@@ -1407,7 +1407,7 @@
                         <ref role="3cqZAo" node="7PuCnELxkfY" resolve="projectNode" />
                       </node>
                       <node concept="liA8E" id="7PuCnELx$xR" role="2OqNvi">
-                        <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getPath():javax.swing.tree.TreeNode[]" resolve="getPath" />
+                        <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getPath()" resolve="getPath" />
                       </node>
                     </node>
                   </node>
@@ -1904,7 +1904,7 @@
               <ref role="37wK5l" node="4gq8yQBZ6QW" resolve="getMPSProject" />
             </node>
             <node concept="liA8E" id="2xfLpXm7eBs" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -2090,7 +2090,7 @@
                 <node concept="3clFbF" id="75_oBQVGUS3" role="3cqZAp">
                   <node concept="37vLTI" id="75_oBQVGVag" role="3clFbG">
                     <node concept="2YIFZM" id="75_oBQVGVqt" role="37vLTx">
-                      <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                      <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
                       <node concept="37vLTw" id="75_oBQVGVuF" role="37wK5m">
                         <ref role="3cqZAo" node="75_oBQVGU9Z" resolve="preferedValue" />
@@ -2343,7 +2343,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVxFjf" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVxG1b" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2376,7 +2376,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.NODES" resolve="NODES" />
             </node>
             <node concept="liA8E" id="75_oBQVxWkn" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVxWko" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2404,7 +2404,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
             </node>
             <node concept="liA8E" id="75_oBQVy818" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVy819" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2437,7 +2437,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.MODELS" resolve="MODELS" />
             </node>
             <node concept="liA8E" id="75_oBQVygdO" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVygdP" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2463,7 +2463,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.CONTEXT_MODEL" resolve="CONTEXT_MODEL" />
             </node>
             <node concept="liA8E" id="75_oBQVyD4Q" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVyD4R" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2491,7 +2491,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.MODULE" resolve="MODULE" />
             </node>
             <node concept="liA8E" id="75_oBQVyMo3" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVyMo4" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2524,7 +2524,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVyMnT" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVyMnU" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2550,7 +2550,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVyMnG" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVyMnH" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2579,7 +2579,7 @@
               <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.TREE_NODE" resolve="TREE_NODE" />
             </node>
             <node concept="liA8E" id="75_oBQVySoA" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVySoB" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2608,7 +2608,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVyYQB" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVyYQC" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2631,7 +2631,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVz_qo" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVz_qp" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2654,7 +2654,7 @@
               <ref role="1PxDUh" to="3s15:~MPSDataKeys" resolve="MPSDataKeys" />
             </node>
             <node concept="liA8E" id="75_oBQVzO7C" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String):boolean" resolve="is" />
+              <ref role="37wK5l" to="qkt:~DataKey.is(java.lang.String)" resolve="is" />
               <node concept="37vLTw" id="75_oBQVzO7D" role="37wK5m">
                 <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
               </node>
@@ -2664,7 +2664,7 @@
         <node concept="3clFbH" id="75_oBQVy7vH" role="3cqZAp" />
         <node concept="3clFbF" id="75_oBQVxzQR" role="3cqZAp">
           <node concept="3nyPlj" id="75_oBQVxzQQ" role="3clFbG">
-            <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getData(java.lang.String):java.lang.Object" resolve="getData" />
+            <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getData(java.lang.String)" resolve="getData" />
             <node concept="37vLTw" id="75_oBQVxzQP" role="37wK5m">
               <ref role="3cqZAo" node="75_oBQVxzQL" resolve="dataId" />
             </node>
@@ -2800,7 +2800,7 @@
                   <ref role="3cqZAo" node="2T14VC6MRXf" resolve="result" />
                 </node>
                 <node concept="liA8E" id="2T14VC6MS73" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="37vLTw" id="2T14VC6MRX$" role="37wK5m">
                     <ref role="3cqZAo" node="2T14VC6MRXo" resolve="snode" />
                   </node>
@@ -3007,7 +3007,7 @@
                         <ref role="3cqZAo" node="2T14VC6NVCU" resolve="selectedTreeNode" />
                       </node>
                       <node concept="liA8E" id="2T14VC6OkUh" role="2OqNvi">
-                        <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getParent():javax.swing.tree.TreeNode" resolve="getParent" />
+                        <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getParent()" resolve="getParent" />
                       </node>
                     </node>
                     <node concept="3uibUv" id="2T14VC6OkUe" role="10QFUM">
@@ -3118,7 +3118,7 @@
                   <ref role="3cqZAo" node="75_oBQVyuaI" resolve="type" />
                 </node>
                 <node concept="liA8E" id="75_oBQVy$jr" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Class.isInstance(java.lang.Object):boolean" resolve="isInstance" />
+                  <ref role="37wK5l" to="wyt6:~Class.isInstance(java.lang.Object)" resolve="isInstance" />
                   <node concept="37vLTw" id="75_oBQVy$ZQ" role="37wK5m">
                     <ref role="3cqZAo" node="75_oBQVy$ZI" resolve="obj" />
                   </node>
@@ -3138,7 +3138,7 @@
                 <ref role="3cqZAo" node="75_oBQVyx5I" resolve="currentNode" />
               </node>
               <node concept="liA8E" id="75_oBQVyxu3" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~TreeNode.getParent():javax.swing.tree.TreeNode" resolve="getParent" />
+                <ref role="37wK5l" to="rgfa:~TreeNode.getParent()" resolve="getParent" />
               </node>
             </node>
             <node concept="37vLTw" id="75_oBQVyxdY" role="37vLTJ">
@@ -3171,7 +3171,7 @@
               </node>
             </node>
             <node concept="1rXfSq" id="75_oBQVzBiV" role="33vP2m">
-              <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSelectionPaths():javax.swing.tree.TreePath[]" resolve="getSelectionPaths" />
+              <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSelectionPaths()" resolve="getSelectionPaths" />
             </node>
           </node>
         </node>
@@ -3464,17 +3464,17 @@
               <node concept="2OqwBi" id="hwfPVmgezu" role="3clFbG">
                 <node concept="2OqwBi" id="hwfPVmgd80" role="2Oq$k0">
                   <node concept="1rXfSq" id="hwfPVmgd81" role="2Oq$k0">
-                    <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                    <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject()" resolve="getProject" />
                   </node>
                   <node concept="liA8E" id="hwfPVmgd82" role="2OqNvi">
-                    <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                    <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
                     <node concept="3VsKOn" id="hwfPVmgd83" role="37wK5m">
                       <ref role="3VsUkX" to="2r90:~ReloadManagerComponent" resolve="ReloadManagerComponent" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="hwfPVmggQG" role="2OqNvi">
-                  <ref role="37wK5l" to="2r90:~ReloadManagerComponent.removeReloadListener(jetbrains.mps.ide.platform.watching.ReloadListener):void" resolve="removeReloadListener" />
+                  <ref role="37wK5l" to="2r90:~ReloadManagerComponent.removeReloadListener(jetbrains.mps.ide.platform.watching.ReloadListener)" resolve="removeReloadListener" />
                   <node concept="37vLTw" id="hwfPVmgi_r" role="37wK5m">
                     <ref role="3cqZAo" node="hwfPVmff52" resolve="myReloadListener" />
                   </node>
@@ -3514,7 +3514,7 @@
             <node concept="3clFbF" id="4QICnJ5JcCD" role="3cqZAp">
               <node concept="2OqwBi" id="4QICnJ5JcCE" role="3clFbG">
                 <node concept="liA8E" id="4QICnJ5JcCG" role="2OqNvi">
-                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener):void" resolve="removeListener" />
+                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
                   <node concept="37vLTw" id="4QICnJ5JcCH" role="37wK5m">
                     <ref role="3cqZAo" node="4QICnJ5Heu5" resolve="myClassesListener" />
                   </node>
@@ -3524,7 +3524,7 @@
                     <ref role="3cqZAo" node="7N_XUEP3190" resolve="mpsProject" />
                   </node>
                   <node concept="liA8E" id="hwfPVmioys" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                    <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
                     <node concept="3VsKOn" id="hwfPVmioyt" role="37wK5m">
                       <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
                     </node>
@@ -3565,7 +3565,7 @@
                       <ref role="3cqZAo" node="7N_XUEP3190" resolve="mpsProject" />
                     </node>
                     <node concept="liA8E" id="hwfPVmi0kw" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                      <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
                       <node concept="3VsKOn" id="hwfPVmi0kx" role="37wK5m">
                         <ref role="3VsUkX" to="hfuk:4QUA3Sqts3M" resolve="MakeServiceComponent" />
                       </node>
@@ -3599,10 +3599,10 @@
               <node concept="2OqwBi" id="4QICnJ5JbG3" role="3clFbG">
                 <node concept="2YIFZM" id="4QICnJ5JbGw" role="2Oq$k0">
                   <ref role="1Pybhc" to="jlff:~VirtualFileManager" resolve="VirtualFileManager" />
-                  <ref role="37wK5l" to="jlff:~VirtualFileManager.getInstance():com.intellij.openapi.vfs.VirtualFileManager" resolve="getInstance" />
+                  <ref role="37wK5l" to="jlff:~VirtualFileManager.getInstance()" resolve="getInstance" />
                 </node>
                 <node concept="liA8E" id="4QICnJ5JbG5" role="2OqNvi">
-                  <ref role="37wK5l" to="jlff:~VirtualFileManager.removeVirtualFileManagerListener(com.intellij.openapi.vfs.VirtualFileManagerListener):void" resolve="removeVirtualFileManagerListener" />
+                  <ref role="37wK5l" to="jlff:~VirtualFileManager.removeVirtualFileManagerListener(com.intellij.openapi.vfs.VirtualFileManagerListener)" resolve="removeVirtualFileManagerListener" />
                   <node concept="37vLTw" id="4QICnJ5JbG6" role="37wK5m">
                     <ref role="3cqZAo" node="4QICnJ5HetR" resolve="myRefreshListener" />
                   </node>
@@ -3648,7 +3648,7 @@
             <node concept="3clFbF" id="4gq8yQBZ6Pn" role="3cqZAp">
               <node concept="2OqwBi" id="4gq8yQBZ6Po" role="3clFbG">
                 <node concept="liA8E" id="4gq8yQBZ6Pq" role="2OqNvi">
-                  <ref role="37wK5l" to="31cb:~SRepositoryBase.removeRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener):void" resolve="removeRepositoryListener" />
+                  <ref role="37wK5l" to="31cb:~SRepositoryBase.removeRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener)" resolve="removeRepositoryListener" />
                   <node concept="37vLTw" id="4gq8yQBZ6Pr" role="37wK5m">
                     <ref role="3cqZAo" node="4gq8yQBZ6Ml" resolve="myRepositoryListener" />
                   </node>
@@ -3658,7 +3658,7 @@
                     <ref role="3cqZAo" node="7N_XUEP3190" resolve="mpsProject" />
                   </node>
                   <node concept="liA8E" id="hwfPVmiKD8" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                    <ref role="37wK5l" to="z1c4:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
                     <node concept="3VsKOn" id="hwfPVmiKD9" role="37wK5m">
                       <ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
                     </node>
@@ -3689,11 +3689,11 @@
                 <ref role="3cqZAo" node="7N_XUEP3190" resolve="mpsProject" />
               </node>
               <node concept="liA8E" id="7N_XUEP319g" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="7N_XUEP319h" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.removeCommandListener(org.jetbrains.mps.openapi.repository.CommandListener):void" resolve="removeCommandListener" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.removeCommandListener(org.jetbrains.mps.openapi.repository.CommandListener)" resolve="removeCommandListener" />
               <node concept="37vLTw" id="7N_XUEP319i" role="37wK5m">
                 <ref role="3cqZAo" node="7N_XUEP2OI9" resolve="commandRepoListener" />
               </node>
@@ -3710,7 +3710,7 @@
                     <ref role="3cqZAo" node="7N_XUEP3190" resolve="mpsProject" />
                   </node>
                   <node concept="liA8E" id="7N_XUEP3199" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="7N_XUEP319a" role="37wK5m">
@@ -3719,7 +3719,7 @@
               </node>
             </node>
             <node concept="liA8E" id="7N_XUEP319b" role="2OqNvi">
-              <ref role="37wK5l" to="w1kc:~RepoListenerRegistrar.detach():void" resolve="detach" />
+              <ref role="37wK5l" to="w1kc:~RepoListenerRegistrar.detach()" resolve="detach" />
             </node>
           </node>
         </node>
@@ -3744,10 +3744,10 @@
             </node>
             <node concept="2OqwBi" id="hwfPVmfGGd" role="33vP2m">
               <node concept="1rXfSq" id="hwfPVmfGGe" role="2Oq$k0">
-                <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject()" resolve="getProject" />
               </node>
               <node concept="liA8E" id="hwfPVmfGGf" role="2OqNvi">
-                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
                 <node concept="3VsKOn" id="hwfPVmfGGg" role="37wK5m">
                   <ref role="3VsUkX" to="2r90:~ReloadManagerComponent" resolve="ReloadManagerComponent" />
                 </node>
@@ -3810,7 +3810,7 @@
                   <ref role="3cqZAo" node="hwfPVmfGGc" resolve="reloadManager" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ6OS" role="2OqNvi">
-                  <ref role="37wK5l" to="2r90:~ReloadManagerComponent.addReloadListener(jetbrains.mps.ide.platform.watching.ReloadListener):void" resolve="addReloadListener" />
+                  <ref role="37wK5l" to="2r90:~ReloadManagerComponent.addReloadListener(jetbrains.mps.ide.platform.watching.ReloadListener)" resolve="addReloadListener" />
                   <node concept="37vLTw" id="hwfPVmfXuv" role="37wK5m">
                     <ref role="3cqZAo" node="hwfPVmff52" resolve="myReloadListener" />
                   </node>
@@ -4347,7 +4347,7 @@
                     <ref role="3cqZAo" node="7N_XUEP2Zq_" resolve="mpsProject" />
                   </node>
                   <node concept="liA8E" id="7N_XUEP2ZJq" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="7N_XUEP30tD" role="37wK5m">
@@ -4356,7 +4356,7 @@
               </node>
             </node>
             <node concept="liA8E" id="7N_XUEP2Xa0" role="2OqNvi">
-              <ref role="37wK5l" to="w1kc:~RepoListenerRegistrar.attach():void" resolve="attach" />
+              <ref role="37wK5l" to="w1kc:~RepoListenerRegistrar.attach()" resolve="attach" />
             </node>
           </node>
         </node>
@@ -4367,11 +4367,11 @@
                 <ref role="3cqZAo" node="7N_XUEP2Zq_" resolve="mpsProject" />
               </node>
               <node concept="liA8E" id="7N_XUEP2ZNu" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="7N_XUEP2Xa4" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.addCommandListener(org.jetbrains.mps.openapi.repository.CommandListener):void" resolve="addCommandListener" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.addCommandListener(org.jetbrains.mps.openapi.repository.CommandListener)" resolve="addCommandListener" />
               <node concept="37vLTw" id="7N_XUEP30Vt" role="37wK5m">
                 <ref role="3cqZAo" node="7N_XUEP2OI9" resolve="commandRepoListener" />
               </node>
@@ -4567,7 +4567,7 @@
         </node>
         <node concept="3clFbF" id="4gq8yQBZ6T2" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ6T3" role="3clFbG">
-            <ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable):void" resolve="register" />
+            <ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable)" resolve="register" />
             <ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
             <node concept="Xjq3P" id="4gq8yQBZ6T4" role="37wK5m" />
             <node concept="37vLTw" id="4gq8yQBZ6T5" role="37wK5m">
@@ -4765,7 +4765,7 @@
           <node concept="3fqX7Q" id="4gq8yQBZ6TH" role="3clFbw">
             <node concept="2YIFZM" id="4gq8yQBZ6TI" role="3fr31v">
               <ref role="1Pybhc" to="fyhk:~RuntimeFlags" resolve="RuntimeFlags" />
-              <ref role="37wK5l" to="fyhk:~RuntimeFlags.isTestMode():boolean" resolve="isTestMode" />
+              <ref role="37wK5l" to="fyhk:~RuntimeFlags.isTestMode()" resolve="isTestMode" />
             </node>
           </node>
           <node concept="3clFbS" id="4gq8yQBZ6TJ" role="3clFbx">
@@ -4779,7 +4779,7 @@
         <node concept="3clFbF" id="4gq8yQBZ6TM" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ6TN" role="3clFbG">
             <ref role="1Pybhc" to="7e8u:~TreeHighlighterExtension" resolve="TreeHighlighterExtension" />
-            <ref role="37wK5l" to="7e8u:~TreeHighlighterExtension.attachHighlighters(jetbrains.mps.ide.ui.tree.MPSTree,com.intellij.openapi.project.Project):void" resolve="attachHighlighters" />
+            <ref role="37wK5l" to="7e8u:~TreeHighlighterExtension.attachHighlighters(jetbrains.mps.ide.ui.tree.MPSTree,com.intellij.openapi.project.Project)" resolve="attachHighlighters" />
             <node concept="37vLTw" id="4gq8yQBZ6TO" role="37wK5m">
               <ref role="3cqZAo" node="4gq8yQBZ6SW" resolve="tree" />
             </node>
@@ -4842,7 +4842,7 @@
         <node concept="3clFbF" id="4gq8yQBZ6UH" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ6UI" role="3clFbG">
             <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT():void" resolve="assertEDT" />
+            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT()" resolve="assertEDT" />
           </node>
         </node>
         <node concept="3clFbF" id="4gq8yQBZ6UJ" role="3cqZAp">
@@ -4878,7 +4878,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6MT" resolve="myUpdateQueue" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6Uc" role="2OqNvi">
-              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update):void" resolve="queue" />
+              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update)" resolve="queue" />
               <node concept="2ShNRf" id="4gq8yQBZ6Ud" role="37wK5m">
                 <node concept="YeOm9" id="4gq8yQBZ6Ue" role="2ShVmc">
                   <node concept="1Y3b0j" id="4gq8yQBZ6Uf" role="YeSDq">
@@ -4906,7 +4906,7 @@
                                 <ref role="37wK5l" node="4gq8yQBZ6QN" resolve="getTree" />
                               </node>
                               <node concept="liA8E" id="7hK0gatltfD" role="2OqNvi">
-                                <ref role="37wK5l" to="7e8u:~MPSTree.isDisposed():boolean" resolve="isDisposed" />
+                                <ref role="37wK5l" to="7e8u:~MPSTree.isDisposed()" resolve="isDisposed" />
                               </node>
                             </node>
                             <node concept="22lmx$" id="4gq8yQBZ6Ul" role="3uHU7B">
@@ -4918,10 +4918,10 @@
                               </node>
                               <node concept="2OqwBi" id="4gq8yQBZ6Up" role="3uHU7w">
                                 <node concept="1rXfSq" id="4gq8yQBZ6Uq" role="2Oq$k0">
-                                  <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                                  <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject()" resolve="getProject" />
                                 </node>
                                 <node concept="liA8E" id="4gq8yQBZ6Ur" role="2OqNvi">
-                                  <ref role="37wK5l" to="1m72:~ComponentManager.isDisposed():boolean" resolve="isDisposed" />
+                                  <ref role="37wK5l" to="1m72:~ComponentManager.isDisposed()" resolve="isDisposed" />
                                 </node>
                               </node>
                             </node>
@@ -4939,7 +4939,7 @@
                                       <ref role="37wK5l" node="4gq8yQBZ6QN" resolve="getTree" />
                                     </node>
                                     <node concept="liA8E" id="4gq8yQBZ6Ux" role="2OqNvi">
-                                      <ref role="37wK5l" to="7e8u:~MPSTree.rebuildNow():void" resolve="rebuildNow" />
+                                      <ref role="37wK5l" to="7e8u:~MPSTree.rebuildNow()" resolve="rebuildNow" />
                                     </node>
                                   </node>
                                 </node>
@@ -5081,7 +5081,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="1zw8Mi3ZGOL" role="2OqNvi">
-                      <ref role="37wK5l" to="7e8u:~MPSTree.getExpandedPathsRaw():java.util.List" resolve="getExpandedPathsRaw" />
+                      <ref role="37wK5l" to="7e8u:~MPSTree.getExpandedPathsRaw()" resolve="getExpandedPathsRaw" />
                     </node>
                   </node>
                 </node>
@@ -5106,7 +5106,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="1zw8Mi3ZL9u" role="2OqNvi">
-                      <ref role="37wK5l" to="7e8u:~MPSTree.getSelectedPathsRaw():java.util.List" resolve="getSelectedPathsRaw" />
+                      <ref role="37wK5l" to="7e8u:~MPSTree.getSelectedPathsRaw()" resolve="getSelectedPathsRaw" />
                     </node>
                   </node>
                 </node>
@@ -5157,7 +5157,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="39Qxg2Itu5H" role="2OqNvi">
-                  <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List):void" resolve="loadState" />
+                  <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List)" resolve="loadState" />
                   <node concept="2OqwBi" id="39Qxg2Itu5I" role="37wK5m">
                     <node concept="37vLTw" id="39Qxg2Itu5J" role="2Oq$k0">
                       <ref role="3cqZAo" node="1zw8Mi3YZrR" resolve="treeState" />
@@ -5282,7 +5282,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6MT" resolve="myUpdateQueue" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6VV" role="2OqNvi">
-              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update):void" resolve="queue" />
+              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update)" resolve="queue" />
               <node concept="2ShNRf" id="4gq8yQBZ6VW" role="37wK5m">
                 <node concept="YeOm9" id="4gq8yQBZ6VX" role="2ShVmc">
                   <node concept="1Y3b0j" id="4gq8yQBZ6VY" role="YeSDq">
@@ -5435,7 +5435,7 @@
         <node concept="3clFbJ" id="4gq8yQBZ6Wz" role="3cqZAp">
           <node concept="3y3z36" id="4gq8yQBZ6W$" role="3clFbw">
             <node concept="1rXfSq" id="4gq8yQBZ6W_" role="3uHU7B">
-              <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSubId():java.lang.String" resolve="getSubId" />
+              <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSubId()" resolve="getSubId" />
             </node>
             <node concept="10Nm6u" id="4gq8yQBZ6WA" role="3uHU7w" />
           </node>
@@ -5446,12 +5446,12 @@
                   <ref role="3cqZAo" node="4gq8yQBZ6Ws" resolve="subPane" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ6WF" role="2OqNvi">
-                  <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String):org.jdom.Element" resolve="setAttribute" />
+                  <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String)" resolve="setAttribute" />
                   <node concept="Xl_RD" id="4gq8yQBZ6WG" role="37wK5m">
                     <property role="Xl_RC" value="subId" />
                   </node>
                   <node concept="1rXfSq" id="4gq8yQBZ6WH" role="37wK5m">
-                    <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSubId():java.lang.String" resolve="getSubId" />
+                    <ref role="37wK5l" to="k21q:~AbstractProjectViewPane.getSubId()" resolve="getSubId" />
                   </node>
                 </node>
               </node>
@@ -5502,7 +5502,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Wj" resolve="element" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6WV" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element):org.jdom.Element" resolve="addContent" />
+              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element)" resolve="addContent" />
               <node concept="37vLTw" id="4gq8yQBZ6WW" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ6Ws" resolve="subPane" />
               </node>
@@ -5595,7 +5595,7 @@
                   <ref role="3cqZAo" node="4gq8yQBZ6X0" resolve="parentElement" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ6Xs" role="2OqNvi">
-                  <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element):org.jdom.Element" resolve="addContent" />
+                  <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element)" resolve="addContent" />
                   <node concept="37vLTw" id="4gq8yQBZ6Xt" role="37wK5m">
                     <ref role="3cqZAo" node="4gq8yQBZ6Xg" resolve="pathElement" />
                   </node>
@@ -5677,7 +5677,7 @@
                   <ref role="3cqZAo" node="4gq8yQBZ6X$" resolve="pathElement" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ6XT" role="2OqNvi">
-                  <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element):org.jdom.Element" resolve="addContent" />
+                  <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element)" resolve="addContent" />
                   <node concept="37vLTw" id="4gq8yQBZ6XU" role="37wK5m">
                     <ref role="3cqZAo" node="4gq8yQBZ6XH" resolve="elm" />
                   </node>
@@ -5733,7 +5733,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Y4" resolve="option1" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6Yc" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String):org.jdom.Element" resolve="setAttribute" />
+              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String)" resolve="setAttribute" />
               <node concept="Xl_RD" id="4gq8yQBZ6Yd" role="37wK5m">
                 <property role="Xl_RC" value="name" />
               </node>
@@ -5749,7 +5749,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Y4" resolve="option1" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6Yi" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String):org.jdom.Element" resolve="setAttribute" />
+              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String)" resolve="setAttribute" />
               <node concept="Xl_RD" id="4gq8yQBZ6Yj" role="37wK5m">
                 <property role="Xl_RC" value="value" />
               </node>
@@ -5765,7 +5765,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Y0" resolve="elm" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6Yo" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element):org.jdom.Element" resolve="addContent" />
+              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element)" resolve="addContent" />
               <node concept="37vLTw" id="4gq8yQBZ6Yp" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ6Y4" resolve="option1" />
               </node>
@@ -5795,7 +5795,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Yr" resolve="option2" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6Yz" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String):org.jdom.Element" resolve="setAttribute" />
+              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String)" resolve="setAttribute" />
               <node concept="Xl_RD" id="4gq8yQBZ6Y$" role="37wK5m">
                 <property role="Xl_RC" value="name" />
               </node>
@@ -5811,7 +5811,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Yr" resolve="option2" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6YD" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String):org.jdom.Element" resolve="setAttribute" />
+              <ref role="37wK5l" to="mmaq:~Element.setAttribute(java.lang.String,java.lang.String)" resolve="setAttribute" />
               <node concept="Xl_RD" id="4gq8yQBZ6YE" role="37wK5m">
                 <property role="Xl_RC" value="value" />
               </node>
@@ -5827,7 +5827,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Y0" resolve="elm" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6YJ" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element):org.jdom.Element" resolve="addContent" />
+              <ref role="37wK5l" to="mmaq:~Element.addContent(org.jdom.Element)" resolve="addContent" />
               <node concept="37vLTw" id="4gq8yQBZ6YK" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ6Yr" resolve="option2" />
               </node>
@@ -5903,7 +5903,7 @@
                 <ref role="3cqZAo" node="4gq8yQBZ6YP" resolve="element" />
               </node>
               <node concept="liA8E" id="4gq8yQBZ6Z1" role="2OqNvi">
-                <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String):java.util.List" resolve="getChildren" />
+                <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String)" resolve="getChildren" />
                 <node concept="Xl_RD" id="4gq8yQBZ6Z2" role="37wK5m">
                   <property role="Xl_RC" value="subPane" />
                 </node>
@@ -6009,7 +6009,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7yfY3mGlWyT" role="2OqNvi">
-                  <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List):void" resolve="loadState" />
+                  <ref role="37wK5l" to="7e8u:~MPSTree.loadState(java.util.List,java.util.List)" resolve="loadState" />
                   <node concept="2OqwBi" id="1zw8Mi40Mwy" role="37wK5m">
                     <node concept="37vLTw" id="1zw8Mi40Kwn" role="2Oq$k0">
                       <ref role="3cqZAo" node="1zw8Mi3YZrR" resolve="treeState" />
@@ -6098,7 +6098,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Zn" resolve="parentElement" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ6ZC" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String):java.util.List" resolve="getChildren" />
+              <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String)" resolve="getChildren" />
               <node concept="37vLTw" id="4gq8yQBZ6ZD" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ6Zp" resolve="name" />
               </node>
@@ -6136,7 +6136,7 @@
                   <ref role="3cqZAo" node="4gq8yQBZ6Zt" resolve="result" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ6ZQ" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="37vLTw" id="4gq8yQBZ6ZR" role="37wK5m">
                     <ref role="3cqZAo" node="4gq8yQBZ6ZI" resolve="path" />
                   </node>
@@ -6204,7 +6204,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ700" resolve="pathElement" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ70d" role="2OqNvi">
-              <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String):java.util.List" resolve="getChildren" />
+              <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String)" resolve="getChildren" />
               <node concept="Xl_RD" id="4gq8yQBZ70e" role="37wK5m">
                 <property role="Xl_RC" value="PATH_ELEMENT" />
               </node>
@@ -6247,7 +6247,7 @@
                       <ref role="3cqZAo" node="4gq8yQBZ704" resolve="path" />
                     </node>
                     <node concept="liA8E" id="4gq8yQBZ70v" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                       <node concept="37vLTw" id="4gq8yQBZ70w" role="37wK5m">
                         <ref role="3cqZAo" node="4gq8yQBZ70j" resolve="treeNodeId" />
                       </node>
@@ -6303,7 +6303,7 @@
                 <ref role="3cqZAo" node="4gq8yQBZ70C" resolve="elm" />
               </node>
               <node concept="liA8E" id="4gq8yQBZ70L" role="2OqNvi">
-                <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String):java.util.List" resolve="getChildren" />
+                <ref role="37wK5l" to="mmaq:~Element.getChildren(java.lang.String)" resolve="getChildren" />
                 <node concept="Xl_RD" id="4gq8yQBZ70M" role="37wK5m">
                   <property role="Xl_RC" value="option" />
                 </node>
@@ -6339,13 +6339,13 @@
                   <property role="Xl_RC" value="myItemId" />
                 </node>
                 <node concept="liA8E" id="4gq8yQBZ70Z" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                   <node concept="2OqwBi" id="4gq8yQBZ710" role="37wK5m">
                     <node concept="37vLTw" id="4gq8yQBZ711" role="2Oq$k0">
                       <ref role="3cqZAo" node="4gq8yQBZ70T" resolve="option" />
                     </node>
                     <node concept="liA8E" id="4gq8yQBZ712" role="2OqNvi">
-                      <ref role="37wK5l" to="mmaq:~Element.getAttributeValue(java.lang.String):java.lang.String" resolve="getAttributeValue" />
+                      <ref role="37wK5l" to="mmaq:~Element.getAttributeValue(java.lang.String)" resolve="getAttributeValue" />
                       <node concept="Xl_RD" id="4gq8yQBZ713" role="37wK5m">
                         <property role="Xl_RC" value="name" />
                       </node>
@@ -6364,7 +6364,7 @@
                         <ref role="3cqZAo" node="4gq8yQBZ70T" resolve="option" />
                       </node>
                       <node concept="liA8E" id="4gq8yQBZ71a" role="2OqNvi">
-                        <ref role="37wK5l" to="mmaq:~Element.getAttributeValue(java.lang.String):java.lang.String" resolve="getAttributeValue" />
+                        <ref role="37wK5l" to="mmaq:~Element.getAttributeValue(java.lang.String)" resolve="getAttributeValue" />
                         <node concept="Xl_RD" id="4gq8yQBZ71b" role="37wK5m">
                           <property role="Xl_RC" value="value" />
                         </node>
@@ -6411,7 +6411,7 @@
       <node concept="3clFbS" id="4gq8yQBZ71n" role="3clF47">
         <node concept="3clFbF" id="4gq8yQBZ71o" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ71p" role="3clFbG">
-            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT():void" resolve="assertEDT" />
+            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT()" resolve="assertEDT" />
             <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
           </node>
         </node>
@@ -6430,7 +6430,7 @@
                     <ref role="3cqZAo" node="4gq8yQBZ71i" resolve="module" />
                   </node>
                   <node concept="liA8E" id="4gq8yQBZ71x" role="2OqNvi">
-                    <ref role="37wK5l" to="lui2:~SModule.getModuleReference():org.jetbrains.mps.openapi.module.SModuleReference" resolve="getModuleReference" />
+                    <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
                   </node>
                 </node>
               </node>
@@ -6491,7 +6491,7 @@
         <node concept="3clFbF" id="4gq8yQBZ71O" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ71P" role="3clFbG">
             <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT():void" resolve="assertEDT" />
+            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT()" resolve="assertEDT" />
           </node>
         </node>
         <node concept="3cpWs8" id="4gq8yQBZ71Q" role="3cqZAp">
@@ -6509,7 +6509,7 @@
                     <ref role="3cqZAo" node="4gq8yQBZ71I" resolve="model" />
                   </node>
                   <node concept="liA8E" id="4gq8yQBZ71X" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+                    <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
                   </node>
                 </node>
               </node>
@@ -6576,9 +6576,9 @@
             </node>
             <node concept="2YIFZM" id="4gq8yQBZ72j" role="33vP2m">
               <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-              <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+              <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
               <node concept="1rXfSq" id="4gq8yQBZ72k" role="37wK5m">
-                <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                <ref role="37wK5l" to="rvbb:~BaseLogicalViewProjectPane.getProject()" resolve="getProject" />
               </node>
             </node>
           </node>
@@ -6595,7 +6595,7 @@
                 <ref role="3cqZAo" node="4gq8yQBZ72h" resolve="windowManager" />
               </node>
               <node concept="liA8E" id="4gq8yQBZ72q" role="2OqNvi">
-                <ref role="37wK5l" to="jkny:~ToolWindowManager.getToolWindow(java.lang.String):com.intellij.openapi.wm.ToolWindow" resolve="getToolWindow" />
+                <ref role="37wK5l" to="jkny:~ToolWindowManager.getToolWindow(java.lang.String)" resolve="getToolWindow" />
                 <node concept="10M0yZ" id="4gq8yQBZ72r" role="37wK5m">
                   <ref role="1PxDUh" to="jkny:~ToolWindowId" resolve="ToolWindowId" />
                   <ref role="3cqZAo" to="jkny:~ToolWindowId.PROJECT_VIEW" resolve="PROJECT_VIEW" />
@@ -6842,7 +6842,7 @@
       <node concept="3clFbS" id="4gq8yQBZ73e" role="3clF47">
         <node concept="3clFbF" id="4gq8yQBZ73f" role="3cqZAp">
           <node concept="2YIFZM" id="4gq8yQBZ73g" role="3clFbG">
-            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT():void" resolve="assertEDT" />
+            <ref role="37wK5l" to="3a50:~ThreadUtils.assertEDT()" resolve="assertEDT" />
             <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
           </node>
         </node>
@@ -6861,7 +6861,7 @@
                     <ref role="3cqZAo" node="4gq8yQBZ739" resolve="node" />
                   </node>
                   <node concept="liA8E" id="4gq8yQBZ73o" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                   </node>
                 </node>
               </node>
@@ -6937,7 +6937,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6MT" resolve="myUpdateQueue" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ73M" role="2OqNvi">
-              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update):void" resolve="queue" />
+              <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update)" resolve="queue" />
               <node concept="1rXfSq" id="4gq8yQBZ73N" role="37wK5m">
                 <ref role="37wK5l" node="4gq8yQBZ745" resolve="createModelReadUpdate" />
                 <node concept="Rm8GO" id="4gq8yQBZ73O" role="37wK5m">
@@ -6967,7 +6967,7 @@
                                 <ref role="37wK5l" node="4gq8yQBZ6QN" resolve="getTree" />
                               </node>
                               <node concept="liA8E" id="4gq8yQBZ73Z" role="2OqNvi">
-                                <ref role="37wK5l" to="7e8u:~MPSTree.runWithoutExpansion(java.lang.Runnable):void" resolve="runWithoutExpansion" />
+                                <ref role="37wK5l" to="7e8u:~MPSTree.runWithoutExpansion(java.lang.Runnable)" resolve="runWithoutExpansion" />
                                 <node concept="37vLTw" id="4gq8yQBZ740" role="37wK5m">
                                   <ref role="3cqZAo" node="4gq8yQBZ73E" resolve="lookupAndSelect" />
                                 </node>
@@ -7030,7 +7030,7 @@
                       <ref role="37wK5l" node="4gq8yQBZ6QW" resolve="getMPSProject" />
                     </node>
                     <node concept="liA8E" id="4gq8yQBZ74l" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                      <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="4gq8yQBZ74m" role="37wK5m">
@@ -7077,7 +7077,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Of" resolve="myComponentCreationListeners" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ75S" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.toArray(java.lang.Object[]):java.lang.Object[]" resolve="toArray" />
+              <ref role="37wK5l" to="33ny:~Set.toArray(java.lang.Object[])" resolve="toArray" />
               <node concept="2ShNRf" id="4gq8yQBZ75T" role="37wK5m">
                 <node concept="3$_iS1" id="4gq8yQBZ75U" role="2ShVmc">
                   <node concept="3$GHV9" id="4gq8yQBZ75V" role="3$GQph">
@@ -7086,7 +7086,7 @@
                         <ref role="3cqZAo" node="4gq8yQBZ6Of" resolve="myComponentCreationListeners" />
                       </node>
                       <node concept="liA8E" id="4gq8yQBZ75Y" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Set.size():int" resolve="size" />
+                        <ref role="37wK5l" to="33ny:~Set.size()" resolve="size" />
                       </node>
                     </node>
                   </node>
@@ -7169,7 +7169,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Of" resolve="myComponentCreationListeners" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ76s" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object):boolean" resolve="add" />
+              <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object)" resolve="add" />
               <node concept="37vLTw" id="4gq8yQBZ76t" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ76b" resolve="l" />
               </node>
@@ -7213,7 +7213,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Of" resolve="myComponentCreationListeners" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ76I" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.remove(java.lang.Object):boolean" resolve="remove" />
+              <ref role="37wK5l" to="33ny:~Set.remove(java.lang.Object)" resolve="remove" />
               <node concept="37vLTw" id="4gq8yQBZ76J" role="37wK5m">
                 <ref role="3cqZAo" node="4gq8yQBZ76x" resolve="l" />
               </node>
@@ -7226,7 +7226,7 @@
               <ref role="3cqZAo" node="4gq8yQBZ6Of" resolve="myComponentCreationListeners" />
             </node>
             <node concept="liA8E" id="4gq8yQBZ76N" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Set.isEmpty():boolean" resolve="isEmpty" />
+              <ref role="37wK5l" to="33ny:~Set.isEmpty()" resolve="isEmpty" />
             </node>
           </node>
           <node concept="3clFbS" id="4gq8yQBZ76O" role="3clFbx">
@@ -7615,7 +7615,7 @@
                 <ref role="3cqZAo" node="4gq8yQBZ78B" resolve="myDelegate" />
               </node>
               <node concept="liA8E" id="4gq8yQBZ792" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Runnable.run():void" resolve="run" />
+                <ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
               </node>
             </node>
           </node>
@@ -7715,7 +7715,7 @@
                 <ref role="3cqZAo" node="4gq8yQBZ798" resolve="myQueue" />
               </node>
               <node concept="liA8E" id="4gq8yQBZ79_" role="2OqNvi">
-                <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update):void" resolve="queue" />
+                <ref role="37wK5l" to="t335:~MergingUpdateQueue.queue(com.intellij.util.ui.update.Update)" resolve="queue" />
                 <node concept="37vLTw" id="4gq8yQBZ79A" role="37wK5m">
                   <ref role="3cqZAo" node="4gq8yQBZ79b" resolve="myUpdate" />
                 </node>
@@ -7894,13 +7894,13 @@
                           <ref role="3cqZAo" node="4gq8yQBZ79G" resolve="myNode" />
                         </node>
                         <node concept="liA8E" id="4gq8yQBZ7aG" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                           <node concept="2OqwBi" id="4gq8yQBZ7aH" role="37wK5m">
                             <node concept="1rXfSq" id="4gq8yQBZ7aI" role="2Oq$k0">
                               <ref role="37wK5l" node="4gq8yQBZ6QW" resolve="getMPSProject" />
                             </node>
                             <node concept="liA8E" id="4gq8yQBZ7aJ" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -7950,7 +7950,7 @@
                             <ref role="3cqZAo" node="4gq8yQBZ6Mg" resolve="LOG" />
                           </node>
                           <node concept="liA8E" id="4gq8yQBZ7b5" role="2OqNvi">
-                            <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object):void" resolve="warn" />
+                            <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
                             <node concept="3cpWs3" id="4gq8yQBZ7b6" role="37wK5m">
                               <node concept="3cpWs3" id="4gq8yQBZ7b7" role="3uHU7B">
                                 <node concept="Xl_RD" id="4gq8yQBZ7b8" role="3uHU7B">
@@ -7961,7 +7961,7 @@
                                     <ref role="3cqZAo" node="4gq8yQBZ79G" resolve="myNode" />
                                   </node>
                                   <node concept="liA8E" id="4gq8yQBZ7bb" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                   </node>
                                 </node>
                               </node>
@@ -7990,13 +7990,13 @@
                         <ref role="3cqZAo" node="4gq8yQBZ79J" resolve="myModel" />
                       </node>
                       <node concept="liA8E" id="4gq8yQBZ7bk" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SModel" resolve="resolve" />
+                        <ref role="37wK5l" to="mhbf:~SModelReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                         <node concept="2OqwBi" id="4gq8yQBZ7bl" role="37wK5m">
                           <node concept="1rXfSq" id="4gq8yQBZ7bm" role="2Oq$k0">
                             <ref role="37wK5l" node="4gq8yQBZ6QW" resolve="getMPSProject" />
                           </node>
                           <node concept="liA8E" id="4gq8yQBZ7bn" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -8046,7 +8046,7 @@
                           <ref role="3cqZAo" node="4gq8yQBZ6Mg" resolve="LOG" />
                         </node>
                         <node concept="liA8E" id="4gq8yQBZ7bH" role="2OqNvi">
-                          <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object):void" resolve="warn" />
+                          <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
                           <node concept="3cpWs3" id="4gq8yQBZ7bI" role="37wK5m">
                             <node concept="3cpWs3" id="4gq8yQBZ7bJ" role="3uHU7B">
                               <node concept="Xl_RD" id="4gq8yQBZ7bK" role="3uHU7B">
@@ -8057,7 +8057,7 @@
                                   <ref role="3cqZAo" node="4gq8yQBZ79J" resolve="myModel" />
                                 </node>
                                 <node concept="liA8E" id="4gq8yQBZ7bN" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SModelReference.getModelName():java.lang.String" resolve="getModelName" />
+                                  <ref role="37wK5l" to="mhbf:~SModelReference.getModelName()" resolve="getModelName" />
                                 </node>
                               </node>
                             </node>
@@ -8086,13 +8086,13 @@
                       <ref role="3cqZAo" node="4gq8yQBZ79M" resolve="myModule" />
                     </node>
                     <node concept="liA8E" id="4gq8yQBZ7bW" role="2OqNvi">
-                      <ref role="37wK5l" to="lui2:~SModuleReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.module.SModule" resolve="resolve" />
+                      <ref role="37wK5l" to="lui2:~SModuleReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                       <node concept="2OqwBi" id="4gq8yQBZ7bX" role="37wK5m">
                         <node concept="1rXfSq" id="4gq8yQBZ7bY" role="2Oq$k0">
                           <ref role="37wK5l" node="4gq8yQBZ6QW" resolve="getMPSProject" />
                         </node>
                         <node concept="liA8E" id="4gq8yQBZ7bZ" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -8203,7 +8203,7 @@
                         <ref role="3cqZAo" node="4gq8yQBZ6Mg" resolve="LOG" />
                       </node>
                       <node concept="liA8E" id="4gq8yQBZ7cn" role="2OqNvi">
-                        <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object):void" resolve="warn" />
+                        <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
                         <node concept="3cpWs3" id="4gq8yQBZ7co" role="37wK5m">
                           <node concept="3cpWs3" id="4gq8yQBZ7cp" role="3uHU7B">
                             <node concept="Xl_RD" id="4gq8yQBZ7cq" role="3uHU7B">
@@ -8214,7 +8214,7 @@
                                 <ref role="3cqZAo" node="4gq8yQBZ79M" resolve="myModule" />
                               </node>
                               <node concept="liA8E" id="4gq8yQBZ7ct" role="2OqNvi">
-                                <ref role="37wK5l" to="lui2:~SModuleReference.getModuleName():java.lang.String" resolve="getModuleName" />
+                                <ref role="37wK5l" to="lui2:~SModuleReference.getModuleName()" resolve="getModuleName" />
                               </node>
                             </node>
                           </node>
@@ -8244,7 +8244,7 @@
                     <ref role="37wK5l" node="4gq8yQBZ6QN" resolve="getTree" />
                   </node>
                   <node concept="liA8E" id="4gq8yQBZ7cC" role="2OqNvi">
-                    <ref role="37wK5l" to="7e8u:~MPSTree.selectNode(javax.swing.tree.TreeNode):void" resolve="selectNode" />
+                    <ref role="37wK5l" to="7e8u:~MPSTree.selectNode(javax.swing.tree.TreeNode)" resolve="selectNode" />
                     <node concept="37vLTw" id="4gq8yQBZ7cD" role="37wK5m">
                       <ref role="3cqZAo" node="4gq8yQBZ7an" resolve="toSelect" />
                     </node>
@@ -8402,7 +8402,7 @@
                   <ref role="3cqZAo" node="4QICnJ5HLD9" resolve="model" />
                 </node>
                 <node concept="liA8E" id="4QICnJ5HLE0" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.isReadOnly():boolean" resolve="isReadOnly" />
+                  <ref role="37wK5l" to="mhbf:~SModel.isReadOnly()" resolve="isReadOnly" />
                 </node>
               </node>
             </node>
@@ -8413,7 +8413,7 @@
                     <ref role="3cqZAo" node="4QICnJ5HLD9" resolve="model" />
                   </node>
                   <node concept="liA8E" id="4QICnJ5HLE6" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.addModelListener(org.jetbrains.mps.openapi.model.SModelListener):void" resolve="addModelListener" />
+                    <ref role="37wK5l" to="mhbf:~SModel.addModelListener(org.jetbrains.mps.openapi.model.SModelListener)" resolve="addModelListener" />
                     <node concept="Xjq3P" id="4QICnJ5HLDj" role="37wK5m" />
                   </node>
                 </node>
@@ -8446,7 +8446,7 @@
                 <ref role="3cqZAo" node="4QICnJ5HLDo" resolve="model" />
               </node>
               <node concept="liA8E" id="4QICnJ5HLEc" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.removeModelListener(org.jetbrains.mps.openapi.model.SModelListener):void" resolve="removeModelListener" />
+                <ref role="37wK5l" to="mhbf:~SModel.removeModelListener(org.jetbrains.mps.openapi.model.SModelListener)" resolve="removeModelListener" />
                 <node concept="Xjq3P" id="4QICnJ5HLDt" role="37wK5m" />
               </node>
             </node>
@@ -18899,7 +18899,7 @@
         </node>
       </node>
       <node concept="2YIFZM" id="1zw8Mi3XbvO" role="33vP2m">
-        <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+        <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
         <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
       </node>
       <node concept="3Tm6S6" id="1zw8Mi3XbvP" role="1B3o_S" />
@@ -18918,7 +18918,7 @@
         </node>
       </node>
       <node concept="2YIFZM" id="1zw8Mi3XbvU" role="33vP2m">
-        <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+        <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
         <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
       </node>
       <node concept="3Tm6S6" id="1zw8Mi3XbvV" role="1B3o_S" />
@@ -19041,7 +19041,7 @@
                 <ref role="3cqZAo" node="1zw8Mi3XbvQ" resolve="mySelectedPathsRaw" />
               </node>
               <node concept="liA8E" id="1zw8Mi3YE1b" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
             <node concept="2OqwBi" id="1zw8Mi3Yd3U" role="3uHU7B">
@@ -19049,7 +19049,7 @@
                 <ref role="3cqZAo" node="1zw8Mi3XbvK" resolve="myExpandedPathsRaw" />
               </node>
               <node concept="liA8E" id="1zw8Mi3YqTN" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/generator/template/main@generator.mps b/code/projectview/com.mbeddr.mpsutil.projectview/generator/template/main@generator.mps
index ff7e138bb..2d8fb0832 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview/generator/template/main@generator.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview/generator/template/main@generator.mps
@@ -22,6 +22,7 @@
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -2494,7 +2495,7 @@
                     <node concept="3clFb_" id="16TtUNxV60a" role="jymVt">
                       <property role="TrG5h" value="isDefaultView" />
                       <node concept="37vLTG" id="16TtUNxV60b" role="3clF46">
-                        <property role="TrG5h" value="project" />
+                        <property role="TrG5h" value="ideaProject" />
                         <property role="3TUv4t" value="true" />
                         <node concept="3uibUv" id="16TtUNxV60c" role="1tU5fm">
                           <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
@@ -2509,11 +2510,27 @@
                         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                       </node>
                       <node concept="3clFbS" id="16TtUNxV60l" role="3clF47">
+                        <node concept="3cpWs8" id="4r73zmg5WYl" role="3cqZAp">
+                          <node concept="3cpWsn" id="4r73zmg5WYo" role="3cpWs9">
+                            <property role="TrG5h" value="mpsProject" />
+                            <node concept="3uibUv" id="4r73zmg5WYq" role="1tU5fm">
+                              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                            </node>
+                            <node concept="2YIFZM" id="4r73zmg6LI_" role="33vP2m">
+                              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
+                              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+                              <node concept="37vLTw" id="4r73zmg6Tul" role="37wK5m">
+                                <ref role="3cqZAo" node="16TtUNxV60b" resolve="ideaProject" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="4r73zmg5IO9" role="3cqZAp" />
                         <node concept="3cpWs6" id="16TtUNxW69C" role="3cqZAp">
                           <node concept="3nyPlj" id="16TtUNxW69D" role="3cqZAk">
                             <ref role="37wK5l" to="imq3:5i3SmuN3Fvf" resolve="isDefaultView" />
                             <node concept="37vLTw" id="16TtUNxW69E" role="37wK5m">
-                              <ref role="3cqZAo" node="16TtUNxV60b" resolve="project" />
+                              <ref role="3cqZAo" node="16TtUNxV60b" resolve="ideaProject" />
                             </node>
                           </node>
                           <node concept="2b32R4" id="16TtUNxWdS7" role="lGtFl">
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/behavior.mps b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/behavior.mps
index 486c8d92f..9095dbc08 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/behavior.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/behavior.mps
@@ -1106,9 +1106,6 @@
         <node concept="3cpWs6" id="16TtUNxULEJ" role="3cqZAp">
           <node concept="2ShNRf" id="16TtUNxULEK" role="3cqZAk">
             <node concept="Tc6Ow" id="16TtUNxULEL" role="2ShVmc">
-              <node concept="35c_gC" id="16TtUNxULEM" role="HW$Y0">
-                <ref role="35c_gD" to="d04j:16TtUNxULL$" resolve="ProjectParameter" />
-              </node>
               <node concept="3bZ5Sz" id="16TtUNxULEO" role="HW$YZ">
                 <ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
               </node>
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/constraints.mps b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/constraints.mps
index 318a7cb1e..35ae5683c 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/constraints.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/constraints.mps
@@ -2,6 +2,7 @@
 <model ref="r:13351092-2919-4893-840a-9642691e9017(com.mbeddr.mpsutil.projectview.constraints)">
   <persistence version="9" />
   <languages>
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
@@ -12,6 +13,7 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <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>
@@ -32,6 +34,7 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -53,6 +56,9 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -63,12 +69,17 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
+      <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
+      <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
+      <concept id="4303308395523343364" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_link" flags="ng" index="2DA6wF" />
       <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
         <child id="1213100494875" name="referent" index="1Mr941" />
       </concept>
       <concept id="1148687176410" name="jetbrains.mps.lang.constraints.structure.NodeReferentConstraint" flags="ng" index="1N5Pfh">
@@ -88,6 +99,11 @@
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
+        <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
+        <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
+      </concept>
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -203,5 +219,64 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4r73zmge38y">
+    <ref role="1M2myG" to="d04j:7diJr$RuH1Z" resolve="MPSProjectExpression" />
+    <node concept="9S07l" id="4r73zmgfpeu" role="9Vyp8">
+      <node concept="3clFbS" id="4r73zmgfpev" role="2VODD2">
+        <node concept="3clFbF" id="4r73zmge3xU" role="3cqZAp">
+          <node concept="1Wc70l" id="4r73zmgmqxX" role="3clFbG">
+            <node concept="1Wc70l" id="4r73zmgk36a" role="3uHU7B">
+              <node concept="1eOMI4" id="4r73zmgix_w" role="3uHU7B">
+                <node concept="22lmx$" id="4r73zmge9$M" role="1eOMHV">
+                  <node concept="2OqwBi" id="4r73zmgeoAq" role="3uHU7w">
+                    <node concept="2OqwBi" id="4r73zmge9CE" role="2Oq$k0">
+                      <node concept="nLn13" id="4r73zmgftxw" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="4r73zmge9P7" role="2OqNvi">
+                        <node concept="1xMEDy" id="4r73zmge9P9" role="1xVPHs">
+                          <node concept="chp4Y" id="4r73zmgeo5p" role="ri$Ld">
+                            <ref role="cht4Q" to="d04j:7diJr$RulqU" resolve="TreeNodeElement" />
+                          </node>
+                        </node>
+                        <node concept="1xIGOp" id="4r73zmgfsof" role="1xVPHs" />
+                      </node>
+                    </node>
+                    <node concept="3x8VRR" id="4r73zmgeoVa" role="2OqNvi" />
+                  </node>
+                  <node concept="2OqwBi" id="4r73zmge8Cd" role="3uHU7B">
+                    <node concept="2OqwBi" id="4r73zmge3Nd" role="2Oq$k0">
+                      <node concept="nLn13" id="4r73zmgft5M" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="4r73zmge7z$" role="2OqNvi">
+                        <node concept="1xMEDy" id="4r73zmge7zA" role="1xVPHs">
+                          <node concept="chp4Y" id="4r73zmge8iV" role="ri$Ld">
+                            <ref role="cht4Q" to="d04j:16TtUNxULnU" resolve="DefaultViewFunction" />
+                          </node>
+                        </node>
+                        <node concept="1xIGOp" id="4r73zmgfslF" role="1xVPHs" />
+                      </node>
+                    </node>
+                    <node concept="3x8VRR" id="4r73zmge92u" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="17QLQc" id="4r73zmgk3RM" role="3uHU7w">
+                <node concept="2DA6wF" id="4r73zmgk3aZ" role="3uHU7B" />
+                <node concept="359W_D" id="4r73zmgk41Z" role="3uHU7w">
+                  <ref role="359W_E" to="d04j:7diJr$RulqU" resolve="TreeNodeElement" />
+                  <ref role="359W_F" to="d04j:7diJr$RuzNU" resolve="label" />
+                </node>
+              </node>
+            </node>
+            <node concept="17QLQc" id="4r73zmgmqQj" role="3uHU7w">
+              <node concept="359W_D" id="4r73zmgmqQk" role="3uHU7w">
+                <ref role="359W_E" to="d04j:7diJr$RulqU" resolve="TreeNodeElement" />
+                <ref role="359W_F" to="d04j:75_oBQVs9f$" resolve="actionGroupId" />
+              </node>
+              <node concept="2DA6wF" id="4r73zmgmqQl" role="3uHU7B" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/editor.mps b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/editor.mps
index 3e1d84f9d..cec02905f 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/editor.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/editor.mps
@@ -167,7 +167,7 @@
             <property role="3F0ifm" value="Label:" />
           </node>
           <node concept="3F1sOY" id="3ZnFyBju6vm" role="3EZMnx">
-            <property role="1$x2rV" value="&lt;merge into extended view&gt;" />
+            <property role="1$x2rV" value="&lt;view is not visible&gt;" />
             <ref role="1NtTu8" to="d04j:3ZnFyBju6hN" resolve="label" />
           </node>
           <node concept="2iRfu4" id="3ZnFyBju6pS" role="2iSdaV" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl
index 235c99127..97fcb1a81 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl
@@ -56,7 +56,10 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="120e1c9d-4e27-4478-b2af-b2c3bd3850b0(com.mbeddr.mpsutil.editor.querylist)" version="0" />
     <module reference="9b71d0db-bcaf-4144-bb2e-1ddef2b249b9(com.mbeddr.mpsutil.editor.querylist.demolang)" version="0" />
     <module reference="94b17d5e-87d9-4868-8101-157e83e33243(com.mbeddr.mpsutil.editor.querylist.runtime)" version="0" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/editor.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/editor.mps
index 007e21c3a..5a7681915 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/editor.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/editor.mps
@@ -15,6 +15,7 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -68,6 +69,7 @@
       <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
+      <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
       <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -131,6 +133,7 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
@@ -139,6 +142,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -225,8 +231,11 @@
         <child id="393429538058605400" name="getSubstituteInfo" index="2hlaPc" />
         <child id="6202678563380433923" name="query" index="sbcd9" />
         <child id="5820306262933755617" name="insertNewNode" index="AS3tk" />
+        <child id="1037264524327228644" name="disableModelCheckingCondition" index="3oLCTM" />
+        <child id="4601216887035799527" name="usesFoldingCondition" index="1p_IA6" />
         <child id="7238779735251877228" name="editorComponent" index="1yzFaX" />
         <child id="6046489571270834038" name="foldedCellModel" index="3EmGlc" />
+        <child id="6240706158490734121" name="collapseByDefaultCondition" index="3EXrW6" />
       </concept>
       <concept id="5820306262933110156" name="com.mbeddr.mpsutil.editor.querylist.structure.Function_InsertNewNode" flags="ig" index="ARxKT" />
       <concept id="5820306262933734929" name="com.mbeddr.mpsutil.editor.querylist.structure.Parameter_AnchorNode" flags="ng" index="AS6u$" />
@@ -239,6 +248,12 @@
       <concept id="767145758118872824" name="jetbrains.mps.lang.actions.structure.NF_Node_InsertNewNextSiblingOperation" flags="nn" index="2DeJnS" />
       <concept id="767145758118872826" name="jetbrains.mps.lang.actions.structure.NF_Node_InsertNewPrevSiblingOperation" flags="nn" index="2DeJnU" />
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
+        <property id="6332851714983843871" name="severity" index="2xdLsb" />
+        <child id="5721587534047265374" name="message" index="9lYJi" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -262,6 +277,7 @@
         <child id="1143224127716" name="insertedNode" index="HtX7I" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -270,6 +286,7 @@
         <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1143511969223" name="jetbrains.mps.lang.smodel.structure.Node_GetPrevSiblingOperation" flags="nn" index="YBYNd" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
       </concept>
@@ -325,10 +342,12 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
+      <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -529,25 +548,60 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="6NOOaBx2v0v" role="3cqZAp" />
             </node>
           </node>
           <node concept="AVF6i" id="puVMIbw5YA" role="2daAY1">
             <node concept="3clFbS" id="puVMIbw5YB" role="2VODD2">
-              <node concept="3clFbF" id="puVMIbw6gw" role="3cqZAp">
-                <node concept="2OqwBi" id="puVMIbw6zd" role="3clFbG">
-                  <node concept="2OqwBi" id="puVMIbw6hF" role="2Oq$k0">
-                    <node concept="2dRY2x" id="puVMIbwm67" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="puVMIbw6uO" role="2OqNvi">
-                      <node concept="1xMEDy" id="puVMIbw6uQ" role="1xVPHs">
-                        <node concept="chp4Y" id="puVMIbw6vP" role="ri$Ld">
+              <node concept="3cpWs8" id="6NOOaBwZFYK" role="3cqZAp">
+                <node concept="3cpWsn" id="6NOOaBwZFYL" role="3cpWs9">
+                  <property role="TrG5h" value="statement" />
+                  <node concept="3Tqbb2" id="6NOOaBwZEHw" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:fzclF8l" resolve="Statement" />
+                  </node>
+                  <node concept="2OqwBi" id="6NOOaBwZFYM" role="33vP2m">
+                    <node concept="2dRY2x" id="6NOOaBwZFYN" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="6NOOaBwZFYO" role="2OqNvi">
+                      <node concept="1xMEDy" id="6NOOaBwZFYP" role="1xVPHs">
+                        <node concept="chp4Y" id="6NOOaBwZFYQ" role="ri$Ld">
                           <ref role="cht4Q" to="tpee:fzclF8l" resolve="Statement" />
                         </node>
                       </node>
                     </node>
                   </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6NOOaBwZGJD" role="3cqZAp">
+                <node concept="3cpWsn" id="6NOOaBwZGJE" role="3cpWs9">
+                  <property role="TrG5h" value="prevStatement" />
+                  <node concept="3Tqbb2" id="6NOOaBwZGJB" role="1tU5fm" />
+                  <node concept="2OqwBi" id="6NOOaBwZGJF" role="33vP2m">
+                    <node concept="37vLTw" id="6NOOaBwZGJG" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6NOOaBwZFYL" resolve="statement" />
+                    </node>
+                    <node concept="YBYNd" id="6NOOaBwZGJH" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="puVMIbw6gw" role="3cqZAp">
+                <node concept="2OqwBi" id="puVMIbw6zd" role="3clFbG">
+                  <node concept="37vLTw" id="6NOOaBwZFYR" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6NOOaBwZFYL" resolve="statement" />
+                  </node>
                   <node concept="3YRAZt" id="puVMIbw6M6" role="2OqNvi" />
                 </node>
               </node>
+              <node concept="3clFbF" id="6NOOaBwZGSR" role="3cqZAp">
+                <node concept="2OqwBi" id="6NOOaBwZH0J" role="3clFbG">
+                  <node concept="1Q80Hx" id="6NOOaBwZGSQ" role="2Oq$k0" />
+                  <node concept="liA8E" id="6NOOaBwZH9j" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.select(org.jetbrains.mps.openapi.model.SNode)" resolve="select" />
+                    <node concept="37vLTw" id="6NOOaBwZHbj" role="37wK5m">
+                      <ref role="3cqZAo" node="6NOOaBwZGJE" resolve="prevStatement" />
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
           <node concept="1yz3lS" id="6QZo_pQaOIe" role="1yzFaX">
@@ -783,6 +837,15 @@
                 </node>
               </node>
             </node>
+            <node concept="2xdQw9" id="6NOOaBx2vb7" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="6NOOaBx2vb8" role="9lYJi">
+                <node concept="1Q80Hx" id="6NOOaBx2vb9" role="3uHU7w" />
+                <node concept="Xl_RD" id="6NOOaBx2vba" role="3uHU7B">
+                  <property role="Xl_RC" value="Context:" />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="2hrTlp" id="lPJxik8tP5" role="2hlaPc">
@@ -851,6 +914,342 @@
                 <node concept="3YRAZt" id="C$q8A2EtqY" role="2OqNvi" />
               </node>
             </node>
+            <node concept="2xdQw9" id="6NOOaBx2w6m" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="6NOOaBx2w6n" role="9lYJi">
+                <node concept="1Q80Hx" id="6NOOaBx2w6o" role="3uHU7w" />
+                <node concept="Xl_RD" id="6NOOaBx2w6p" role="3uHU7B">
+                  <property role="Xl_RC" value="Context:" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="5oklODae9G7" role="2iSdaV" />
+      <node concept="3F0ifn" id="T_6DrmGCs2" role="3EZMnx">
+        <property role="3F0ifm" value="statements from other class (without error reporting):" />
+        <node concept="ljvvj" id="T_6DrmGCs3" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="T_6DrmGCs4" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="s8t4o" id="T_6DrmGCs5" role="3EZMnx">
+        <property role="S$F3r" value="true" />
+        <ref role="28F8cf" to="tpee:fzclF8l" resolve="Statement" />
+        <node concept="s8sZD" id="T_6DrmGCs6" role="sbcd9">
+          <node concept="3clFbS" id="T_6DrmGCs7" role="2VODD2">
+            <node concept="3clFbF" id="T_6DrmGCs8" role="3cqZAp">
+              <node concept="2OqwBi" id="T_6DrmGCs9" role="3clFbG">
+                <node concept="2OqwBi" id="T_6DrmGCsa" role="2Oq$k0">
+                  <node concept="2OqwBi" id="T_6DrmGCsb" role="2Oq$k0">
+                    <node concept="2OqwBi" id="T_6DrmGCsc" role="2Oq$k0">
+                      <node concept="2OqwBi" id="T_6DrmGCsd" role="2Oq$k0">
+                        <node concept="2OqwBi" id="T_6DrmGCse" role="2Oq$k0">
+                          <node concept="2OqwBi" id="T_6DrmGCsf" role="2Oq$k0">
+                            <node concept="pncrf" id="T_6DrmGCsg" role="2Oq$k0" />
+                            <node concept="I4A8Y" id="T_6DrmGCsh" role="2OqNvi" />
+                          </node>
+                          <node concept="2RRcyG" id="T_6DrmGCsi" role="2OqNvi">
+                            <node concept="chp4Y" id="T_6DrmGCsj" role="3MHsoP">
+                              <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="34jXtK" id="5fXNsKgPxxk" role="2OqNvi">
+                          <node concept="3cmrfG" id="5fXNsKgPxVc" role="25WWJ7">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2qgKlT" id="T_6DrmGCsl" role="2OqNvi">
+                        <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
+                      </node>
+                    </node>
+                    <node concept="1uHKPH" id="T_6DrmGCsm" role="2OqNvi" />
+                  </node>
+                  <node concept="3TrEf2" id="T_6DrmGCsn" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
+                  </node>
+                </node>
+                <node concept="3Tsc0h" id="T_6DrmGCso" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2iRkQZ" id="T_6DrmGCsp" role="2czzBy" />
+        <node concept="ARxKT" id="T_6DrmGCsq" role="AS3tk">
+          <node concept="3clFbS" id="T_6DrmGCsr" role="2VODD2">
+            <node concept="3cpWs8" id="T_6DrmGCss" role="3cqZAp">
+              <node concept="3cpWsn" id="T_6DrmGCst" role="3cpWs9">
+                <property role="TrG5h" value="newNode" />
+                <node concept="3Tqbb2" id="T_6DrmGCsu" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:fzclF8l" resolve="Statement" />
+                </node>
+                <node concept="2ShNRf" id="T_6DrmGCsv" role="33vP2m">
+                  <node concept="3zrR0B" id="T_6DrmGCsw" role="2ShVmc">
+                    <node concept="3Tqbb2" id="T_6DrmGCsx" role="3zrR0E">
+                      <ref role="ehGHo" to="tpee:fzclF8l" resolve="Statement" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="T_6DrmGCsy" role="3cqZAp">
+              <node concept="3cpWsn" id="T_6DrmGCsz" role="3cpWs9">
+                <property role="TrG5h" value="method" />
+                <node concept="3Tqbb2" id="T_6DrmGCs$" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
+                </node>
+                <node concept="2OqwBi" id="T_6DrmGCs_" role="33vP2m">
+                  <node concept="2OqwBi" id="T_6DrmGCsA" role="2Oq$k0">
+                    <node concept="2OqwBi" id="T_6DrmGCsB" role="2Oq$k0">
+                      <node concept="2OqwBi" id="T_6DrmGCsC" role="2Oq$k0">
+                        <node concept="2OqwBi" id="T_6DrmGCsD" role="2Oq$k0">
+                          <node concept="pncrf" id="T_6DrmGCsE" role="2Oq$k0" />
+                          <node concept="I4A8Y" id="T_6DrmGCsF" role="2OqNvi" />
+                        </node>
+                        <node concept="2RRcyG" id="T_6DrmGCsG" role="2OqNvi">
+                          <node concept="chp4Y" id="T_6DrmGCsH" role="3MHsoP">
+                            <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1uHKPH" id="T_6DrmGCsI" role="2OqNvi" />
+                    </node>
+                    <node concept="2qgKlT" id="T_6DrmGCsJ" role="2OqNvi">
+                      <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
+                    </node>
+                  </node>
+                  <node concept="1uHKPH" id="T_6DrmGCsK" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="T_6DrmGCsL" role="3cqZAp">
+              <node concept="3clFbS" id="T_6DrmGCsM" role="3clFbx">
+                <node concept="3clFbF" id="T_6DrmGCsN" role="3cqZAp">
+                  <node concept="2OqwBi" id="T_6DrmGCsO" role="3clFbG">
+                    <node concept="2OqwBi" id="T_6DrmGCsP" role="2Oq$k0">
+                      <node concept="2OqwBi" id="T_6DrmGCsQ" role="2Oq$k0">
+                        <node concept="37vLTw" id="T_6DrmGCsR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="T_6DrmGCsz" resolve="method" />
+                        </node>
+                        <node concept="3TrEf2" id="T_6DrmGCsS" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="T_6DrmGCsT" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                      </node>
+                    </node>
+                    <node concept="TSZUe" id="T_6DrmGCsU" role="2OqNvi">
+                      <node concept="37vLTw" id="T_6DrmGCsV" role="25WWJ7">
+                        <ref role="3cqZAo" node="T_6DrmGCst" resolve="newNode" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="T_6DrmGCsW" role="3clFbw">
+                <node concept="10Nm6u" id="T_6DrmGCsX" role="3uHU7w" />
+                <node concept="AS6u$" id="T_6DrmGCsY" role="3uHU7B" />
+              </node>
+              <node concept="9aQIb" id="T_6DrmGCsZ" role="9aQIa">
+                <node concept="3clFbS" id="T_6DrmGCt0" role="9aQI4">
+                  <node concept="3clFbJ" id="T_6DrmGCt1" role="3cqZAp">
+                    <node concept="3clFbS" id="T_6DrmGCt2" role="3clFbx">
+                      <node concept="3clFbF" id="T_6DrmGCt3" role="3cqZAp">
+                        <node concept="2OqwBi" id="T_6DrmGCt4" role="3clFbG">
+                          <node concept="AS6u$" id="T_6DrmGCt5" role="2Oq$k0" />
+                          <node concept="HtX7F" id="T_6DrmGCt6" role="2OqNvi">
+                            <node concept="37vLTw" id="T_6DrmGCt7" role="HtX7I">
+                              <ref role="3cqZAo" node="T_6DrmGCst" resolve="newNode" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="AVj8N" id="T_6DrmGCt8" role="3clFbw" />
+                    <node concept="9aQIb" id="T_6DrmGCt9" role="9aQIa">
+                      <node concept="3clFbS" id="T_6DrmGCta" role="9aQI4">
+                        <node concept="3clFbF" id="T_6DrmGCtb" role="3cqZAp">
+                          <node concept="2OqwBi" id="T_6DrmGCtc" role="3clFbG">
+                            <node concept="AS6u$" id="T_6DrmGCtd" role="2Oq$k0" />
+                            <node concept="HtI8k" id="T_6DrmGCte" role="2OqNvi">
+                              <node concept="37vLTw" id="T_6DrmGCtf" role="HtI8F">
+                                <ref role="3cqZAo" node="T_6DrmGCst" resolve="newNode" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2hrTlp" id="T_6DrmGCtg" role="2hlaPc">
+          <node concept="3clFbS" id="T_6DrmGCth" role="2VODD2">
+            <node concept="3cpWs8" id="T_6DrmGCti" role="3cqZAp">
+              <node concept="3cpWsn" id="T_6DrmGCtj" role="3cpWs9">
+                <property role="TrG5h" value="body" />
+                <node concept="3Tqbb2" id="T_6DrmGCtk" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
+                </node>
+                <node concept="2OqwBi" id="T_6DrmGCtl" role="33vP2m">
+                  <node concept="2OqwBi" id="T_6DrmGCtm" role="2Oq$k0">
+                    <node concept="2OqwBi" id="T_6DrmGCtn" role="2Oq$k0">
+                      <node concept="2OqwBi" id="T_6DrmGCto" role="2Oq$k0">
+                        <node concept="2OqwBi" id="T_6DrmGCtp" role="2Oq$k0">
+                          <node concept="2OqwBi" id="T_6DrmGCtq" role="2Oq$k0">
+                            <node concept="pncrf" id="T_6DrmGCtr" role="2Oq$k0" />
+                            <node concept="I4A8Y" id="T_6DrmGCts" role="2OqNvi" />
+                          </node>
+                          <node concept="2RRcyG" id="T_6DrmGCtt" role="2OqNvi">
+                            <node concept="chp4Y" id="T_6DrmGCtu" role="3MHsoP">
+                              <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1uHKPH" id="T_6DrmGCtv" role="2OqNvi" />
+                      </node>
+                      <node concept="2qgKlT" id="T_6DrmGCtw" role="2OqNvi">
+                        <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
+                      </node>
+                    </node>
+                    <node concept="1uHKPH" id="T_6DrmGCtx" role="2OqNvi" />
+                  </node>
+                  <node concept="3TrEf2" id="T_6DrmGCty" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="T_6DrmGCtz" role="3cqZAp">
+              <node concept="2OqwBi" id="T_6DrmGCt$" role="3cqZAk">
+                <node concept="2hkjam" id="T_6DrmGCt_" role="2Oq$k0" />
+                <node concept="liA8E" id="T_6DrmGCtA" role="2OqNvi">
+                  <ref role="37wK5l" to="d2zl:2Fugwv5Fpi_" resolve="forChild" />
+                  <node concept="37vLTw" id="T_6DrmGCtB" role="37wK5m">
+                    <ref role="3cqZAo" node="T_6DrmGCtj" resolve="body" />
+                  </node>
+                  <node concept="2dRBZr" id="T_6DrmGCtC" role="37wK5m" />
+                  <node concept="359W_D" id="T_6DrmGCtD" role="37wK5m">
+                    <ref role="359W_E" to="tpee:fzclF80" resolve="StatementList" />
+                    <ref role="359W_F" to="tpee:fzcqZ_x" resolve="statement" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3F0ifn" id="T_6DrmGCtE" role="2czzBI">
+          <property role="ilYzB" value="&lt;no statements in other class&gt;" />
+        </node>
+        <node concept="AVF6i" id="T_6DrmGCtF" role="2daAY1">
+          <node concept="3clFbS" id="T_6DrmGCtG" role="2VODD2">
+            <node concept="3clFbF" id="T_6DrmGCtH" role="3cqZAp">
+              <node concept="2OqwBi" id="T_6DrmGCtI" role="3clFbG">
+                <node concept="2dRY2x" id="T_6DrmGCtJ" role="2Oq$k0" />
+                <node concept="3YRAZt" id="T_6DrmGCtK" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="pkWqt" id="T_6DrmGJv4" role="3oLCTM">
+          <node concept="3clFbS" id="T_6DrmGJv7" role="2VODD2">
+            <node concept="2xdQw9" id="T_6DrmTcSK" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmTcSL" role="9lYJi">
+                <node concept="1Q80Hx" id="T_6DrmTcSM" role="3uHU7w" />
+                <node concept="Xl_RD" id="T_6DrmTcSN" role="3uHU7B">
+                  <property role="Xl_RC" value="Context:" />
+                </node>
+              </node>
+            </node>
+            <node concept="2xdQw9" id="T_6DrmTcSO" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmTcSP" role="9lYJi">
+                <node concept="Xl_RD" id="T_6DrmTcSQ" role="3uHU7B">
+                  <property role="Xl_RC" value="Node:" />
+                </node>
+                <node concept="2OqwBi" id="T_6DrmZlL$" role="3uHU7w">
+                  <node concept="pncrf" id="T_6DrmTcSR" role="2Oq$k0" />
+                  <node concept="2Iv5rx" id="T_6DrmZlNg" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrmH67C" role="3cqZAp">
+              <node concept="3clFbT" id="T_6DrmH67B" role="3clFbG">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="pkWqt" id="T_6DrmR3Cr" role="3EXrW6">
+          <node concept="3clFbS" id="T_6DrmR3Cs" role="2VODD2">
+            <node concept="2xdQw9" id="T_6DrmTchg" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmTcGk" role="9lYJi">
+                <node concept="1Q80Hx" id="T_6DrmTcH4" role="3uHU7w" />
+                <node concept="Xl_RD" id="T_6DrmTchi" role="3uHU7B">
+                  <property role="Xl_RC" value="Context:" />
+                </node>
+              </node>
+            </node>
+            <node concept="2xdQw9" id="T_6DrmTcLr" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmTcLs" role="9lYJi">
+                <node concept="Xl_RD" id="T_6DrmTcLu" role="3uHU7B">
+                  <property role="Xl_RC" value="Node:" />
+                </node>
+                <node concept="2OqwBi" id="T_6DrmZloy" role="3uHU7w">
+                  <node concept="pncrf" id="T_6DrmTcS1" role="2Oq$k0" />
+                  <node concept="2Iv5rx" id="T_6DrmZlBq" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrmR4wd" role="3cqZAp">
+              <node concept="3clFbT" id="T_6DrmR4wc" role="3clFbG">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="pkWqt" id="T_6DrmR4wL" role="1p_IA6">
+          <node concept="3clFbS" id="T_6DrmR4wM" role="2VODD2">
+            <node concept="2xdQw9" id="T_6DrmVDQs" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmVDQt" role="9lYJi">
+                <node concept="1Q80Hx" id="T_6DrmVDQu" role="3uHU7w" />
+                <node concept="Xl_RD" id="T_6DrmVDQv" role="3uHU7B">
+                  <property role="Xl_RC" value="Context:" />
+                </node>
+              </node>
+            </node>
+            <node concept="2xdQw9" id="T_6DrmVDQw" role="3cqZAp">
+              <property role="2xdLsb" value="gZ5fh_4/error" />
+              <node concept="3cpWs3" id="T_6DrmVDQx" role="9lYJi">
+                <node concept="Xl_RD" id="T_6DrmVDQy" role="3uHU7B">
+                  <property role="Xl_RC" value="Node:" />
+                </node>
+                <node concept="2OqwBi" id="6YCOCkJBG3I" role="3uHU7w">
+                  <node concept="pncrf" id="T_6DrmVDQz" role="2Oq$k0" />
+                  <node concept="2Iv5rx" id="6YCOCkJBG3J" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrmR5mz" role="3cqZAp">
+              <node concept="3clFbT" id="T_6DrmR5my" role="3clFbG">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -1267,6 +1666,88 @@
           <property role="VOm3f" value="false" />
         </node>
       </node>
+      <node concept="3F0ifn" id="T_6DrkZbRs" role="3EZMnx">
+        <property role="3F0ifm" value="dynamic created expression:" />
+        <node concept="ljvvj" id="T_6DrkZhyY" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="T_6DrkZhyZ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="s8t4o" id="T_6DrkZjsI" role="3EZMnx">
+        <ref role="28F8cf" to="tpck:gw2VY9q" resolve="BaseConcept" />
+        <node concept="s8sZD" id="T_6DrkZjsJ" role="sbcd9">
+          <node concept="3clFbS" id="T_6DrkZjsK" role="2VODD2">
+            <node concept="3cpWs8" id="T_6DrkZpzf" role="3cqZAp">
+              <node concept="3cpWsn" id="T_6DrkZpzi" role="3cpWs9">
+                <property role="TrG5h" value="expressions" />
+                <node concept="_YKpA" id="T_6DrkZpzd" role="1tU5fm">
+                  <node concept="3Tqbb2" id="T_6DrkZp$2" role="_ZDj9" />
+                </node>
+                <node concept="2ShNRf" id="T_6DrkZpAw" role="33vP2m">
+                  <node concept="2Jqq0_" id="T_6DrkZqnw" role="2ShVmc">
+                    <node concept="3Tqbb2" id="T_6DrkZq_V" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrkZqFi" role="3cqZAp">
+              <node concept="2OqwBi" id="T_6DrkZr_I" role="3clFbG">
+                <node concept="37vLTw" id="T_6DrkZqFg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="T_6DrkZpzi" resolve="expressions" />
+                </node>
+                <node concept="TSZUe" id="T_6DrkZuIm" role="2OqNvi">
+                  <node concept="2c44tf" id="T_6DrkZv6a" role="25WWJ7">
+                    <node concept="3cpWs3" id="T_6DrkZvVZ" role="2c44tc">
+                      <node concept="3cmrfG" id="T_6DrkZvW6" role="3uHU7w">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                      <node concept="3cmrfG" id="T_6DrkZvaX" role="3uHU7B">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrkZw0p" role="3cqZAp">
+              <node concept="2OqwBi" id="T_6DrkZw0q" role="3clFbG">
+                <node concept="37vLTw" id="T_6DrkZw0r" role="2Oq$k0">
+                  <ref role="3cqZAo" node="T_6DrkZpzi" resolve="expressions" />
+                </node>
+                <node concept="TSZUe" id="T_6DrkZw0s" role="2OqNvi">
+                  <node concept="2c44tf" id="T_6DrkZw0t" role="25WWJ7">
+                    <node concept="3cpWs3" id="T_6DrkZw0u" role="2c44tc">
+                      <node concept="3clFbT" id="T_6DrkZw5a" role="3uHU7w">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="3cmrfG" id="T_6DrkZw0w" role="3uHU7B">
+                        <property role="3cmrfH" value="1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="T_6DrkZqC$" role="3cqZAp">
+              <node concept="37vLTw" id="T_6DrkZqCy" role="3clFbG">
+                <ref role="3cqZAo" node="T_6DrkZpzi" resolve="expressions" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2iRkQZ" id="T_6DrkZjsR" role="2czzBy" />
+        <node concept="3F0ifn" id="T_6DrkZjv4" role="2czzBI">
+          <property role="ilYzB" value="&lt;no statements in other class&gt;" />
+          <node concept="VPxyj" id="T_6DrkZjv5" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="xShMh" id="T_6DrkZpyE" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="3F0ifn" id="lPJxikeccu" role="3EZMnx">
         <property role="3F0ifm" value="end" />
         <node concept="ljvvj" id="lPJxikeccv" role="3F10Kt">
@@ -1276,7 +1757,6 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="l2Vlx" id="5oklODae9G7" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="5wsE7kXae4w">
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd
index e07f95c97..1e7f5a5ab 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd
@@ -14,39 +14,64 @@
   <dependencies>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
+    <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l: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: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:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
     <module reference="94b17d5e-87d9-4868-8101-157e83e33243(com.mbeddr.mpsutil.editor.querylist.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="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
+    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
+    <module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps
new file mode 100644
index 000000000..ebbd0ede1
--- /dev/null
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps
@@ -0,0 +1,1485 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:5f74240b-ce7f-4ae5-99bc-bf1a210bda6d(com.mbeddr.mpsutil.editor.querylist.runtime.plugin)">
+  <persistence version="9" />
+  <languages>
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
+  <imports>
+    <import index="zyr2" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.inspector(MPS.Editor/)" />
+    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
+    <import index="h83j" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem(MPS.Core/)" />
+    <import index="j9co" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.event(MPS.Core/)" />
+    <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="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="wsw7" ref="r:ba41e9c6-15ca-4a47-95f2-6a81c2318547(jetbrains.mps.checkers)" />
+    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="7a0s" ref="r:2af017c2-293f-4ebb-99f3-81e353b3d6e6(jetbrains.mps.editor.runtime)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
+    <import index="n70j" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.checking(MPS.Editor/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
+    <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
+    <import index="d2zl" ref="94b17d5e-87d9-4868-8101-157e83e33243/r:88465183-d595-48bc-8650-6e4d36344e13(com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
+    <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
+    <import index="tp6m" ref="r:00000000-0000-4000-0000-011c895903a2(jetbrains.mps.lang.test.runtime)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
+    <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
+    <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
+    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="rfhd" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util.registry(MPS.IDEA/)" />
+    <import index="jmi8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.util(MPS.IDEA/)" />
+  </imports>
+  <registry>
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
+      <concept id="1203071646776" name="jetbrains.mps.lang.plugin.structure.ActionDeclaration" flags="ng" index="sE7Ow">
+        <property id="1205250923097" name="caption" index="2uzpH1" />
+        <property id="7458746815261976739" name="requiredAccess" index="2YLI8m" />
+        <child id="1203083196627" name="updateBlock" index="tmbBb" />
+        <child id="1203083461638" name="executeFunction" index="tncku" />
+      </concept>
+      <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
+      <concept id="1205681243813" name="jetbrains.mps.lang.plugin.structure.IsApplicableBlock" flags="in" index="2ScWuX" />
+      <concept id="1204478074808" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_MPSProject" flags="nn" index="1KvdUw" />
+    </language>
+    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
+      <concept id="481983775135178834" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDeclaration" flags="ng" index="2uRRBy">
+        <child id="481983775135178836" name="initBlock" index="2uRRB$" />
+        <child id="481983775135178837" name="disposeBlock" index="2uRRB_" />
+        <child id="481983775135178838" name="fieldDeclaration" index="2uRRBA" />
+      </concept>
+      <concept id="481983775135178819" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDisposeBlock" flags="in" index="2uRRBN" />
+      <concept id="481983775135178825" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginInitBlock" flags="in" index="2uRRBT" />
+      <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <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="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <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>
+      <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="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <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">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
+    </language>
+    <language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
+      <concept id="3729007189729192406" name="jetbrains.mps.lang.extension.structure.ExtensionPointDeclaration" flags="ng" index="vrV6u">
+        <child id="8029776554053057803" name="objectType" index="luc8K" />
+      </concept>
+      <concept id="6626851894249711936" name="jetbrains.mps.lang.extension.structure.ExtensionPointExpression" flags="nn" index="2O5UvJ">
+        <reference id="6626851894249712469" name="extensionPoint" index="2O5UnU" />
+      </concept>
+      <concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
+      <concept id="3175313036448544056" name="jetbrains.mps.lang.extension.structure.ExtensionPointType" flags="in" index="Sf$Xq">
+        <reference id="3175313036448544057" name="extensionPoint" index="Sf$Xr" />
+      </concept>
+      <concept id="126958800891274162" name="jetbrains.mps.lang.extension.structure.Extension" flags="ig" index="1lYeZD">
+        <reference id="126958800891274597" name="extensionPoint" index="1lYe$Y" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
+      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
+        <reference id="3751132065236767084" name="decl" index="q3mfh" />
+        <reference id="9097849371505568270" name="point" index="1QQUv3" />
+      </concept>
+      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
+        <reference id="19209059688387895" name="decl" index="2VtyIY" />
+      </concept>
+      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
+        <property id="6478870542308703667" name="caption" index="3tTeZt" />
+        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
+      </concept>
+    </language>
+    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
+      <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <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" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
+      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
+      <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="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
+        <child id="1205679832066" name="ascending" index="2S7zOq" />
+      </concept>
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
+        <child id="4611582986551314344" name="requestedType" index="UnYnz" />
+      </concept>
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
+      <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
+      <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
+    </language>
+  </registry>
+  <node concept="2DaZZR" id="7uM3WAaqs4K" />
+  <node concept="2uRRBy" id="3GWIMuJ8yeS">
+    <property role="TrG5h" value="ProjectPlugin" />
+    <node concept="2BZ0e9" id="3GWIMuJ8yfN" role="2uRRBA">
+      <property role="TrG5h" value="checker" />
+      <node concept="3Tm6S6" id="3GWIMuJ8yfO" role="1B3o_S" />
+      <node concept="3uibUv" id="3GWIMuJ8Eba" role="1tU5fm">
+        <ref role="3uigEE" node="3GWIMuIxxsa" resolve="QueryListChecker" />
+      </node>
+    </node>
+    <node concept="2uRRBT" id="3GWIMuJ8Ebh" role="2uRRB$">
+      <node concept="3clFbS" id="3GWIMuJ8Ebi" role="2VODD2">
+        <node concept="3clFbF" id="3GWIMuJ8EnQ" role="3cqZAp">
+          <node concept="37vLTI" id="3GWIMuJ8ET0" role="3clFbG">
+            <node concept="2ShNRf" id="3GWIMuJ8ETv" role="37vLTx">
+              <node concept="1pGfFk" id="T_6DrlXia$" role="2ShVmc">
+                <ref role="37wK5l" node="T_6DrlX9G9" resolve="QueryListChecker" />
+                <node concept="2OqwBi" id="T_6DrlXiyY" role="37wK5m">
+                  <node concept="1KvdUw" id="T_6DrlXiaz" role="2Oq$k0" />
+                  <node concept="liA8E" id="T_6DrlXjcI" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3GWIMuJ8EtK" role="37vLTJ">
+              <node concept="2WthIp" id="3GWIMuJ8EnP" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="3GWIMuJ8E_v" role="2OqNvi">
+                <ref role="2WH_rO" node="3GWIMuJ8yfN" resolve="checker" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="T_6DrkBVq_" role="3cqZAp" />
+        <node concept="3cpWs8" id="7uM3WAark3_" role="3cqZAp">
+          <node concept="3cpWsn" id="7uM3WAark3A" role="3cpWs9">
+            <property role="TrG5h" value="highlighter" />
+            <node concept="3uibUv" id="7uM3WAark3u" role="1tU5fm">
+              <ref role="3uigEE" to="exr9:~Highlighter" resolve="Highlighter" />
+            </node>
+            <node concept="2OqwBi" id="7uM3WAark3B" role="33vP2m">
+              <node concept="1KvdUw" id="7uM3WAark3C" role="2Oq$k0" />
+              <node concept="liA8E" id="7uM3WAark3D" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
+                <node concept="3VsKOn" id="7uM3WAark3E" role="37wK5m">
+                  <ref role="3VsUkX" to="exr9:~Highlighter" resolve="Highlighter" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7uM3WAari7Z" role="3cqZAp">
+          <node concept="2OqwBi" id="7uM3WAarkBE" role="3clFbG">
+            <node concept="37vLTw" id="7uM3WAark3F" role="2Oq$k0">
+              <ref role="3cqZAo" node="7uM3WAark3A" resolve="highlighter" />
+            </node>
+            <node concept="liA8E" id="7uM3WAarneu" role="2OqNvi">
+              <ref role="37wK5l" to="exr9:~Highlighter.addChecker(jetbrains.mps.nodeEditor.checking.EditorChecker)" resolve="addChecker" />
+              <node concept="2OqwBi" id="7uM3WAaroo8" role="37wK5m">
+                <node concept="2WthIp" id="7uM3WAaroob" role="2Oq$k0" />
+                <node concept="2BZ7hE" id="7uM3WAarood" role="2OqNvi">
+                  <ref role="2WH_rO" node="3GWIMuJ8yfN" resolve="checker" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2uRRBN" id="3GWIMuJb9Up" role="2uRRB_">
+      <node concept="3clFbS" id="3GWIMuJb9Uq" role="2VODD2">
+        <node concept="3cpWs8" id="7uM3WAaroxH" role="3cqZAp">
+          <node concept="3cpWsn" id="7uM3WAaroxI" role="3cpWs9">
+            <property role="TrG5h" value="highlighter" />
+            <node concept="3uibUv" id="7uM3WAaroxJ" role="1tU5fm">
+              <ref role="3uigEE" to="exr9:~Highlighter" resolve="Highlighter" />
+            </node>
+            <node concept="2OqwBi" id="7uM3WAaroxK" role="33vP2m">
+              <node concept="1KvdUw" id="7uM3WAaroxL" role="2Oq$k0" />
+              <node concept="liA8E" id="7uM3WAaroxM" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
+                <node concept="3VsKOn" id="7uM3WAaroxN" role="37wK5m">
+                  <ref role="3VsUkX" to="exr9:~Highlighter" resolve="Highlighter" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7uM3WAaroxO" role="3cqZAp">
+          <node concept="2OqwBi" id="7uM3WAaroxP" role="3clFbG">
+            <node concept="37vLTw" id="7uM3WAaroxQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="7uM3WAaroxI" resolve="highlighter" />
+            </node>
+            <node concept="liA8E" id="7uM3WAaroxR" role="2OqNvi">
+              <ref role="37wK5l" to="exr9:~Highlighter.removeChecker(jetbrains.mps.nodeEditor.checking.EditorChecker)" resolve="removeChecker" />
+              <node concept="2OqwBi" id="7uM3WAaroxS" role="37wK5m">
+                <node concept="2WthIp" id="7uM3WAaroxT" role="2Oq$k0" />
+                <node concept="2BZ7hE" id="7uM3WAaroxU" role="2OqNvi">
+                  <ref role="2WH_rO" node="3GWIMuJ8yfN" resolve="checker" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="3GWIMuIxxsa">
+    <property role="TrG5h" value="QueryListChecker" />
+    <node concept="Wx3nA" id="ercpuLg7f0" role="jymVt">
+      <property role="TrG5h" value="MODELCHECK_ENABLED_KEY" />
+      <property role="3TUv4t" value="true" />
+      <node concept="17QB3L" id="ercpuLg1Nr" role="1tU5fm" />
+      <node concept="3Tm1VV" id="ercpuLg6A5" role="1B3o_S" />
+      <node concept="Xl_RD" id="ercpuLg6kQ" role="33vP2m">
+        <property role="Xl_RC" value="querylist.modelcheck.enabled" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3GWIMuJ1aMv" role="jymVt" />
+    <node concept="312cEg" id="T_6DrlXdtT" role="jymVt">
+      <property role="TrG5h" value="myRepository" />
+      <node concept="3uibUv" id="T_6DrlXcoT" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+      <node concept="3Tm6S6" id="T_6DrlXeS4" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="GVgWr3MD2X" role="jymVt">
+      <property role="TrG5h" value="myHasEvents" />
+      <node concept="10P_77" id="GVgWr3MD2Z" role="1tU5fm" />
+      <node concept="3clFbT" id="GVgWr3MD30" role="33vP2m" />
+      <node concept="3Tm6S6" id="GVgWr3MD31" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="GVgWr3MBfj" role="jymVt" />
+    <node concept="3clFbW" id="T_6DrlX9G9" role="jymVt">
+      <node concept="3cqZAl" id="T_6DrlX9Ga" role="3clF45" />
+      <node concept="3clFbS" id="T_6DrlX9Gc" role="3clF47">
+        <node concept="3clFbF" id="T_6DrlXhIZ" role="3cqZAp">
+          <node concept="37vLTI" id="T_6DrlXhSa" role="3clFbG">
+            <node concept="37vLTw" id="T_6DrlXhXc" role="37vLTx">
+              <ref role="3cqZAo" node="T_6DrlXb5v" resolve="repository" />
+            </node>
+            <node concept="37vLTw" id="T_6DrlXhIY" role="37vLTJ">
+              <ref role="3cqZAo" node="T_6DrlXdtT" resolve="myRepository" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="T_6DrlX9Gd" role="1B3o_S" />
+      <node concept="37vLTG" id="T_6DrlXb5v" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="T_6DrlXb5u" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="T_6DrlX8$B" role="jymVt" />
+    <node concept="3Tm1VV" id="3GWIMuIxxsb" role="1B3o_S" />
+    <node concept="3uibUv" id="3GWIMuIxyLE" role="1zkMxy">
+      <ref role="3uigEE" to="n70j:~BaseEditorChecker" resolve="BaseEditorChecker" />
+    </node>
+    <node concept="3clFb_" id="3GWIMuIxySD" role="jymVt">
+      <property role="TrG5h" value="update" />
+      <node concept="3Tm1VV" id="3GWIMuIxySE" role="1B3o_S" />
+      <node concept="2AHcQZ" id="3GWIMuIxySG" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="3GWIMuIxySH" role="3clF45">
+        <ref role="3uigEE" to="n70j:~UpdateResult" resolve="UpdateResult" />
+      </node>
+      <node concept="37vLTG" id="3GWIMuIxySI" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="3GWIMuIxySJ" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3GWIMuIxySK" role="3clF46">
+        <property role="TrG5h" value="incremental" />
+        <property role="3TUv4t" value="true" />
+        <node concept="10P_77" id="3GWIMuIxySL" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3GWIMuIxySM" role="3clF46">
+        <property role="TrG5h" value="applyQuickFixes" />
+        <property role="3TUv4t" value="true" />
+        <node concept="10P_77" id="3GWIMuIxySN" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3GWIMuIxySO" role="3clF46">
+        <property role="TrG5h" value="cancellable" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="3GWIMuIxySP" role="1tU5fm">
+          <ref role="3uigEE" to="18ew:~Cancellable" resolve="Cancellable" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3GWIMuIxyST" role="3clF47">
+        <node concept="3cpWs8" id="3GWIMuJ9fxD" role="3cqZAp">
+          <node concept="3cpWsn" id="3GWIMuJ9fxE" role="3cpWs9">
+            <property role="TrG5h" value="rootCell" />
+            <node concept="3uibUv" id="3GWIMuJ9f0m" role="1tU5fm">
+              <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+            </node>
+            <node concept="2OqwBi" id="3GWIMuJ9fxF" role="33vP2m">
+              <node concept="37vLTw" id="3GWIMuJ9fxG" role="2Oq$k0">
+                <ref role="3cqZAo" node="3GWIMuIxySI" resolve="editorComponent" />
+              </node>
+              <node concept="liA8E" id="3GWIMuJ9fxH" role="2OqNvi">
+                <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3GWIMuJa3ER" role="3cqZAp">
+          <node concept="3cpWsn" id="3GWIMuJa3EU" role="3cpWs9">
+            <property role="TrG5h" value="messages" />
+            <node concept="2hMVRd" id="3GWIMuJa3EN" role="1tU5fm">
+              <node concept="3uibUv" id="3GWIMuJa512" role="2hN53Y">
+                <ref role="3uigEE" to="exr9:~EditorMessage" resolve="EditorMessage" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="3GWIMuJaezt" role="33vP2m">
+              <node concept="2i4dXS" id="3GWIMuJaeyY" role="2ShVmc">
+                <node concept="3uibUv" id="3GWIMuJaeyZ" role="HW$YZ">
+                  <ref role="3uigEE" to="exr9:~EditorMessage" resolve="EditorMessage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3GWIMuJa9wO" role="3cqZAp" />
+        <node concept="3cpWs8" id="WieAE6GpU2" role="3cqZAp">
+          <node concept="3cpWsn" id="WieAE6GpU3" role="3cpWs9">
+            <property role="TrG5h" value="ep" />
+            <node concept="Sf$Xq" id="WieAE6GpU1" role="1tU5fm">
+              <ref role="Sf$Xr" node="13pedfat8oK" resolve="queryListExtPoint" />
+            </node>
+            <node concept="2O5UvJ" id="WieAE6GpU4" role="33vP2m">
+              <ref role="2O5UnU" node="13pedfat8oK" resolve="queryListExtPoint" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2Qbt$1tTUbR" role="3cqZAp">
+          <node concept="3cpWsn" id="2Qbt$1tTUbS" role="3cpWs9">
+            <property role="TrG5h" value="sortedConfigs" />
+            <node concept="A3Dl8" id="2Qbt$1tTUbq" role="1tU5fm">
+              <node concept="3uibUv" id="2Qbt$1tTUbt" role="A3Ik2">
+                <ref role="3uigEE" node="13pedfat8oO" resolve="QueryListConfig" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2Qbt$1tTUbT" role="33vP2m">
+              <node concept="2OqwBi" id="2Qbt$1tTUbU" role="2Oq$k0">
+                <node concept="37vLTw" id="2Qbt$1tTUbV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="WieAE6GpU3" resolve="ep" />
+                </node>
+                <node concept="SfwO_" id="2Qbt$1tTUbW" role="2OqNvi" />
+              </node>
+              <node concept="2S7cBI" id="2Qbt$1tTUbX" role="2OqNvi">
+                <node concept="1bVj0M" id="2Qbt$1tTUbY" role="23t8la">
+                  <node concept="3clFbS" id="2Qbt$1tTUbZ" role="1bW5cS">
+                    <node concept="3clFbF" id="2Qbt$1tTUc0" role="3cqZAp">
+                      <node concept="2OqwBi" id="2Qbt$1tTUc1" role="3clFbG">
+                        <node concept="37vLTw" id="2Qbt$1tTUc2" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2Qbt$1tTUc4" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="2Qbt$1tTUc3" role="2OqNvi">
+                          <ref role="37wK5l" node="13pedfataCz" resolve="getPriorityLevel" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="2Qbt$1tTUc4" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="2Qbt$1tTUc5" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="1nlBCl" id="3p6$WoEzrLB" role="2S7zOq">
+                  <property role="3clFbU" value="false" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="13pedfatXbp" role="3cqZAp">
+          <node concept="3cpWsn" id="13pedfatXbq" role="3cpWs9">
+            <property role="TrG5h" value="config" />
+            <node concept="3uibUv" id="13pedfatWE5" role="1tU5fm">
+              <ref role="3uigEE" node="13pedfat8oO" resolve="QueryListConfig" />
+            </node>
+            <node concept="2OqwBi" id="13pedfatXbr" role="33vP2m">
+              <node concept="37vLTw" id="13pedfatXbs" role="2Oq$k0">
+                <ref role="3cqZAo" node="2Qbt$1tTUbS" resolve="sortedConfigs" />
+              </node>
+              <node concept="1uHKPH" id="13pedfatXbt" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="ercpuKTou1" role="3cqZAp" />
+        <node concept="3clFbJ" id="ercpuKPoIL" role="3cqZAp">
+          <node concept="3clFbS" id="ercpuKPoIN" role="3clFbx">
+            <node concept="3cpWs8" id="ercpuKP8hp" role="3cqZAp">
+              <node concept="3cpWsn" id="ercpuKP8hq" role="3cpWs9">
+                <property role="TrG5h" value="allCells" />
+                <node concept="A3Dl8" id="ercpuKPduA" role="1tU5fm">
+                  <node concept="3uibUv" id="ercpuKPduB" role="A3Ik2">
+                    <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="ercpuKP8hr" role="33vP2m">
+                  <ref role="1Pybhc" to="f4zo:~CellTraversalUtil" resolve="CellTraversalUtil" />
+                  <ref role="37wK5l" to="f4zo:~CellTraversalUtil.iterateTree(jetbrains.mps.openapi.editor.cells.EditorCell,jetbrains.mps.openapi.editor.cells.EditorCell,boolean)" resolve="iterateTree" />
+                  <node concept="37vLTw" id="ercpuKP8hs" role="37wK5m">
+                    <ref role="3cqZAo" node="3GWIMuJ9fxE" resolve="rootCell" />
+                  </node>
+                  <node concept="37vLTw" id="ercpuKP8ht" role="37wK5m">
+                    <ref role="3cqZAo" node="3GWIMuJ9fxE" resolve="rootCell" />
+                  </node>
+                  <node concept="3clFbT" id="ercpuKP8hu" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="ercpuKPEqN" role="3cqZAp">
+              <node concept="3cpWsn" id="ercpuKPEqO" role="3cpWs9">
+                <property role="TrG5h" value="queryListCells" />
+                <node concept="A3Dl8" id="ercpuKPDSH" role="1tU5fm">
+                  <node concept="3uibUv" id="ercpuKPDSK" role="A3Ik2">
+                    <ref role="3uigEE" to="d2zl:5oklODahdyQ" resolve="EditorCell_QueryList" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="ercpuKPI5K" role="33vP2m">
+                  <node concept="2OqwBi" id="ercpuKPEqP" role="2Oq$k0">
+                    <node concept="37vLTw" id="ercpuKPEqQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="ercpuKP8hq" resolve="allCells" />
+                    </node>
+                    <node concept="UnYns" id="ercpuKPEqR" role="2OqNvi">
+                      <node concept="3uibUv" id="ercpuKPEqS" role="UnYnz">
+                        <ref role="3uigEE" to="d2zl:5oklODahdyQ" resolve="EditorCell_QueryList" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="ercpuKPKiS" role="2OqNvi">
+                    <node concept="1bVj0M" id="ercpuKPKiU" role="23t8la">
+                      <node concept="3clFbS" id="ercpuKPKiV" role="1bW5cS">
+                        <node concept="3clFbF" id="ercpuKPLrk" role="3cqZAp">
+                          <node concept="3fqX7Q" id="ercpuKPRFe" role="3clFbG">
+                            <node concept="2OqwBi" id="ercpuKPRFg" role="3fr31v">
+                              <node concept="37vLTw" id="ercpuKPRFh" role="2Oq$k0">
+                                <ref role="3cqZAo" node="ercpuKPKiW" resolve="it" />
+                              </node>
+                              <node concept="liA8E" id="ercpuKPRFi" role="2OqNvi">
+                                <ref role="37wK5l" to="d2zl:T_6DrmDh7T" resolve="disableModelChecking" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="ercpuKPKiW" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="ercpuKPKiX" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="ercpuKQ5gH" role="3cqZAp">
+              <node concept="3cpWsn" id="ercpuKQ5gI" role="3cpWs9">
+                <property role="TrG5h" value="nodesToCheck" />
+                <node concept="2hMVRd" id="ercpuKSjXj" role="1tU5fm">
+                  <node concept="3Tqbb2" id="ercpuKSjXl" role="2hN53Y" />
+                </node>
+                <node concept="2ShNRf" id="ercpuKSpyL" role="33vP2m">
+                  <node concept="2i4dXS" id="ercpuKSnNp" role="2ShVmc">
+                    <node concept="3Tqbb2" id="ercpuKSnNq" role="HW$YZ" />
+                    <node concept="2OqwBi" id="ercpuKQ5gJ" role="I$8f6">
+                      <node concept="37vLTw" id="ercpuKQ5gK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="ercpuKPEqO" resolve="queryListCells" />
+                      </node>
+                      <node concept="3goQfb" id="ercpuKQ5gL" role="2OqNvi">
+                        <node concept="1bVj0M" id="ercpuKQ5gM" role="23t8la">
+                          <node concept="3clFbS" id="ercpuKQ5gN" role="1bW5cS">
+                            <node concept="3cpWs8" id="ercpuKQ5gO" role="3cqZAp">
+                              <node concept="3cpWsn" id="ercpuKQ5gP" role="3cpWs9">
+                                <property role="TrG5h" value="handler" />
+                                <node concept="3uibUv" id="ercpuKQ5gQ" role="1tU5fm">
+                                  <ref role="3uigEE" to="d2zl:1BXECvJT402" resolve="QueryListHandler" />
+                                </node>
+                                <node concept="1eOMI4" id="ercpuKQ5gR" role="33vP2m">
+                                  <node concept="10QFUN" id="ercpuKQ5gS" role="1eOMHV">
+                                    <node concept="3uibUv" id="ercpuKQ5gT" role="10QFUM">
+                                      <ref role="3uigEE" to="d2zl:1BXECvJT402" resolve="QueryListHandler" />
+                                    </node>
+                                    <node concept="2OqwBi" id="ercpuKQ5gU" role="10QFUP">
+                                      <node concept="37vLTw" id="ercpuKQ5gV" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="ercpuKQ5h4" resolve="it" />
+                                      </node>
+                                      <node concept="liA8E" id="ercpuKQ5gW" role="2OqNvi">
+                                        <ref role="37wK5l" to="g51k:~EditorCell_Collection.getCellListHandler()" resolve="getCellListHandler" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="ercpuKQ5gX" role="3cqZAp">
+                              <node concept="2OqwBi" id="ercpuKQ5gY" role="3clFbG">
+                                <node concept="37vLTw" id="ercpuKQ5gZ" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="ercpuKQ5gP" resolve="handler" />
+                                </node>
+                                <node concept="liA8E" id="ercpuKQ5h0" role="2OqNvi">
+                                  <ref role="37wK5l" to="d2zl:1BXECvJT4dg" resolve="getNodesForList" />
+                                  <node concept="2OqwBi" id="ercpuKQ5h1" role="37wK5m">
+                                    <node concept="37vLTw" id="ercpuKQ5h2" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="ercpuKQ5gP" resolve="handler" />
+                                    </node>
+                                    <node concept="liA8E" id="ercpuKQ5h3" role="2OqNvi">
+                                      <ref role="37wK5l" to="d2zl:1SwultAjEmE" resolve="getNode" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="ercpuKQ5h4" role="1bW2Oz">
+                            <property role="TrG5h" value="it" />
+                            <node concept="2jxLKc" id="ercpuKQ5h5" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="ercpuKQ8u1" role="3cqZAp">
+              <node concept="3cpWsn" id="ercpuKQ8u2" role="3cpWs9">
+                <property role="TrG5h" value="modelsToCheck" />
+                <node concept="_YKpA" id="ercpuKQwrG" role="1tU5fm">
+                  <node concept="H_c77" id="ercpuKQwrI" role="_ZDj9" />
+                </node>
+                <node concept="2OqwBi" id="ercpuKQygz" role="33vP2m">
+                  <node concept="2OqwBi" id="ercpuKQ8u5" role="2Oq$k0">
+                    <node concept="2OqwBi" id="ercpuKQ8u6" role="2Oq$k0">
+                      <node concept="2OqwBi" id="ercpuKQ8u7" role="2Oq$k0">
+                        <node concept="37vLTw" id="ercpuKQ8u8" role="2Oq$k0">
+                          <ref role="3cqZAo" node="ercpuKQ5gI" resolve="nodesToCheck" />
+                        </node>
+                        <node concept="3$u5V9" id="ercpuKQ8u9" role="2OqNvi">
+                          <node concept="1bVj0M" id="ercpuKQ8ua" role="23t8la">
+                            <node concept="3clFbS" id="ercpuKQ8ub" role="1bW5cS">
+                              <node concept="3clFbF" id="ercpuKQ8uc" role="3cqZAp">
+                                <node concept="2OqwBi" id="ercpuKQ8ud" role="3clFbG">
+                                  <node concept="37vLTw" id="ercpuKQ8ue" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="ercpuKQ8ug" resolve="it" />
+                                  </node>
+                                  <node concept="I4A8Y" id="ercpuKQ8uf" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="ercpuKQ8ug" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="ercpuKQ8uh" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1VAtEI" id="ercpuKQ8ui" role="2OqNvi" />
+                    </node>
+                    <node concept="1KnU$U" id="ercpuKQ8uj" role="2OqNvi" />
+                  </node>
+                  <node concept="ANE8D" id="ercpuKQ_th" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="2Gpval" id="4iy$lDS$q0B" role="3cqZAp">
+              <node concept="2GrKxI" id="4iy$lDS$q0D" role="2Gsz3X">
+                <property role="TrG5h" value="modelToCheck" />
+              </node>
+              <node concept="3clFbS" id="4iy$lDS$q0H" role="2LFqv$">
+                <node concept="3cpWs8" id="T_6DrkCItC" role="3cqZAp">
+                  <node concept="3cpWsn" id="T_6DrkCItD" role="3cpWs9">
+                    <property role="TrG5h" value="errors" />
+                    <node concept="3vKaQO" id="T_6DrkCHU0" role="1tU5fm">
+                      <node concept="3uibUv" id="T_6DrkCHU3" role="3O5elw">
+                        <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                      </node>
+                    </node>
+                    <node concept="1rXfSq" id="T_6Drmotwk" role="33vP2m">
+                      <ref role="37wK5l" node="T_6DrlXBQI" resolve="checkForNodeMessages" />
+                      <node concept="37vLTw" id="T_6DrmoAev" role="37wK5m">
+                        <ref role="3cqZAo" node="3GWIMuIxySI" resolve="editorComponent" />
+                      </node>
+                      <node concept="2GrUjf" id="T_6DrmouFs" role="37wK5m">
+                        <ref role="2Gs0qQ" node="4iy$lDS$q0D" resolve="modelToCheck" />
+                      </node>
+                      <node concept="37vLTw" id="GVgWr3PXus" role="37wK5m">
+                        <ref role="3cqZAo" node="ercpuKQ5gI" resolve="nodesToCheck" />
+                      </node>
+                      <node concept="2OqwBi" id="T_6DrmowUp" role="37wK5m">
+                        <node concept="2YIFZM" id="T_6DrmowUq" role="2Oq$k0">
+                          <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                        </node>
+                        <node concept="liA8E" id="T_6DrmowUr" role="2OqNvi">
+                          <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2Gpval" id="T_6DrkCY8A" role="3cqZAp">
+                  <node concept="2GrKxI" id="T_6DrkCY8C" role="2Gsz3X">
+                    <property role="TrG5h" value="errorReporter" />
+                  </node>
+                  <node concept="37vLTw" id="T_6DrkDjhU" role="2GsD0m">
+                    <ref role="3cqZAo" node="T_6DrkCItD" resolve="errors" />
+                  </node>
+                  <node concept="3clFbS" id="T_6DrkCY8G" role="2LFqv$">
+                    <node concept="3cpWs8" id="T_6DrkDnJy" role="3cqZAp">
+                      <node concept="3cpWsn" id="2v0ve8x$pi8" role="3cpWs9">
+                        <property role="TrG5h" value="message" />
+                        <node concept="3uibUv" id="2v0ve8x$pi9" role="1tU5fm">
+                          <ref role="3uigEE" to="exr9:~HighlighterMessage" resolve="HighlighterMessage" />
+                        </node>
+                        <node concept="2ShNRf" id="5NI6bHmjj17" role="33vP2m">
+                          <node concept="1pGfFk" id="5NI6bHmjk_4" role="2ShVmc">
+                            <ref role="37wK5l" to="exr9:~HighlighterMessage.&lt;init&gt;(jetbrains.mps.openapi.editor.message.EditorMessageOwner,jetbrains.mps.errors.item.NodeReportItem,org.jetbrains.mps.openapi.model.SNode)" resolve="HighlighterMessage" />
+                            <node concept="Xjq3P" id="5NI6bHmjlU3" role="37wK5m" />
+                            <node concept="2GrUjf" id="T_6DrkDzDi" role="37wK5m">
+                              <ref role="2Gs0qQ" node="T_6DrkCY8C" resolve="errorReporter" />
+                            </node>
+                            <node concept="2OqwBi" id="5NI6bHmjqEd" role="37wK5m">
+                              <node concept="2OqwBi" id="5NI6bHmjpCd" role="2Oq$k0">
+                                <node concept="2GrUjf" id="T_6DrkD__K" role="2Oq$k0">
+                                  <ref role="2Gs0qQ" node="T_6DrkCY8C" resolve="errorReporter" />
+                                </node>
+                                <node concept="liA8E" id="5NI6bHmjq7C" role="2OqNvi">
+                                  <ref role="37wK5l" to="d6hs:~NodeFlavouredItem.getNode()" resolve="getNode" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="5NI6bHmjrfD" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                                <node concept="2OqwBi" id="T_6DrkEsaN" role="37wK5m">
+                                  <node concept="2OqwBi" id="T_6DrkEnWf" role="2Oq$k0">
+                                    <node concept="37vLTw" id="T_6DrkEls1" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3GWIMuIxySI" resolve="editorComponent" />
+                                    </node>
+                                    <node concept="liA8E" id="T_6DrkEqFi" role="2OqNvi">
+                                      <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="T_6DrkEu0x" role="2OqNvi">
+                                    <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="T_6DrkE8m9" role="3cqZAp">
+                      <node concept="2OqwBi" id="T_6DrkEfdc" role="3clFbG">
+                        <node concept="37vLTw" id="T_6DrkEdui" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3GWIMuJa3EU" resolve="messages" />
+                        </node>
+                        <node concept="TSZUe" id="T_6DrkEh05" role="2OqNvi">
+                          <node concept="37vLTw" id="T_6DrkEiwx" role="25WWJ7">
+                            <ref role="3cqZAo" node="2v0ve8x$pi8" resolve="message" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="GVgWr3P3$G" role="2GsD0m">
+                <ref role="3cqZAo" node="ercpuKQ8u2" resolve="modelsToCheck" />
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="ercpuKTKp4" role="3clFbw">
+            <node concept="3fqX7Q" id="ercpuKPs4j" role="3uHU7B">
+              <node concept="2OqwBi" id="ercpuKPs4l" role="3fr31v">
+                <node concept="37vLTw" id="ercpuKPs4m" role="2Oq$k0">
+                  <ref role="3cqZAo" node="13pedfatXbq" resolve="config" />
+                </node>
+                <node concept="liA8E" id="ercpuKPs4n" role="2OqNvi">
+                  <ref role="37wK5l" node="13pedfataql" resolve="disableModelChecking" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="ercpuLfUYi" role="3uHU7w">
+              <node concept="2YIFZM" id="ercpuLfUYj" role="2Oq$k0">
+                <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="ercpuLfUYk" role="2OqNvi">
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getBoolean(java.lang.String,boolean)" resolve="getBoolean" />
+                <node concept="37vLTw" id="ercpuLgc4E" role="37wK5m">
+                  <ref role="3cqZAo" node="ercpuLg7f0" resolve="MODELCHECK_ENABLED_KEY" />
+                </node>
+                <node concept="3clFbT" id="ercpuLfUYm" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="13pedfatGU$" role="3cqZAp" />
+        <node concept="3cpWs6" id="2v0ve8x$poW" role="3cqZAp">
+          <node concept="2ShNRf" id="2v0ve8x$poX" role="3cqZAk">
+            <node concept="1pGfFk" id="2v0ve8x$poY" role="2ShVmc">
+              <ref role="37wK5l" to="n70j:~UpdateResult$Completed.&lt;init&gt;(boolean,java.util.Collection)" resolve="UpdateResult.Completed" />
+              <node concept="3clFbT" id="4iy$lDSrtFT" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="37vLTw" id="3GWIMuJax2P" role="37wK5m">
+                <ref role="3cqZAo" node="3GWIMuJa3EU" resolve="messages" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3GWIMuIxySU" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="T_6DrlX2TS" role="jymVt" />
+    <node concept="3clFb_" id="T_6DrlXBQI" role="jymVt">
+      <property role="TrG5h" value="checkForNodeMessages" />
+      <node concept="3clFbS" id="T_6DrlXBQK" role="3clF47">
+        <node concept="3cpWs8" id="T_6DrlXBQR" role="3cqZAp">
+          <node concept="3cpWsn" id="T_6DrlXBQS" role="3cpWs9">
+            <property role="TrG5h" value="resultConsumer" />
+            <node concept="3uibUv" id="T_6DrlXBQT" role="1tU5fm">
+              <ref role="3uigEE" to="18ew:~CollectConsumer" resolve="CollectConsumer" />
+              <node concept="3uibUv" id="T_6DrlXBQU" role="11_B2D">
+                <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="T_6DrlXBQV" role="33vP2m">
+              <node concept="1pGfFk" id="T_6DrlXBQW" role="2ShVmc">
+                <ref role="37wK5l" to="18ew:~CollectConsumer.&lt;init&gt;()" resolve="CollectConsumer" />
+                <node concept="3uibUv" id="T_6DrlXBQX" role="1pMfVU">
+                  <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="T_6DrlXBQY" role="3cqZAp">
+          <node concept="2OqwBi" id="T_6DrlXBQZ" role="3clFbG">
+            <node concept="2OqwBi" id="T_6DrlXBR0" role="2Oq$k0">
+              <node concept="2ShNRf" id="T_6DrlXBR1" role="2Oq$k0">
+                <node concept="1pGfFk" id="T_6DrlXBR2" role="2ShVmc">
+                  <ref role="37wK5l" to="wsw7:6bXa3O$ak8k" resolve="ModelCheckerBuilder" />
+                  <node concept="3clFbT" id="T_6DrlXBR3" role="37wK5m" />
+                </node>
+              </node>
+              <node concept="liA8E" id="T_6DrlXBR4" role="2OqNvi">
+                <ref role="37wK5l" to="wsw7:6bXa3O$aFCh" resolve="createChecker" />
+                <node concept="2YIFZM" id="T_6DrlXBR5" role="37wK5m">
+                  <ref role="1Pybhc" to="tp6m:18jf_F1WDsS" resolve="NodeCheckerUtil" />
+                  <ref role="37wK5l" to="tp6m:fM_JX6vi$E" resolve="getStandardCheckers" />
+                  <node concept="37vLTw" id="T_6DrlXBR6" role="37wK5m">
+                    <ref role="3cqZAo" node="T_6DrlXBRU" resolve="host" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="T_6DrlXBR7" role="2OqNvi">
+              <ref role="37wK5l" to="wsw7:4SGXHKgYYAZ" resolve="check" />
+              <node concept="2YIFZM" id="T_6DrlXBR8" role="37wK5m">
+                <ref role="37wK5l" to="wsw7:fM_JX6ud1s" resolve="forSingleModel" />
+                <ref role="1Pybhc" to="wsw7:4QJbmJH1Aa8" resolve="ModelCheckerBuilder.ItemsToCheck" />
+                <node concept="37vLTw" id="ercpuKQI_6" role="37wK5m">
+                  <ref role="3cqZAo" node="GVgWr3Pvck" resolve="model" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="T_6DrlXBRa" role="37wK5m">
+                <ref role="3cqZAo" node="T_6DrlXdtT" resolve="myRepository" />
+              </node>
+              <node concept="1bVj0M" id="T_6DrlXBRb" role="37wK5m">
+                <node concept="3clFbS" id="T_6DrlXBRc" role="1bW5cS">
+                  <node concept="3cpWs8" id="T_6DrlXBRd" role="3cqZAp">
+                    <node concept="3cpWsn" id="T_6DrlXBRe" role="3cpWs9">
+                      <property role="TrG5h" value="reportedNode" />
+                      <node concept="3uibUv" id="T_6DrlXBRf" role="1tU5fm">
+                        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                      </node>
+                      <node concept="2OqwBi" id="T_6DrlXBRg" role="33vP2m">
+                        <node concept="10M0yZ" id="T_6DrlXBRh" role="2Oq$k0">
+                          <ref role="1PxDUh" to="d6hs:~NodeFlavouredItem" resolve="NodeFlavouredItem" />
+                          <ref role="3cqZAo" to="d6hs:~NodeFlavouredItem.FLAVOUR_NODE" resolve="FLAVOUR_NODE" />
+                        </node>
+                        <node concept="liA8E" id="T_6DrlXBRi" role="2OqNvi">
+                          <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
+                          <node concept="37vLTw" id="T_6DrlXBRj" role="37wK5m">
+                            <ref role="3cqZAo" node="T_6DrlXBRI" resolve="reportItem" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="ercpuKRQQ2" role="3cqZAp">
+                    <node concept="3clFbS" id="ercpuKRQQ4" role="3clFbx">
+                      <node concept="3cpWs8" id="ercpuKQNxF" role="3cqZAp">
+                        <node concept="3cpWsn" id="ercpuKQNxG" role="3cpWs9">
+                          <property role="TrG5h" value="reportedNodeAndAncestors" />
+                          <node concept="A3Dl8" id="ercpuKSDex" role="1tU5fm">
+                            <node concept="3Tqbb2" id="ercpuKSDez" role="A3Ik2" />
+                          </node>
+                          <node concept="2OqwBi" id="ercpuKQNxH" role="33vP2m">
+                            <node concept="1eOMI4" id="ercpuKQNxI" role="2Oq$k0">
+                              <node concept="10QFUN" id="ercpuKQNxJ" role="1eOMHV">
+                                <node concept="2OqwBi" id="ercpuKQNxK" role="10QFUP">
+                                  <node concept="37vLTw" id="ercpuKQNxL" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="T_6DrlXBRe" resolve="reportedNode" />
+                                  </node>
+                                  <node concept="liA8E" id="ercpuKQNxM" role="2OqNvi">
+                                    <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                                    <node concept="37vLTw" id="ercpuKQNxN" role="37wK5m">
+                                      <ref role="3cqZAo" node="T_6DrlXdtT" resolve="myRepository" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3Tqbb2" id="ercpuKQNxO" role="10QFUM" />
+                              </node>
+                            </node>
+                            <node concept="z$bX8" id="ercpuKQNxP" role="2OqNvi">
+                              <node concept="1xIGOp" id="ercpuKQNxQ" role="1xVPHs" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="ercpuKS17N" role="3cqZAp">
+                        <node concept="3clFbS" id="ercpuKS17P" role="3clFbx">
+                          <node concept="3clFbF" id="T_6DrlXBRm" role="3cqZAp">
+                            <node concept="2OqwBi" id="T_6DrlXBRn" role="3clFbG">
+                              <node concept="37vLTw" id="T_6DrlXBRo" role="2Oq$k0">
+                                <ref role="3cqZAo" node="T_6DrlXBQS" resolve="resultConsumer" />
+                              </node>
+                              <node concept="liA8E" id="T_6DrlXBRp" role="2OqNvi">
+                                <ref role="37wK5l" to="18ew:~CollectConsumer.consume(java.lang.Object)" resolve="consume" />
+                                <node concept="10QFUN" id="T_6DrlXBRq" role="37wK5m">
+                                  <node concept="37vLTw" id="T_6DrlXBRr" role="10QFUP">
+                                    <ref role="3cqZAo" node="T_6DrlXBRI" resolve="reportItem" />
+                                  </node>
+                                  <node concept="3uibUv" id="T_6DrlXBRs" role="10QFUM">
+                                    <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="ercpuKSEGV" role="3clFbw">
+                          <node concept="37vLTw" id="ercpuKSyyZ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="ercpuKQNxG" resolve="reportedNodeAndAncestors" />
+                          </node>
+                          <node concept="2HwmR7" id="ercpuKSG_W" role="2OqNvi">
+                            <node concept="1bVj0M" id="ercpuKSG_Y" role="23t8la">
+                              <node concept="3clFbS" id="ercpuKSG_Z" role="1bW5cS">
+                                <node concept="3clFbF" id="ercpuKSIKI" role="3cqZAp">
+                                  <node concept="2OqwBi" id="ercpuKSKHa" role="3clFbG">
+                                    <node concept="37vLTw" id="ercpuKSIKH" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="GVgWr3PAEK" resolve="nodesToCheck" />
+                                    </node>
+                                    <node concept="3JPx81" id="ercpuKSNmL" role="2OqNvi">
+                                      <node concept="37vLTw" id="ercpuKSP16" role="25WWJ7">
+                                        <ref role="3cqZAo" node="ercpuKSGA0" resolve="it" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="ercpuKSGA0" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="ercpuKSGA1" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3y3z36" id="ercpuKRUOn" role="3clFbw">
+                      <node concept="10Nm6u" id="ercpuKRW3u" role="3uHU7w" />
+                      <node concept="37vLTw" id="ercpuKRSXn" role="3uHU7B">
+                        <ref role="3cqZAo" node="T_6DrlXBRe" resolve="reportedNode" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="T_6DrlXBRI" role="1bW2Oz">
+                  <property role="TrG5h" value="reportItem" />
+                  <node concept="3uibUv" id="T_6DrlXBRJ" role="1tU5fm">
+                    <ref role="3uigEE" to="d6hs:~IssueKindReportItem" resolve="IssueKindReportItem" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2ShNRf" id="T_6DrlXBRK" role="37wK5m">
+                <node concept="1pGfFk" id="T_6DrlXBRL" role="2ShVmc">
+                  <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="T_6DrlXBRM" role="3cqZAp">
+          <node concept="2OqwBi" id="T_6DrlXBRN" role="3cqZAk">
+            <node concept="37vLTw" id="T_6DrlXBRO" role="2Oq$k0">
+              <ref role="3cqZAo" node="T_6DrlXBQS" resolve="resultConsumer" />
+            </node>
+            <node concept="liA8E" id="T_6DrlXBRP" role="2OqNvi">
+              <ref role="37wK5l" to="18ew:~CollectConsumer.getResult()" resolve="getResult" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="T_6DrlXBRY" role="3clF45">
+        <node concept="3uibUv" id="T_6DrlXBRZ" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="T_6DrlXBRQ" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3uibUv" id="T_6DrlXBRR" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="GVgWr3Pvck" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="GVgWr3P$hv" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="GVgWr3PAEK" role="3clF46">
+        <property role="TrG5h" value="nodesToCheck" />
+        <node concept="2hMVRd" id="ercpuKSgr_" role="1tU5fm">
+          <node concept="3Tqbb2" id="ercpuKSgrB" role="2hN53Y" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="T_6DrlXBRU" role="3clF46">
+        <property role="TrG5h" value="host" />
+        <node concept="3uibUv" id="T_6DrlXBRV" role="1tU5fm">
+          <ref role="3uigEE" to="wyuk:~ComponentHost" resolve="ComponentHost" />
+        </node>
+        <node concept="2AHcQZ" id="T_6DrlXBRW" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="T_6DrlXBRX" role="1B3o_S" />
+      <node concept="P$JXv" id="T_6DrlXBS4" role="lGtFl">
+        <node concept="TZ5HA" id="T_6DrlXBS5" role="TZ5H$">
+          <node concept="1dT_AC" id="T_6DrlXBS6" role="1dT_Ay">
+            <property role="1dT_AB" value="based on NodeCheckerUtil#checkForNodeMessages" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="T_6DrlX2VO" role="jymVt" />
+    <node concept="3clFb_" id="GVgWr3MqPY" role="jymVt">
+      <property role="TrG5h" value="processEvents" />
+      <node concept="3Tm1VV" id="GVgWr3MqPZ" role="1B3o_S" />
+      <node concept="3cqZAl" id="GVgWr3MqQ1" role="3clF45" />
+      <node concept="37vLTG" id="GVgWr3MqQ2" role="3clF46">
+        <property role="TrG5h" value="events" />
+        <node concept="3uibUv" id="GVgWr3MqQ3" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="GVgWr3MqQ4" role="11_B2D">
+            <ref role="3uigEE" to="j9co:~SModelEvent" resolve="SModelEvent" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="GVgWr3MqQ5" role="3clF47">
+        <node concept="3clFbF" id="GVgWr3MI37" role="3cqZAp">
+          <node concept="3vZ8r8" id="GVgWr3MI38" role="3clFbG">
+            <node concept="37vLTw" id="GVgWr3MI39" role="37vLTJ">
+              <ref role="3cqZAo" node="GVgWr3MD2X" resolve="myHasEvents" />
+            </node>
+            <node concept="3fqX7Q" id="GVgWr3MI3a" role="37vLTx">
+              <node concept="2OqwBi" id="GVgWr3MK3v" role="3fr31v">
+                <node concept="37vLTw" id="GVgWr3MJeN" role="2Oq$k0">
+                  <ref role="3cqZAo" node="GVgWr3MqQ2" resolve="events" />
+                </node>
+                <node concept="liA8E" id="GVgWr3MK3w" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="GVgWr3MqQ6" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="GVgWr3MvAM" role="jymVt" />
+    <node concept="3clFb_" id="3GWIMuIxySs" role="jymVt">
+      <property role="TrG5h" value="needsUpdate" />
+      <node concept="3Tm1VV" id="3GWIMuIxySt" role="1B3o_S" />
+      <node concept="10P_77" id="3GWIMuIxySv" role="3clF45" />
+      <node concept="37vLTG" id="3GWIMuIxySw" role="3clF46">
+        <property role="TrG5h" value="component" />
+        <node concept="3uibUv" id="3GWIMuIxySx" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3GWIMuIxyS_" role="3clF47">
+        <node concept="3cpWs6" id="GVgWr3MNrn" role="3cqZAp">
+          <node concept="37vLTw" id="GVgWr3MNro" role="3cqZAk">
+            <ref role="3cqZAo" node="GVgWr3MD2X" resolve="myHasEvents" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3GWIMuIxySA" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="GVgWr3MRZ_" role="jymVt" />
+    <node concept="3clFb_" id="GVgWr3MOEJ" role="jymVt">
+      <property role="TrG5h" value="doneUpdating" />
+      <node concept="3Tm1VV" id="GVgWr3MOEK" role="1B3o_S" />
+      <node concept="3cqZAl" id="GVgWr3MOEM" role="3clF45" />
+      <node concept="3clFbS" id="GVgWr3MOEN" role="3clF47">
+        <node concept="3clFbF" id="GVgWr3MVs3" role="3cqZAp">
+          <node concept="37vLTI" id="GVgWr3MVs4" role="3clFbG">
+            <node concept="37vLTw" id="GVgWr3MVs5" role="37vLTJ">
+              <ref role="3cqZAo" node="GVgWr3MD2X" resolve="myHasEvents" />
+            </node>
+            <node concept="3clFbT" id="GVgWr3MVs6" role="37vLTx" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="GVgWr3MOEO" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+  </node>
+  <node concept="1lYeZD" id="13pedfat8au">
+    <property role="TrG5h" value="DefaultQueryListConfig" />
+    <ref role="1lYe$Y" node="13pedfat8oK" resolve="queryListExtPoint" />
+    <node concept="3Tm1VV" id="13pedfat8av" role="1B3o_S" />
+    <node concept="2tJIrI" id="13pedfat8aw" role="jymVt" />
+    <node concept="3tTeZs" id="13pedfat8ax" role="jymVt">
+      <property role="3tTeZt" value="activate" />
+      <ref role="3tTeZr" to="90d:3zLwYDe0CPy" resolve="activate" />
+    </node>
+    <node concept="3tTeZs" id="13pedfat8ay" role="jymVt">
+      <property role="3tTeZt" value="deactivate" />
+      <ref role="3tTeZr" to="90d:3zLwYDe0BDO" resolve="deactivate" />
+    </node>
+    <node concept="2tJIrI" id="13pedfat8az" role="jymVt" />
+    <node concept="q3mfD" id="13pedfat8a$" role="jymVt">
+      <property role="TrG5h" value="get" />
+      <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
+      <node concept="3Tm1VV" id="13pedfat8aA" role="1B3o_S" />
+      <node concept="3clFbS" id="13pedfat8aC" role="3clF47">
+        <node concept="3clFbF" id="13pedfataO6" role="3cqZAp">
+          <node concept="2ShNRf" id="13pedfataO4" role="3clFbG">
+            <node concept="YeOm9" id="13pedfatf3_" role="2ShVmc">
+              <node concept="1Y3b0j" id="13pedfatf3C" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <property role="373rjd" value="true" />
+                <ref role="1Y3XeK" node="13pedfat8oO" resolve="QueryListConfig" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                <node concept="3Tm1VV" id="13pedfatf3D" role="1B3o_S" />
+                <node concept="3clFb_" id="13pedfatf3R" role="jymVt">
+                  <property role="TrG5h" value="disableModelChecking" />
+                  <node concept="3Tm1VV" id="13pedfatf3T" role="1B3o_S" />
+                  <node concept="10P_77" id="13pedfatf3U" role="3clF45" />
+                  <node concept="3clFbS" id="13pedfatf3V" role="3clF47">
+                    <node concept="3clFbF" id="13pedfatfrM" role="3cqZAp">
+                      <node concept="3clFbT" id="13pedfatfrL" role="3clFbG" />
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="13pedfatf3X" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="2tJIrI" id="13pedfatf3Y" role="jymVt" />
+                <node concept="3clFb_" id="13pedfatf3Z" role="jymVt">
+                  <property role="TrG5h" value="getPriorityLevel" />
+                  <node concept="3Tm1VV" id="13pedfatf41" role="1B3o_S" />
+                  <node concept="10Oyi0" id="13pedfatf42" role="3clF45" />
+                  <node concept="3clFbS" id="13pedfatf43" role="3clF47">
+                    <node concept="3clFbF" id="13pedfatfC3" role="3cqZAp">
+                      <node concept="3cmrfG" id="13pedfatfC2" role="3clFbG">
+                        <property role="3cmrfH" value="0" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="13pedfatf45" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="q3mfm" id="13pedfat8aD" role="3clF45">
+        <ref role="q3mfh" to="90d:3zLwYDe0sv$" />
+        <ref role="1QQUv3" node="13pedfat8a$" resolve="get" />
+      </node>
+    </node>
+  </node>
+  <node concept="vrV6u" id="13pedfat8oK">
+    <property role="TrG5h" value="queryListExtPoint" />
+    <node concept="3uibUv" id="13pedfatQKl" role="luc8K">
+      <ref role="3uigEE" node="13pedfat8oO" resolve="QueryListConfig" />
+    </node>
+  </node>
+  <node concept="3HP615" id="13pedfat8oO">
+    <property role="TrG5h" value="QueryListConfig" />
+    <node concept="3clFb_" id="13pedfataql" role="jymVt">
+      <property role="TrG5h" value="disableModelChecking" />
+      <node concept="3clFbS" id="13pedfataqo" role="3clF47" />
+      <node concept="3Tm1VV" id="13pedfataqp" role="1B3o_S" />
+      <node concept="10P_77" id="13pedfataq8" role="3clF45" />
+    </node>
+    <node concept="3clFb_" id="13pedfataCz" role="jymVt">
+      <property role="TrG5h" value="getPriorityLevel" />
+      <node concept="3clFbS" id="13pedfataCA" role="3clF47" />
+      <node concept="3Tm1VV" id="13pedfataCB" role="1B3o_S" />
+      <node concept="10Oyi0" id="13pedfataBL" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="13pedfat8oP" role="1B3o_S" />
+  </node>
+  <node concept="sE7Ow" id="ercpuKTQR3">
+    <property role="TrG5h" value="DisableModelcheck" />
+    <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="2uzpH1" value="QueryList: Disable Model Check" />
+    <node concept="tnohg" id="ercpuKTQR4" role="tncku">
+      <node concept="3clFbS" id="ercpuKTQR5" role="2VODD2">
+        <node concept="3clFbF" id="ercpuLgdHP" role="3cqZAp">
+          <node concept="2OqwBi" id="ercpuLgdHR" role="3clFbG">
+            <node concept="2YIFZM" id="ercpuLgdHS" role="2Oq$k0">
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+            </node>
+            <node concept="liA8E" id="ercpuLgdHT" role="2OqNvi">
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,boolean,boolean)" resolve="setValue" />
+              <node concept="10M0yZ" id="ercpuLgdEt" role="37wK5m">
+                <ref role="3cqZAo" node="ercpuLg7f0" resolve="MODELCHECK_ENABLED_KEY" />
+                <ref role="1PxDUh" node="3GWIMuIxxsa" resolve="QueryListChecker" />
+              </node>
+              <node concept="3clFbT" id="ercpuLgfoh" role="37wK5m" />
+              <node concept="3clFbT" id="ercpuLgfBR" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2ScWuX" id="ercpuLgecp" role="tmbBb">
+      <node concept="3clFbS" id="ercpuLgecq" role="2VODD2">
+        <node concept="3clFbF" id="ercpuLgeqb" role="3cqZAp">
+          <node concept="3clFbC" id="ercpuLggy3" role="3clFbG">
+            <node concept="3clFbT" id="ercpuLgh6H" role="3uHU7w">
+              <property role="3clFbU" value="true" />
+            </node>
+            <node concept="2OqwBi" id="ercpuLgeqc" role="3uHU7B">
+              <node concept="2YIFZM" id="ercpuLgeqd" role="2Oq$k0">
+                <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="ercpuLgeqe" role="2OqNvi">
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getBoolean(java.lang.String,boolean)" resolve="getBoolean" />
+                <node concept="10M0yZ" id="ercpuLgeqf" role="37wK5m">
+                  <ref role="3cqZAo" node="ercpuLg7f0" resolve="MODELCHECK_ENABLED_KEY" />
+                  <ref role="1PxDUh" node="3GWIMuIxxsa" resolve="QueryListChecker" />
+                </node>
+                <node concept="3clFbT" id="ercpuLgeqh" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="sE7Ow" id="ercpuLgfNa">
+    <property role="TrG5h" value="EnableModelcheck" />
+    <property role="2YLI8m" value="6u2MFnph2wS/none" />
+    <property role="2uzpH1" value="QueryList: Enable Model Check" />
+    <node concept="tnohg" id="ercpuLgfNb" role="tncku">
+      <node concept="3clFbS" id="ercpuLgfNc" role="2VODD2">
+        <node concept="3clFbF" id="ercpuLgfNd" role="3cqZAp">
+          <node concept="2OqwBi" id="ercpuLgfNe" role="3clFbG">
+            <node concept="2YIFZM" id="ercpuLgfNf" role="2Oq$k0">
+              <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+            </node>
+            <node concept="liA8E" id="ercpuLgfNg" role="2OqNvi">
+              <ref role="37wK5l" to="jmi8:~PropertiesComponent.setValue(java.lang.String,boolean,boolean)" resolve="setValue" />
+              <node concept="10M0yZ" id="ercpuLgfNh" role="37wK5m">
+                <ref role="3cqZAo" node="ercpuLg7f0" resolve="MODELCHECK_ENABLED_KEY" />
+                <ref role="1PxDUh" node="3GWIMuIxxsa" resolve="QueryListChecker" />
+              </node>
+              <node concept="3clFbT" id="ercpuLgfNi" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="3clFbT" id="ercpuLgfNj" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2ScWuX" id="ercpuLgfNk" role="tmbBb">
+      <node concept="3clFbS" id="ercpuLgfNl" role="2VODD2">
+        <node concept="3clFbF" id="ercpuLgfNm" role="3cqZAp">
+          <node concept="3clFbC" id="ercpuLghOj" role="3clFbG">
+            <node concept="3clFbT" id="ercpuLghOH" role="3uHU7w" />
+            <node concept="2OqwBi" id="ercpuLgfNn" role="3uHU7B">
+              <node concept="2YIFZM" id="ercpuLgfNo" role="2Oq$k0">
+                <ref role="1Pybhc" to="jmi8:~PropertiesComponent" resolve="PropertiesComponent" />
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="ercpuLgfNp" role="2OqNvi">
+                <ref role="37wK5l" to="jmi8:~PropertiesComponent.getBoolean(java.lang.String,boolean)" resolve="getBoolean" />
+                <node concept="10M0yZ" id="ercpuLgfNq" role="37wK5m">
+                  <ref role="3cqZAo" node="ercpuLg7f0" resolve="MODELCHECK_ENABLED_KEY" />
+                  <ref role="1PxDUh" node="3GWIMuIxxsa" resolve="QueryListChecker" />
+                </node>
+                <node concept="3clFbT" id="ercpuLgfNr" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
index de29533cd..459b594eb 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -9,6 +9,9 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
   </languages>
   <imports>
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -32,10 +35,27 @@
     <import index="kvq8" ref="r:2e938759-cfd0-47cd-9046-896d85204f59(de.slisson.mps.hacks.editor)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="n70j" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.checking(MPS.Editor/)" />
+    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
+    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" />
+    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="zyr2" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.inspector(MPS.Editor/)" />
+    <import index="h83j" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem(MPS.Core/)" />
+    <import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
+    <import index="wsw7" ref="r:ba41e9c6-15ca-4a47-95f2-6a81c2318547(jetbrains.mps.checkers)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="j9co" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.event(MPS.Core/)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
+    <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="e5kc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.invoke(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" implicit="true" />
-    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -379,6 +399,13 @@
     <property role="TrG5h" value="EditorCell_QueryList" />
     <property role="1sVAO0" value="false" />
     <node concept="2tJIrI" id="5oklODahdC$" role="jymVt" />
+    <node concept="312cEg" id="T_6DrmD7QR" role="jymVt">
+      <property role="TrG5h" value="myDisableModelChecking" />
+      <node concept="3Tm6S6" id="T_6DrmD6Wx" role="1B3o_S" />
+      <node concept="10P_77" id="T_6DrmD7d7" role="1tU5fm" />
+      <node concept="3clFbT" id="T_6DrmD8Fh" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="T_6DrmD699" role="jymVt" />
     <node concept="3clFbW" id="5oklODahdFh" role="jymVt">
       <node concept="3cqZAl" id="5oklODahdFj" role="3clF45" />
       <node concept="3Tm1VV" id="5oklODahdFk" role="1B3o_S" />
@@ -704,6 +731,41 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="T_6DrmD8K$" role="jymVt" />
+    <node concept="3clFb_" id="T_6DrmDarn" role="jymVt">
+      <property role="TrG5h" value="toggleDisableModelChecking" />
+      <node concept="3clFbS" id="T_6DrmDarq" role="3clF47">
+        <node concept="3clFbF" id="T_6DrmDc5t" role="3cqZAp">
+          <node concept="37vLTI" id="T_6DrmDead" role="3clFbG">
+            <node concept="37vLTw" id="T_6DrmDe_1" role="37vLTx">
+              <ref role="3cqZAo" node="T_6DrmDbo8" resolve="flag" />
+            </node>
+            <node concept="37vLTw" id="T_6DrmDc5s" role="37vLTJ">
+              <ref role="3cqZAo" node="T_6DrmD7QR" resolve="myDisableModelChecking" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="T_6DrmD9F1" role="1B3o_S" />
+      <node concept="3cqZAl" id="T_6DrmDaol" role="3clF45" />
+      <node concept="37vLTG" id="T_6DrmDbo8" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="T_6DrmDbo7" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="T_6DrmDffN" role="jymVt" />
+    <node concept="3clFb_" id="T_6DrmDh7T" role="jymVt">
+      <property role="TrG5h" value="disableModelChecking" />
+      <node concept="3clFbS" id="T_6DrmDh7W" role="3clF47">
+        <node concept="3clFbF" id="T_6DrmDiFw" role="3cqZAp">
+          <node concept="37vLTw" id="T_6DrmDiFv" role="3clFbG">
+            <ref role="3cqZAo" node="T_6DrmD7QR" resolve="myDisableModelChecking" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="T_6DrmDg8K" role="1B3o_S" />
+      <node concept="10P_77" id="T_6DrmDh4R" role="3clF45" />
+    </node>
     <node concept="3Tm1VV" id="5oklODahdyR" role="1B3o_S" />
     <node concept="3uibUv" id="5oklODahe60" role="1zkMxy">
       <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
@@ -1136,7 +1198,7 @@
                     <node concept="3Tm1VV" id="lPJxikcUmg" role="1B3o_S" />
                     <node concept="3cqZAl" id="lPJxikcUmi" role="3clF45" />
                     <node concept="37vLTG" id="lPJxikcUmj" role="3clF46">
-                      <property role="TrG5h" value="p0" />
+                      <property role="TrG5h" value="context" />
                       <node concept="3uibUv" id="lPJxikcUmk" role="1tU5fm">
                         <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
                       </node>
@@ -1144,7 +1206,7 @@
                     <node concept="3clFbS" id="lPJxikcUml" role="3clF47">
                       <node concept="3clFbF" id="lPJxikcUNC" role="3cqZAp">
                         <node concept="1rXfSq" id="lPJxikcUNB" role="3clFbG">
-                          <ref role="37wK5l" node="535SrlQ6wT6" resolve="insertNewNode" />
+                          <ref role="37wK5l" node="6NOOaBwWUVq" resolve="insertNewNode" />
                           <node concept="37vLTw" id="1SwultAj2lI" role="37wK5m">
                             <ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
                           </node>
@@ -1152,6 +1214,9 @@
                           <node concept="3clFbT" id="lPJxikcVdp" role="37wK5m">
                             <property role="3clFbU" value="false" />
                           </node>
+                          <node concept="37vLTw" id="6NOOaBwXJjg" role="37wK5m">
+                            <ref role="3cqZAo" node="lPJxikcUmj" resolve="context" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -1536,7 +1601,7 @@
                       <node concept="3Tm1VV" id="C$q8A2NqI$" role="1B3o_S" />
                       <node concept="3cqZAl" id="C$q8A2NqIA" role="3clF45" />
                       <node concept="37vLTG" id="C$q8A2NqIB" role="3clF46">
-                        <property role="TrG5h" value="p0" />
+                        <property role="TrG5h" value="context" />
                         <node concept="3uibUv" id="C$q8A2NqIC" role="1tU5fm">
                           <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
                         </node>
@@ -1544,7 +1609,7 @@
                       <node concept="3clFbS" id="C$q8A2NqID" role="3clF47">
                         <node concept="3clFbF" id="C$q8A2NrvH" role="3cqZAp">
                           <node concept="1rXfSq" id="C$q8A2NrvG" role="3clFbG">
-                            <ref role="37wK5l" node="535SrlQ6wT6" resolve="insertNewNode" />
+                            <ref role="37wK5l" node="6NOOaBwWUVq" resolve="insertNewNode" />
                             <node concept="37vLTw" id="1SwultAj3tx" role="37wK5m">
                               <ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
                             </node>
@@ -1554,6 +1619,9 @@
                             <node concept="3clFbT" id="C$q8A2NtaS" role="37wK5m">
                               <property role="3clFbU" value="false" />
                             </node>
+                            <node concept="37vLTw" id="6NOOaBwXyUW" role="37wK5m">
+                              <ref role="3cqZAo" node="C$q8A2NqIB" resolve="context" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1589,7 +1657,7 @@
                       <node concept="3Tm1VV" id="C$q8A2Ntfd" role="1B3o_S" />
                       <node concept="3cqZAl" id="C$q8A2Ntfe" role="3clF45" />
                       <node concept="37vLTG" id="C$q8A2Ntff" role="3clF46">
-                        <property role="TrG5h" value="p0" />
+                        <property role="TrG5h" value="context" />
                         <node concept="3uibUv" id="C$q8A2Ntfg" role="1tU5fm">
                           <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
                         </node>
@@ -1597,7 +1665,7 @@
                       <node concept="3clFbS" id="C$q8A2Ntfh" role="3clF47">
                         <node concept="3clFbF" id="C$q8A2Ntfi" role="3cqZAp">
                           <node concept="1rXfSq" id="C$q8A2Ntfj" role="3clFbG">
-                            <ref role="37wK5l" node="535SrlQ6wT6" resolve="insertNewNode" />
+                            <ref role="37wK5l" node="6NOOaBwWUVq" resolve="insertNewNode" />
                             <node concept="37vLTw" id="1SwultAj3AO" role="37wK5m">
                               <ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
                             </node>
@@ -1607,6 +1675,9 @@
                             <node concept="3clFbT" id="C$q8A2Ntfm" role="37wK5m">
                               <property role="3clFbU" value="true" />
                             </node>
+                            <node concept="37vLTw" id="6NOOaBwXEct" role="37wK5m">
+                              <ref role="3cqZAo" node="C$q8A2Ntff" resolve="context" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1732,18 +1803,28 @@
                 <node concept="1bVj0M" id="5bKNAZ5i3K$" role="23t8la">
                   <node concept="3clFbS" id="5bKNAZ5i3K_" role="1bW5cS">
                     <node concept="3clFbF" id="5bKNAZ5i3R_" role="3cqZAp">
-                      <node concept="22lmx$" id="5vc9Xxa_D9z" role="3clFbG">
-                        <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
-                          <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
+                      <node concept="1Wc70l" id="1pBVZRTgSH9" role="3clFbG">
+                        <node concept="3y3z36" id="1pBVZRTgXRH" role="3uHU7B">
+                          <node concept="10Nm6u" id="1pBVZRTgYW8" role="3uHU7w" />
+                          <node concept="37vLTw" id="1pBVZRTgVIp" role="3uHU7B">
+                            <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                          </node>
                         </node>
-                        <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
-                          <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
-                            <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                        <node concept="1eOMI4" id="1pBVZRTh49H" role="3uHU7w">
+                          <node concept="22lmx$" id="5vc9Xxa_D9z" role="1eOMHV">
+                            <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
+                              <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
+                                <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                                </node>
+                                <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
+                              </node>
+                              <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
+                            </node>
+                            <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
+                              <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
                             </node>
-                            <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
                           </node>
-                          <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
                         </node>
                       </node>
                     </node>
@@ -1799,7 +1880,7 @@
         </node>
         <node concept="3clFbF" id="535SrlQ6EUr" role="3cqZAp">
           <node concept="1rXfSq" id="535SrlQ6EUq" role="3clFbG">
-            <ref role="37wK5l" node="535SrlQ6wT6" resolve="insertNewNode" />
+            <ref role="37wK5l" node="6NOOaBwWUVq" resolve="insertNewNode" />
             <node concept="37vLTw" id="1SwultAj3LF" role="37wK5m">
               <ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
             </node>
@@ -1809,6 +1890,9 @@
             <node concept="37vLTw" id="6LzhH3u7a5V" role="37wK5m">
               <ref role="3cqZAo" node="6LzhH3u73Pn" resolve="insertBefore" />
             </node>
+            <node concept="37vLTw" id="6NOOaBwXuhZ" role="37wK5m">
+              <ref role="3cqZAo" node="6LzhH3u73Pj" resolve="editorContext" />
+            </node>
           </node>
         </node>
       </node>
@@ -1863,9 +1947,7 @@
         <node concept="3Tqbb2" id="1BXECvJT4jD" role="1tU5fm" />
       </node>
       <node concept="A3Dl8" id="lPJxik3RKj" role="3clF45">
-        <node concept="3qUE_q" id="lPJxik3RKl" role="A3Ik2">
-          <node concept="3Tqbb2" id="lPJxik3RKm" role="3qUE_r" />
-        </node>
+        <node concept="3Tqbb2" id="GVgWr3RlSe" role="A3Ik2" />
       </node>
     </node>
     <node concept="3clFb_" id="1BXECvJTOCY" role="jymVt">
@@ -1898,7 +1980,6 @@
       </node>
     </node>
     <node concept="3clFb_" id="535SrlQ6wT6" role="jymVt">
-      <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="insertNewNode" />
       <node concept="37vLTG" id="535SrlQ6BMI" role="3clF46">
         <property role="TrG5h" value="listNode" />
@@ -1914,10 +1995,58 @@
       </node>
       <node concept="3cqZAl" id="535SrlQ6wT8" role="3clF45" />
       <node concept="3Tm1VV" id="535SrlQ6wT9" role="1B3o_S" />
-      <node concept="3clFbS" id="535SrlQ6wTa" role="3clF47" />
+      <node concept="3clFbS" id="535SrlQ6wTa" role="3clF47">
+        <node concept="3clFbF" id="6NOOaBwXZMD" role="3cqZAp">
+          <node concept="1rXfSq" id="6NOOaBwXZMC" role="3clFbG">
+            <ref role="37wK5l" node="6NOOaBwWUVq" resolve="insertNewNode" />
+            <node concept="37vLTw" id="6NOOaBwY5vJ" role="37wK5m">
+              <ref role="3cqZAo" node="535SrlQ6BMI" resolve="listNode" />
+            </node>
+            <node concept="37vLTw" id="6NOOaBwY8UV" role="37wK5m">
+              <ref role="3cqZAo" node="535SrlQ6CAY" resolve="anchorNode" />
+            </node>
+            <node concept="37vLTw" id="6NOOaBwYbzu" role="37wK5m">
+              <ref role="3cqZAo" node="535SrlQae4D" resolve="insertBefore" />
+            </node>
+            <node concept="10Nm6u" id="6NOOaBwYdJ6" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="6NOOaBwWSU5" role="lGtFl">
+        <node concept="TZ5HI" id="6NOOaBwWSU6" role="3nqlJM">
+          <node concept="TZ5HA" id="6NOOaBwWSU7" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6NOOaBwWSU8" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
-    <node concept="3clFb_" id="535SrlQaRRM" role="jymVt">
+    <node concept="3clFb_" id="6NOOaBwWUVq" role="jymVt">
       <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="insertNewNode" />
+      <node concept="37vLTG" id="6NOOaBwWUVr" role="3clF46">
+        <property role="TrG5h" value="listNode" />
+        <node concept="3Tqbb2" id="6NOOaBwWUVs" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6NOOaBwWUVt" role="3clF46">
+        <property role="TrG5h" value="anchorNode" />
+        <node concept="3Tqbb2" id="6NOOaBwWUVu" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6NOOaBwWUVv" role="3clF46">
+        <property role="TrG5h" value="insertBefore" />
+        <node concept="10P_77" id="6NOOaBwWUVw" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6NOOaBwX5Z4" role="3clF46">
+        <property role="TrG5h" value="editorContext" />
+        <node concept="3uibUv" id="6NOOaBwX5Z5" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6NOOaBwWUVx" role="3clF45" />
+      <node concept="3Tm1VV" id="6NOOaBwWUVy" role="1B3o_S" />
+      <node concept="3clFbS" id="6NOOaBwWUVz" role="3clF47" />
+    </node>
+    <node concept="3clFb_" id="535SrlQaRRM" role="jymVt">
       <property role="TrG5h" value="deleteNode" />
       <node concept="37vLTG" id="535SrlQaXdA" role="3clF46">
         <property role="TrG5h" value="listNode" />
@@ -1929,7 +2058,49 @@
       </node>
       <node concept="3cqZAl" id="535SrlQaRRO" role="3clF45" />
       <node concept="3Tm1VV" id="535SrlQaRRP" role="1B3o_S" />
-      <node concept="3clFbS" id="535SrlQaRRQ" role="3clF47" />
+      <node concept="3clFbS" id="535SrlQaRRQ" role="3clF47">
+        <node concept="3clFbF" id="6NOOaBwYi5I" role="3cqZAp">
+          <node concept="1rXfSq" id="6NOOaBwYi5H" role="3clFbG">
+            <ref role="37wK5l" node="6NOOaBwXgUX" resolve="deleteNode" />
+            <node concept="37vLTw" id="6NOOaBwYmgg" role="37wK5m">
+              <ref role="3cqZAo" node="535SrlQaXdA" resolve="listNode" />
+            </node>
+            <node concept="37vLTw" id="6NOOaBwYpHL" role="37wK5m">
+              <ref role="3cqZAo" node="535SrlQaY26" resolve="nodeToDelete" />
+            </node>
+            <node concept="10Nm6u" id="6NOOaBwYsEX" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="6NOOaBwXeT5" role="lGtFl">
+        <node concept="TZ5HI" id="6NOOaBwXeT6" role="3nqlJM">
+          <node concept="TZ5HA" id="6NOOaBwXeT7" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6NOOaBwXeT8" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="6NOOaBwXgUX" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="deleteNode" />
+      <node concept="37vLTG" id="6NOOaBwXgUY" role="3clF46">
+        <property role="TrG5h" value="listNode" />
+        <node concept="3Tqbb2" id="6NOOaBwXgUZ" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6NOOaBwXgV0" role="3clF46">
+        <property role="TrG5h" value="nodeToDelete" />
+        <node concept="3Tqbb2" id="6NOOaBwXgV1" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6NOOaBwXnuD" role="3clF46">
+        <property role="TrG5h" value="editorContext" />
+        <node concept="3uibUv" id="6NOOaBwXnuE" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6NOOaBwXgV2" role="3clF45" />
+      <node concept="3Tm1VV" id="6NOOaBwXgV3" role="1B3o_S" />
+      <node concept="3clFbS" id="6NOOaBwXgV4" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="puVMIbtV9O" role="jymVt" />
     <node concept="3clFb_" id="lPJxikdcP5" role="jymVt">
@@ -2688,13 +2859,16 @@
         <node concept="3clFbS" id="puVMIbvyTC" role="3clF47">
           <node concept="3clFbF" id="puVMIbvz90" role="3cqZAp">
             <node concept="1rXfSq" id="puVMIbvz8Z" role="3clFbG">
-              <ref role="37wK5l" node="535SrlQaRRM" resolve="deleteNode" />
+              <ref role="37wK5l" node="6NOOaBwXgUX" resolve="deleteNode" />
               <node concept="37vLTw" id="1SwultAj5p_" role="37wK5m">
                 <ref role="3cqZAo" node="1SwultAiTIH" resolve="myOwner" />
               </node>
               <node concept="37vLTw" id="puVMIbv$er" role="37wK5m">
                 <ref role="3cqZAo" node="puVMIbvzg0" resolve="myChildNode" />
               </node>
+              <node concept="37vLTw" id="6NOOaBwXNZC" role="37wK5m">
+                <ref role="3cqZAo" node="puVMIbvyT$" resolve="context" />
+              </node>
             </node>
           </node>
         </node>
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/models/com/mbeddr/mpsutil/editor/querylist/sandbox.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/models/com/mbeddr/mpsutil/editor/querylist/sandbox.mps
index 9a0b85e07..9a34d85a5 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/models/com/mbeddr/mpsutil/editor/querylist/sandbox.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/models/com/mbeddr/mpsutil/editor/querylist/sandbox.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="c58b797b-c53c-4442-abff-4d54c72169ea/r:5f236bd8-eb21-40b6-825a-9e614ca27175(com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="9b71d0db-bcaf-4144-bb2e-1ddef2b249b9" name="com.mbeddr.mpsutil.editor.querylist.demolang" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -44,6 +45,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -257,10 +261,10 @@
         </node>
         <node concept="3cpWs8" id="3jHPIDngL4x" role="3cqZAp">
           <node concept="3cpWsn" id="3jHPIDngL4$" role="3cpWs9">
-            <property role="TrG5h" value="def" />
+            <property role="TrG5h" value="variableWithError" />
             <node concept="10Oyi0" id="3jHPIDngL4v" role="1tU5fm" />
-            <node concept="3cmrfG" id="3jHPIDngLyE" role="33vP2m">
-              <property role="3cmrfH" value="20" />
+            <node concept="3clFbT" id="3GWIMuIwEjI" role="33vP2m">
+              <property role="3clFbU" value="true" />
             </node>
           </node>
         </node>
@@ -289,6 +293,7 @@
       <node concept="3cqZAl" id="puVMIbwTJy" role="3clF45" />
       <node concept="3Tm1VV" id="puVMIbwTJz" role="1B3o_S" />
     </node>
+    <node concept="3Tm1VV" id="puVMIbwTIx" role="1B3o_S" />
     <node concept="2tJIrI" id="8dI1zLapqx" role="jymVt" />
     <node concept="3clFb_" id="8dI1zLapre" role="jymVt">
       <property role="TrG5h" value="b" />
@@ -310,7 +315,6 @@
         <node concept="3clFbH" id="8dI1zLb3mW" role="3cqZAp" />
       </node>
     </node>
-    <node concept="3Tm1VV" id="puVMIbwTIx" role="1B3o_S" />
   </node>
   <node concept="2X83RC" id="1GpxVmAg3nl">
     <node concept="Xl_RD" id="1GpxVmAt5pV" role="2Xng07" />
@@ -365,5 +369,73 @@
     </node>
   </node>
   <node concept="trnVC" id="5vc9XxaKm$o" />
+  <node concept="312cEu" id="5fXNsKgPqLa">
+    <property role="TrG5h" value="OtherClass2" />
+    <node concept="3clFb_" id="5fXNsKgPqLb" role="jymVt">
+      <property role="TrG5h" value="a" />
+      <node concept="3clFbS" id="5fXNsKgPqLc" role="3clF47">
+        <node concept="3cpWs8" id="5fXNsKgPqLd" role="3cqZAp">
+          <node concept="3cpWsn" id="5fXNsKgPqLe" role="3cpWs9">
+            <property role="TrG5h" value="abc2" />
+            <node concept="10Oyi0" id="5fXNsKgPqLf" role="1tU5fm" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5fXNsKgPqLg" role="3cqZAp">
+          <node concept="3cpWsn" id="5fXNsKgPqLh" role="3cpWs9">
+            <property role="TrG5h" value="variableWithError2" />
+            <node concept="10Oyi0" id="5fXNsKgPqLi" role="1tU5fm" />
+            <node concept="3clFbT" id="5fXNsKgPqLj" role="33vP2m">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5fXNsKgPqLk" role="3cqZAp" />
+        <node concept="3clFbF" id="5fXNsKgPqLl" role="3cqZAp">
+          <node concept="2ShNRf" id="5fXNsKgPqLm" role="3clFbG">
+            <node concept="YeOm9" id="5fXNsKgPqLn" role="2ShVmc">
+              <node concept="1Y3b0j" id="5fXNsKgPqLo" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                <ref role="1Y3XeK" to="wyt6:~Object" resolve="Object" />
+                <node concept="3Tm1VV" id="5fXNsKgPqLp" role="1B3o_S" />
+                <node concept="3clFb_" id="5fXNsKgPqLq" role="jymVt">
+                  <property role="TrG5h" value="f2" />
+                  <node concept="3cqZAl" id="5fXNsKgPqLr" role="3clF45" />
+                  <node concept="3Tm1VV" id="5fXNsKgPqLs" role="1B3o_S" />
+                  <node concept="3clFbS" id="5fXNsKgPqLt" role="3clF47" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5fXNsKgPqLu" role="3cqZAp" />
+        <node concept="3clFbH" id="5fXNsKgPqLv" role="3cqZAp" />
+      </node>
+      <node concept="3cqZAl" id="5fXNsKgPqLw" role="3clF45" />
+      <node concept="3Tm1VV" id="5fXNsKgPqLx" role="1B3o_S" />
+    </node>
+    <node concept="3Tm1VV" id="5fXNsKgPqLy" role="1B3o_S" />
+    <node concept="2tJIrI" id="5fXNsKgPqLz" role="jymVt" />
+    <node concept="3clFb_" id="5fXNsKgPqL$" role="jymVt">
+      <property role="TrG5h" value="b2" />
+      <node concept="3cqZAl" id="5fXNsKgPqL_" role="3clF45" />
+      <node concept="3Tm1VV" id="5fXNsKgPqLA" role="1B3o_S" />
+      <node concept="3clFbS" id="5fXNsKgPqLB" role="3clF47">
+        <node concept="3cpWs8" id="5fXNsKgPqLC" role="3cqZAp">
+          <node concept="3cpWsn" id="5fXNsKgPqLD" role="3cpWs9">
+            <property role="TrG5h" value="a2" />
+            <node concept="10Oyi0" id="5fXNsKgPqLE" role="1tU5fm" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5fXNsKgPqLF" role="3cqZAp">
+          <node concept="3cpWsn" id="5fXNsKgPqLG" role="3cpWs9">
+            <property role="TrG5h" value="b2" />
+            <node concept="10Oyi0" id="5fXNsKgPqLH" role="1tU5fm" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="5fXNsKgPqLI" role="3cqZAp" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
index 8f1add61a..d27d06d6c 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
@@ -1468,31 +1468,25 @@
                       </node>
                       <node concept="liA8E" id="4AgRrBJoY_G" role="2OqNvi">
                         <ref role="37wK5l" to="g51k:~EditorCell_Collection.setInitiallyCollapsed(boolean)" resolve="setInitiallyCollapsed" />
-                        <node concept="1rXfSq" id="4AgRrBJoYA_" role="37wK5m">
-                          <ref role="37wK5l" node="3ZqNA5Al5kX" resolve="_condition_" />
-                          <node concept="37vLTw" id="4AgRrBJoYAA" role="37wK5m">
-                            <ref role="3cqZAo" node="fYh_FQ7" resolve="node" />
-                          </node>
-                          <node concept="37vLTw" id="4AgRrBJoYAB" role="37wK5m">
-                            <ref role="3cqZAo" node="fYh_FQ2" resolve="editorContext" />
-                          </node>
-                          <node concept="1ZhdrF" id="4AgRrBJoYAC" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <node concept="1rXfSq" id="T_6DrmT4F7" role="37wK5m">
+                          <ref role="37wK5l" node="4m$$SBGc$_p" resolve="collapseByDefault" />
+                          <node concept="1ZhdrF" id="T_6DrmUf0B" role="lGtFl">
                             <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <node concept="3$xsQk" id="4AgRrBJoYAD" role="3$ytzL">
-                              <node concept="3clFbS" id="4AgRrBJoYAE" role="2VODD2">
-                                <node concept="3clFbF" id="4AgRrBJoYAF" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4AgRrBJoYAG" role="3clFbG">
-                                    <node concept="1iwH7S" id="4AgRrBJoYAH" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="4AgRrBJoYAI" role="2OqNvi">
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="T_6DrmUf0C" role="3$ytzL">
+                              <node concept="3clFbS" id="T_6DrmUf0D" role="2VODD2">
+                                <node concept="3clFbF" id="4m$$SBGd3Yv" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4m$$SBGd3Yw" role="3clFbG">
+                                    <node concept="1iwH70" id="4m$$SBGd3Yx" role="2OqNvi">
                                       <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
-                                      <node concept="2OqwBi" id="4AgRrBJoYAJ" role="1iwH7V">
-                                        <node concept="30H73N" id="4AgRrBJoYAK" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="rlw0PZTEOa" role="2OqNvi">
+                                      <node concept="2OqwBi" id="4m$$SBGd4Gu" role="1iwH7V">
+                                        <node concept="30H73N" id="4m$$SBGd3Yz" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4m$$SBGd52H" role="2OqNvi">
                                           <ref role="3Tt5mk" to="bbp5:5qrsiYWrGSD" resolve="collapseByDefaultCondition" />
                                         </node>
                                       </node>
                                     </node>
+                                    <node concept="1iwH7S" id="4m$$SBGd3Y_" role="2Oq$k0" />
                                   </node>
                                 </node>
                               </node>
@@ -1527,6 +1521,96 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbF" id="T_6DrmDlWn" role="3cqZAp">
+                    <node concept="2OqwBi" id="T_6DrmDlWo" role="3clFbG">
+                      <node concept="37vLTw" id="T_6DrmDlWp" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
+                      </node>
+                      <node concept="liA8E" id="T_6DrmDlWq" role="2OqNvi">
+                        <ref role="37wK5l" to="d2zl:T_6DrmDarn" resolve="toggleDisableModelChecking" />
+                        <node concept="3clFbT" id="T_6DrmDlWr" role="37wK5m">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1W57fq" id="T_6DrmDlWs" role="lGtFl">
+                      <node concept="3IZrLx" id="T_6DrmDlWt" role="3IZSJc">
+                        <node concept="3clFbS" id="T_6DrmDlWu" role="2VODD2">
+                          <node concept="3clFbF" id="T_6DrmDlWv" role="3cqZAp">
+                            <node concept="1Wc70l" id="T_6DrmDlWw" role="3clFbG">
+                              <node concept="2OqwBi" id="T_6DrmDlWx" role="3uHU7w">
+                                <node concept="30H73N" id="T_6DrmDlWy" role="2Oq$k0" />
+                                <node concept="3TrcHB" id="T_6DrmDlWz" role="2OqNvi">
+                                  <ref role="3TsBF5" to="bbp5:T_6DrmCUS2" resolve="disableModelChecking" />
+                                </node>
+                              </node>
+                              <node concept="3clFbC" id="T_6DrmDlWC" role="3uHU7B">
+                                <node concept="2OqwBi" id="T_6DrmDlWD" role="3uHU7B">
+                                  <node concept="30H73N" id="T_6DrmDlWE" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="T_6DrmDlWF" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                                  </node>
+                                </node>
+                                <node concept="10Nm6u" id="T_6DrmDlWG" role="3uHU7w" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="T_6DrmDlWH" role="3cqZAp">
+                    <node concept="2OqwBi" id="T_6DrmDlWI" role="3clFbG">
+                      <node concept="37vLTw" id="T_6DrmDlWJ" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
+                      </node>
+                      <node concept="liA8E" id="T_6DrmDlWK" role="2OqNvi">
+                        <ref role="37wK5l" to="d2zl:T_6DrmDarn" resolve="toggleDisableModelChecking" />
+                        <node concept="1rXfSq" id="T_6DrmT844" role="37wK5m">
+                          <ref role="37wK5l" node="T_6DrmSRWQ" resolve="disableModelChecking" />
+                          <node concept="1ZhdrF" id="T_6DrmUk$R" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="T_6DrmUk$S" role="3$ytzL">
+                              <node concept="3clFbS" id="T_6DrmUk$T" role="2VODD2">
+                                <node concept="3clFbF" id="T_6DrmUlzD" role="3cqZAp">
+                                  <node concept="2OqwBi" id="T_6DrmUlzE" role="3clFbG">
+                                    <node concept="1iwH70" id="T_6DrmUlzF" role="2OqNvi">
+                                      <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
+                                      <node concept="2OqwBi" id="T_6DrmUlzG" role="1iwH7V">
+                                        <node concept="30H73N" id="T_6DrmUlzH" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="T_6DrmUlzI" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="1iwH7S" id="T_6DrmUlzJ" role="2Oq$k0" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1W57fq" id="T_6DrmDlWY" role="lGtFl">
+                      <node concept="3IZrLx" id="T_6DrmDlWZ" role="3IZSJc">
+                        <node concept="3clFbS" id="T_6DrmDlX0" role="2VODD2">
+                          <node concept="3clFbF" id="T_6DrmDlX1" role="3cqZAp">
+                            <node concept="3y3z36" id="T_6DrmDlX6" role="3clFbG">
+                              <node concept="10Nm6u" id="T_6DrmDlX7" role="3uHU7w" />
+                              <node concept="2OqwBi" id="T_6DrmDlX8" role="3uHU7B">
+                                <node concept="30H73N" id="T_6DrmDlX9" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="T_6DrmDBhx" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3cpWs6" id="1WjrBsNI_rj" role="3cqZAp">
                     <node concept="37vLTw" id="1WjrBsNI_rk" role="3cqZAk">
                       <ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
@@ -1562,6 +1646,58 @@
           </node>
         </node>
       </node>
+      <node concept="3clFb_" id="4m$$SBGc$_p" role="jymVt">
+        <property role="TrG5h" value="collapseByDefault" />
+        <node concept="3clFbS" id="4m$$SBGc$_s" role="3clF47">
+          <node concept="3cpWs6" id="4m$$SBGcAFE" role="3cqZAp">
+            <node concept="3clFbT" id="4m$$SBGcDr0" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="4m$$SBGcxdq" role="1B3o_S" />
+        <node concept="10P_77" id="4m$$SBGczrj" role="3clF45" />
+        <node concept="raruj" id="T_6DrmSRjb" role="lGtFl" />
+        <node concept="29HgVG" id="T_6DrmSX68" role="lGtFl">
+          <node concept="3NFfHV" id="T_6DrmSX69" role="3NFExx">
+            <node concept="3clFbS" id="T_6DrmSX6a" role="2VODD2">
+              <node concept="3clFbF" id="T_6DrmSX6g" role="3cqZAp">
+                <node concept="2OqwBi" id="T_6DrmSX6b" role="3clFbG">
+                  <node concept="3TrEf2" id="T_6DrmSX6e" role="2OqNvi">
+                    <ref role="3Tt5mk" to="bbp5:5qrsiYWrGSD" resolve="collapseByDefaultCondition" />
+                  </node>
+                  <node concept="30H73N" id="T_6DrmSX6f" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="T_6DrmSRWQ" role="jymVt">
+        <property role="TrG5h" value="disableModelChecking" />
+        <node concept="3clFbS" id="T_6DrmSRWR" role="3clF47">
+          <node concept="3cpWs6" id="T_6DrmSRWS" role="3cqZAp">
+            <node concept="3clFbT" id="T_6DrmSRWT" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="T_6DrmSRWU" role="1B3o_S" />
+        <node concept="10P_77" id="T_6DrmSRWV" role="3clF45" />
+        <node concept="raruj" id="T_6DrmSRWW" role="lGtFl" />
+        <node concept="29HgVG" id="T_6DrmSYFl" role="lGtFl">
+          <node concept="3NFfHV" id="T_6DrmSYFm" role="3NFExx">
+            <node concept="3clFbS" id="T_6DrmSYFn" role="2VODD2">
+              <node concept="3clFbF" id="T_6DrmSYFt" role="3cqZAp">
+                <node concept="2OqwBi" id="T_6DrmSYFo" role="3clFbG">
+                  <node concept="3TrEf2" id="T_6DrmSYFr" role="2OqNvi">
+                    <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                  </node>
+                  <node concept="30H73N" id="T_6DrmSYFs" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="T_6DrmSAFb" role="jymVt" />
+      <node concept="2tJIrI" id="T_6DrmPvWN" role="jymVt" />
       <node concept="3clFb_" id="4Hw51cn4eQ7" role="jymVt">
         <property role="TrG5h" value="newFactoryMethod" />
         <node concept="3uibUv" id="4Hw51cn4eQ8" role="3clF45">
@@ -3046,9 +3182,7 @@
                       <ref role="3cqZAo" node="ne46p2zv$i" resolve="queryResult" />
                     </node>
                     <node concept="A3Dl8" id="ne46p2zHPg" role="10QFUM">
-                      <node concept="3qUE_q" id="ne46p2zHPh" role="A3Ik2">
-                        <node concept="3Tqbb2" id="ne46p2zHPi" role="3qUE_r" />
-                      </node>
+                      <node concept="3Tqbb2" id="30VHz0EZV1Q" role="A3Ik2" />
                     </node>
                   </node>
                 </node>
@@ -3079,9 +3213,7 @@
             </node>
           </node>
           <node concept="A3Dl8" id="lPJxik4aw3" role="3clF45">
-            <node concept="3qUE_q" id="lPJxik4cw0" role="A3Ik2">
-              <node concept="3Tqbb2" id="lPJxik4cD$" role="3qUE_r" />
-            </node>
+            <node concept="3Tqbb2" id="30VHz0EZJSU" role="A3Ik2" />
           </node>
           <node concept="2AHcQZ" id="lPJxik54po" role="2AJF6D">
             <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -3200,6 +3332,13 @@
             <property role="3TUv4t" value="true" />
             <node concept="10P_77" id="535SrlQalou" role="1tU5fm" />
           </node>
+          <node concept="37vLTG" id="6NOOaBwYxiL" role="3clF46">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="editorContext" />
+            <node concept="3uibUv" id="6NOOaBwYAqd" role="1tU5fm">
+              <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+            </node>
+          </node>
           <node concept="3cqZAl" id="535SrlQ6NNm" role="3clF45" />
           <node concept="3Tm1VV" id="535SrlQ6NNn" role="1B3o_S" />
           <node concept="3clFbS" id="535SrlQ6NNp" role="3clF47">
@@ -3247,6 +3386,13 @@
             <property role="3TUv4t" value="true" />
             <node concept="3Tqbb2" id="puVMIbsU61" role="1tU5fm" />
           </node>
+          <node concept="37vLTG" id="6NOOaBwYHqu" role="3clF46">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="editorContext" />
+            <node concept="3uibUv" id="6NOOaBwYK4I" role="1tU5fm">
+              <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+            </node>
+          </node>
           <node concept="3cqZAl" id="puVMIbsU62" role="3clF45" />
           <node concept="3Tm1VV" id="puVMIbsU63" role="1B3o_S" />
           <node concept="3clFbS" id="puVMIbsU65" role="3clF47">
@@ -5071,44 +5217,29 @@
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3cpWs6" id="heOoiHh" role="3cqZAp">
-              <node concept="1W57fq" id="heOoiHm" role="lGtFl">
-                <node concept="3IZrLx" id="heOoiHn" role="3IZSJc">
-                  <node concept="3clFbS" id="heOoiHo" role="2VODD2">
-                    <node concept="3clFbF" id="heOoiHp" role="3cqZAp">
-                      <node concept="3clFbC" id="heOoiHq" role="3clFbG">
-                        <node concept="10Nm6u" id="heOoiHr" role="3uHU7w" />
-                        <node concept="2OqwBi" id="hxx$VWA" role="3uHU7B">
-                          <node concept="3TrEf2" id="8dI1zL60F6" role="2OqNvi">
-                            <ref role="3Tt5mk" to="bbp5:h84_6ER" resolve="nodeFactory" />
-                          </node>
-                          <node concept="30H73N" id="heOoiHt" role="2Oq$k0" />
+                <node concept="gft3U" id="6TSlAOGKYgv" role="UU_$l">
+                  <node concept="3cpWs6" id="heOoiHh" role="gfFT$">
+                    <node concept="2YIFZM" id="3Km1Pf7cimB" role="3cqZAk">
+                      <ref role="37wK5l" to="zce0:~NodeFactoryManager.createNode(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext,java.lang.String)" resolve="createNode" />
+                      <ref role="1Pybhc" to="zce0:~NodeFactoryManager" resolve="NodeFactoryManager" />
+                      <node concept="37vLTw" id="3GM_nagTBmC" role="37wK5m">
+                        <ref role="3cqZAo" node="heOoiH0" resolve="listOwner" />
+                      </node>
+                      <node concept="37vLTw" id="2BHiRxghfAu" role="37wK5m">
+                        <ref role="3cqZAo" node="heOoiHw" resolve="editorContext" />
+                      </node>
+                      <node concept="2OqwBi" id="4glh_DcqKYP" role="37wK5m">
+                        <node concept="3nyPlj" id="3Km1Pf7cimE" role="2Oq$k0">
+                          <ref role="37wK5l" to="p9jd:~RefNodeListHandler.getElementSRole()" resolve="getElementSRole" />
+                        </node>
+                        <node concept="liA8E" id="4glh_DcqNMg" role="2OqNvi">
+                          <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2YIFZM" id="3Km1Pf7cimB" role="3cqZAk">
-                <ref role="37wK5l" to="zce0:~NodeFactoryManager.createNode(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext,java.lang.String)" resolve="createNode" />
-                <ref role="1Pybhc" to="zce0:~NodeFactoryManager" resolve="NodeFactoryManager" />
-                <node concept="37vLTw" id="3GM_nagTBmC" role="37wK5m">
-                  <ref role="3cqZAo" node="heOoiH0" resolve="listOwner" />
-                </node>
-                <node concept="37vLTw" id="2BHiRxghfAu" role="37wK5m">
-                  <ref role="3cqZAo" node="heOoiHw" resolve="editorContext" />
-                </node>
-                <node concept="2OqwBi" id="4glh_DcqKYP" role="37wK5m">
-                  <node concept="3nyPlj" id="3Km1Pf7cimE" role="2Oq$k0">
-                    <ref role="37wK5l" to="p9jd:~RefNodeListHandler.getElementSRole()" resolve="getElementSRole" />
-                  </node>
-                  <node concept="liA8E" id="4glh_DcqNMg" role="2OqNvi">
-                    <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
-                  </node>
-                </node>
-              </node>
             </node>
           </node>
           <node concept="37vLTG" id="heOoiHw" role="3clF46">
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/behavior.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/behavior.mps
index 06d3b2ecc..95fe5ee91 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/behavior.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/behavior.mps
@@ -5,6 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -177,7 +178,6 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -653,7 +653,6 @@
         <node concept="3cpWs8" id="C$q8A2yC7M" role="3cqZAp">
           <node concept="3cpWsn" id="C$q8A2yC7N" role="3cpWs9">
             <property role="TrG5h" value="concept" />
-            <node concept="3THzug" id="C$q8A2yC7O" role="1tU5fm" />
             <node concept="2OqwBi" id="C$q8A2yC7P" role="33vP2m">
               <node concept="37vLTw" id="C$q8A2yC7Q" role="2Oq$k0">
                 <ref role="3cqZAo" node="C$q8A2yC7F" resolve="nodeType" />
@@ -662,6 +661,9 @@
                 <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
               </node>
             </node>
+            <node concept="3Tqbb2" id="6TSlAOGJC9Z" role="1tU5fm">
+              <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+            </node>
           </node>
         </node>
         <node concept="3cpWs6" id="C$q8A2yC7S" role="3cqZAp">
@@ -675,7 +677,7 @@
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getConceptForInlineComponent" />
-      <ref role="13i0hy" node="Op$R499ptZ" resolve="getConceptForInlineComponent" />
+      <ref role="13i0hy" node="6TSlAOGJCRe" resolve="getConceptForInlineComponent" />
       <node concept="3Tm1VV" id="Op$R499qqW" role="1B3o_S" />
       <node concept="3clFbS" id="Op$R499qqZ" role="3clF47">
         <node concept="3clFbF" id="Op$R499qwp" role="3cqZAp">
@@ -687,7 +689,9 @@
           </node>
         </node>
       </node>
-      <node concept="3THzug" id="Op$R499qr0" role="3clF45" />
+      <node concept="3Tqbb2" id="6TSlAOGJDN8" role="3clF45">
+        <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+      </node>
     </node>
     <node concept="13hLZK" id="5oklODagIfC" role="13h7CW">
       <node concept="3clFbS" id="5oklODagIfD" role="2VODD2" />
@@ -755,6 +759,9 @@
               <node concept="35c_gC" id="1zqEQG3WoHi" role="HW$Y0">
                 <ref role="35c_gD" to="bbp5:535SrlQade6" resolve="Paramter_insertBefore" />
               </node>
+              <node concept="35c_gC" id="6NOOaBwWDt6" role="HW$Y0">
+                <ref role="35c_gD" to="tpc2:gTQ80DJ" resolve="ConceptFunctionParameter_editorContext" />
+              </node>
             </node>
           </node>
         </node>
@@ -851,6 +858,9 @@
               <node concept="35c_gC" id="1zqEQG3WoGV" role="HW$Y0">
                 <ref role="35c_gD" to="bbp5:puVMIbwgYa" resolve="Parameter_NodeToDelete" />
               </node>
+              <node concept="35c_gC" id="6NOOaBwWDIt" role="HW$Y0">
+                <ref role="35c_gD" to="tpc2:gTQ80DJ" resolve="ConceptFunctionParameter_editorContext" />
+              </node>
             </node>
           </node>
         </node>
@@ -1015,12 +1025,14 @@
               </node>
             </node>
             <node concept="2qgKlT" id="Op$R499s4G" role="2OqNvi">
-              <ref role="37wK5l" node="Op$R499ptZ" resolve="getConceptForInlineComponent" />
+              <ref role="37wK5l" node="6TSlAOGJCRe" resolve="getConceptForInlineComponent" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3THzug" id="6hPjX46YofF" role="3clF45" />
+      <node concept="3Tqbb2" id="6TSlAOGJHT_" role="3clF45">
+        <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+      </node>
     </node>
   </node>
   <node concept="13h7C7" id="Op$R494ArD">
@@ -1136,7 +1148,7 @@
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getConceptForInlineComponent" />
-      <ref role="13i0hy" node="Op$R499ptZ" resolve="getConceptForInlineComponent" />
+      <ref role="13i0hy" node="6TSlAOGJCRe" resolve="getConceptForInlineComponent" />
       <node concept="3Tm1VV" id="Op$R499r2L" role="1B3o_S" />
       <node concept="3clFbS" id="Op$R499r2O" role="3clF47">
         <node concept="3cpWs6" id="Op$R499rlB" role="3cqZAp">
@@ -1148,7 +1160,9 @@
           </node>
         </node>
       </node>
-      <node concept="3THzug" id="Op$R499r2P" role="3clF45" />
+      <node concept="3Tqbb2" id="6TSlAOGJGnt" role="3clF45">
+        <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+      </node>
     </node>
     <node concept="13hLZK" id="Op$R496zMA" role="13h7CW">
       <node concept="3clFbS" id="Op$R496zMB" role="2VODD2" />
@@ -1159,13 +1173,15 @@
     <node concept="13hLZK" id="Op$R499ptX" role="13h7CW">
       <node concept="3clFbS" id="Op$R499ptY" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="Op$R499ptZ" role="13h7CS">
+    <node concept="13i0hz" id="6TSlAOGJCRe" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="getConceptForInlineComponent" />
-      <node concept="3Tm1VV" id="Op$R499pu0" role="1B3o_S" />
-      <node concept="3THzug" id="Op$R499q4u" role="3clF45" />
-      <node concept="3clFbS" id="Op$R499pu2" role="3clF47" />
+      <node concept="3Tm1VV" id="6TSlAOGJCRf" role="1B3o_S" />
+      <node concept="3Tqbb2" id="6TSlAOGJCUY" role="3clF45">
+        <ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+      </node>
+      <node concept="3clFbS" id="6TSlAOGJCRh" role="3clF47" />
     </node>
   </node>
   <node concept="13h7C7" id="8dI1zL1C6y">
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/editor.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/editor.mps
index f53bcf1d4..0d6e0ac3a 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/editor.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/editor.mps
@@ -295,6 +295,21 @@
         <property role="3F0ifm" value="query list cell:" />
         <ref role="1k5W1q" to="tpc5:hF4yUZ8" resolve="header" />
       </node>
+      <node concept="3F0ifn" id="T_6DrmKnTy" role="3EZMnx" />
+      <node concept="3F0ifn" id="T_6DrmK2WO" role="3EZMnx">
+        <property role="3F0ifm" value="Note: Model checking is not available for dynamically generated nodes." />
+        <node concept="Vb9p2" id="T_6DrmLbZe" role="3F10Kt" />
+        <node concept="VPXOz" id="hEUNSPq" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="30gYXW" id="hF0kJTp" role="3F10Kt">
+          <property role="Vb096" value="fLwANPq/yellow" />
+        </node>
+        <node concept="30h1P$" id="hF0kJVV" role="3F10Kt">
+          <property role="Vb096" value="fLwANPt/cyan" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="T_6DrmKowI" role="3EZMnx" />
       <node concept="3EZMnI" id="hF4wrQa" role="3EZMnx">
         <node concept="3EZMnI" id="535SrlQ570R" role="3EZMnx">
           <node concept="VPM3Z" id="535SrlQ570T" role="3F10Kt">
@@ -320,7 +335,7 @@
             <property role="VOm3f" value="true" />
           </node>
           <node concept="3F0ifn" id="C$q8A2yzqr" role="3EZMnx">
-            <property role="3F0ifm" value="elements concept" />
+            <property role="3F0ifm" value="element's concept" />
             <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
           </node>
           <node concept="1iCGBv" id="C$q8A2y_cM" role="3EZMnx">
@@ -583,6 +598,82 @@
           </node>
           <node concept="2iRfu4" id="5qrsiYWpxai" role="2iSdaV" />
         </node>
+        <node concept="3EZMnI" id="T_6DrmCWmD" role="3EZMnx">
+          <node concept="3F0ifn" id="T_6DrmCWmE" role="3EZMnx">
+            <property role="3F0ifm" value="disable model checking " />
+            <ref role="1k5W1q" to="tpc5:hF4H1c8" resolve="property" />
+          </node>
+          <node concept="1QoScp" id="T_6DrmCWmF" role="3EZMnx">
+            <property role="1QpmdY" value="true" />
+            <node concept="pkWqt" id="T_6DrmCWmG" role="3e4ffs">
+              <node concept="3clFbS" id="T_6DrmCWmH" role="2VODD2">
+                <node concept="3clFbF" id="T_6DrmCWmI" role="3cqZAp">
+                  <node concept="2OqwBi" id="T_6DrmCWmJ" role="3clFbG">
+                    <node concept="2OqwBi" id="T_6DrmCWmK" role="2Oq$k0">
+                      <node concept="pncrf" id="T_6DrmCWmL" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="T_6DrmCWmM" role="2OqNvi">
+                        <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                      </node>
+                    </node>
+                    <node concept="3w_OXm" id="T_6DrmCWmN" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3F0A7n" id="T_6DrmCWmO" role="1QoS34">
+              <ref role="1NtTu8" to="bbp5:T_6DrmCUS2" resolve="disableModelChecking" />
+              <node concept="OXEIz" id="T_6DrmCWmP" role="P5bDN">
+                <node concept="PvTIS" id="T_6DrmCWmQ" role="OY2wv">
+                  <node concept="MLZmj" id="T_6DrmCWmR" role="PvTIR">
+                    <node concept="3clFbS" id="T_6DrmCWmS" role="2VODD2">
+                      <node concept="3clFbF" id="T_6DrmCWmT" role="3cqZAp">
+                        <node concept="2ShNRf" id="T_6DrmCWmU" role="3clFbG">
+                          <node concept="Tc6Ow" id="T_6DrmCWmV" role="2ShVmc">
+                            <node concept="17QB3L" id="T_6DrmCWmW" role="HW$YZ" />
+                            <node concept="Xl_RD" id="T_6DrmCWmX" role="HW$Y0">
+                              <property role="Xl_RC" value="true" />
+                            </node>
+                            <node concept="Xl_RD" id="T_6DrmCWmY" role="HW$Y0">
+                              <property role="Xl_RC" value="false" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1oHujT" id="T_6DrmCWmZ" role="OY2wv">
+                  <property role="1oHujS" value="query" />
+                  <node concept="1oIgkG" id="T_6DrmCWn0" role="1oHujR">
+                    <node concept="3clFbS" id="T_6DrmCWn1" role="2VODD2">
+                      <node concept="3clFbF" id="T_6DrmCWn2" role="3cqZAp">
+                        <node concept="2OqwBi" id="T_6DrmCWn3" role="3clFbG">
+                          <node concept="2OqwBi" id="T_6DrmCWn4" role="2Oq$k0">
+                            <node concept="3GMtW1" id="T_6DrmCWn5" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="T_6DrmCWn6" role="2OqNvi">
+                              <ref role="3Tt5mk" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+                            </node>
+                          </node>
+                          <node concept="2DeJnY" id="T_6DrmCWn7" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3F1sOY" id="T_6DrmCWn8" role="1QoVPY">
+              <ref role="1NtTu8" to="bbp5:T_6DrmCTj$" resolve="disableModelCheckingCondition" />
+            </node>
+          </node>
+          <node concept="VPM3Z" id="T_6DrmCWn9" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="T_6DrmCWna" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="2iRfu4" id="T_6DrmCWnb" role="2iSdaV" />
+        </node>
         <node concept="3F0ifn" id="rlw0PZTp9l" role="3EZMnx" />
         <node concept="3F0ifn" id="hF4w_Se" role="3EZMnx">
           <property role="3F0ifm" value="list element:" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/structure.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/structure.mps
index 308a4bde7..79023bc7e 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/structure.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/structure.mps
@@ -120,6 +120,11 @@
       <property role="IQ2nx" value="6240706158490734113" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
+    <node concept="1TJgyi" id="T_6DrmCUS2" role="1TKVEl">
+      <property role="IQ2nx" value="1037264524327235074" />
+      <property role="TrG5h" value="disableModelChecking" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyj" id="5oklODae9g3" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="query" />
@@ -199,6 +204,12 @@
       <property role="IQ2ns" value="6240706158490734121" />
       <ref role="20lvS9" to="tpc2:gCpkWun" resolve="QueryFunction_NodeCondition" />
     </node>
+    <node concept="1TJgyj" id="T_6DrmCTj$" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="disableModelCheckingCondition" />
+      <property role="IQ2ns" value="1037264524327228644" />
+      <ref role="20lvS9" to="tpc2:gCpkWun" resolve="QueryFunction_NodeCondition" />
+    </node>
     <node concept="1TJgyj" id="h4APPx9" role="1TKVEi">
       <property role="20kJfa" value="elementActionMap" />
       <property role="IQ2ns" value="1173177718857" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps
index a649f4375..b1f527b5e 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps
@@ -12,6 +12,7 @@
     <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -58,14 +59,17 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
@@ -77,12 +81,12 @@
       </concept>
     </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
+        <child id="1207055552304" name="warningText" index="a7wSD" />
+      </concept>
       <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
         <child id="1185788644032" name="normalType" index="mwGJk" />
       </concept>
-      <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
-        <child id="1175517851849" name="errorString" index="2MkJ7o" />
-      </concept>
       <concept id="1216383170661" name="jetbrains.mps.lang.typesystem.structure.TypesystemQuickFix" flags="ng" index="Q5z_Y">
         <child id="1216383424566" name="executeBlock" index="Q6x$H" />
         <child id="1216383476350" name="quickFixArgument" index="Q6Id_" />
@@ -105,7 +109,6 @@
         <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
       </concept>
       <concept id="1210784285454" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntention" flags="ng" index="3Cnw8n">
-        <property id="1216127910019" name="applyImmediately" index="ARO6o" />
         <reference id="1216388525179" name="quickFix" index="QpYPw" />
         <child id="1210784493590" name="actualArgument" index="3Coj4f" />
       </concept>
@@ -135,15 +138,15 @@
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -183,12 +186,15 @@
         <node concept="3clFbS" id="3jHPIDnhgHV" role="3clFbx">
           <node concept="3clFbF" id="3jHPIDnhgYN" role="3cqZAp">
             <node concept="37vLTI" id="3jHPIDnhh3g" role="3clFbG">
-              <node concept="3TUQnm" id="3jHPIDnhh64" role="37vLTx">
-                <ref role="3TV0OU" to="tpck:gw2VY9q" resolve="BaseConcept" />
-              </node>
               <node concept="37vLTw" id="3jHPIDnhgYM" role="37vLTJ">
                 <ref role="3cqZAo" node="C$q8A2yNtq" resolve="actual" />
               </node>
+              <node concept="2OqwBi" id="6TSlAOGL4Uo" role="37vLTx">
+                <node concept="35c_gC" id="6TSlAOGL4rj" role="2Oq$k0">
+                  <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                </node>
+                <node concept="FGMqu" id="6TSlAOGL5pv" role="2OqNvi" />
+              </node>
             </node>
           </node>
         </node>
@@ -201,76 +207,55 @@
       </node>
       <node concept="3clFbJ" id="C$q8A2yMfL" role="3cqZAp">
         <node concept="3clFbS" id="C$q8A2yMfM" role="3clFbx">
-          <node concept="2MkqsV" id="C$q8A2yOMm" role="3cqZAp">
-            <node concept="3cpWs3" id="C$q8A2ySNf" role="2MkJ7o">
-              <node concept="2OqwBi" id="C$q8A2yT6B" role="3uHU7w">
-                <node concept="37vLTw" id="C$q8A2ySUI" role="2Oq$k0">
+          <node concept="a7r0C" id="6TSlAOGL4fb" role="3cqZAp">
+            <node concept="3cpWs3" id="6TSlAOGL4fd" role="a7wSD">
+              <node concept="2OqwBi" id="6TSlAOGL4fe" role="3uHU7w">
+                <node concept="37vLTw" id="6TSlAOGL4ff" role="2Oq$k0">
                   <ref role="3cqZAo" node="C$q8A2yNtq" resolve="actual" />
                 </node>
-                <node concept="2qgKlT" id="C$q8A2yTqy" role="2OqNvi">
+                <node concept="2qgKlT" id="6TSlAOGL4fg" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                 </node>
               </node>
-              <node concept="3cpWs3" id="C$q8A2ySyS" role="3uHU7B">
-                <node concept="3cpWs3" id="C$q8A2yOWD" role="3uHU7B">
-                  <node concept="Xl_RD" id="C$q8A2yOMF" role="3uHU7B">
-                    <property role="Xl_RC" value="expecting elements of type " />
-                  </node>
-                  <node concept="2OqwBi" id="C$q8A2yS4Y" role="3uHU7w">
-                    <node concept="2OqwBi" id="C$q8A2yRkz" role="2Oq$k0">
-                      <node concept="1YBJjd" id="C$q8A2yRfI" role="2Oq$k0">
-                        <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
-                      </node>
-                      <node concept="3TrEf2" id="C$q8A2yRIR" role="2OqNvi">
-                        <ref role="3Tt5mk" to="bbp5:C$q8A2yeI6" resolve="elementsConcept" />
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="C$q8A2ySk1" role="2OqNvi">
-                      <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="C$q8A2ySyV" role="3uHU7w">
-                  <property role="Xl_RC" value="but found " />
-                </node>
+              <node concept="Xl_RD" id="6TSlAOGL4fj" role="3uHU7B">
+                <property role="Xl_RC" value="the element's concept should be a subconcept of " />
               </node>
             </node>
-            <node concept="2OqwBi" id="C$q8A2yTAE" role="1urrMF">
-              <node concept="1YBJjd" id="C$q8A2yTtL" role="2Oq$k0">
-                <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
-              </node>
-              <node concept="3TrEf2" id="C$q8A2yTWG" role="2OqNvi">
-                <ref role="3Tt5mk" to="bbp5:5oklODae9g3" resolve="query" />
-              </node>
+            <node concept="1YBJjd" id="6TSlAOGL4fr" role="1urrMF">
+              <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
             </node>
-            <node concept="3Cnw8n" id="C$q8A2C0em" role="1urrFz">
-              <property role="ARO6o" value="true" />
+            <node concept="3Cnw8n" id="6TSlAOGL4ft" role="1urrFz">
               <ref role="QpYPw" node="C$q8A2C0nH" resolve="fixChildsConcept" />
-              <node concept="3CnSsL" id="C$q8A2C2vg" role="3Coj4f">
+              <node concept="3CnSsL" id="6TSlAOGL4fu" role="3Coj4f">
                 <ref role="QkamJ" node="C$q8A2C1LB" resolve="querylist" />
-                <node concept="1YBJjd" id="C$q8A2C2vC" role="3CoRuB">
+                <node concept="1YBJjd" id="6TSlAOGL4fv" role="3CoRuB">
                   <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
                 </node>
               </node>
-              <node concept="3CnSsL" id="C$q8A2C2vV" role="3Coj4f">
+              <node concept="3CnSsL" id="6TSlAOGL4fw" role="3Coj4f">
                 <ref role="QkamJ" node="C$q8A2C1Sh" resolve="concept" />
-                <node concept="37vLTw" id="C$q8A2C2yH" role="3CoRuB">
+                <node concept="37vLTw" id="6TSlAOGL4fx" role="3CoRuB">
                   <ref role="3cqZAo" node="C$q8A2yNtq" resolve="actual" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3y3z36" id="C$q8A2yNp0" role="3clFbw">
-          <node concept="37vLTw" id="C$q8A2yOKF" role="3uHU7w">
-            <ref role="3cqZAo" node="C$q8A2yNtq" resolve="actual" />
-          </node>
-          <node concept="2OqwBi" id="C$q8A2yMll" role="3uHU7B">
-            <node concept="1YBJjd" id="C$q8A2yMgc" role="2Oq$k0">
-              <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
+        <node concept="3fqX7Q" id="6TSlAOGNeRF" role="3clFbw">
+          <node concept="2OqwBi" id="6TSlAOGNeRH" role="3fr31v">
+            <node concept="37vLTw" id="6TSlAOGNeRI" role="2Oq$k0">
+              <ref role="3cqZAo" node="C$q8A2yNtq" resolve="actual" />
             </node>
-            <node concept="3TrEf2" id="C$q8A2yN6W" role="2OqNvi">
-              <ref role="3Tt5mk" to="bbp5:C$q8A2yeI6" resolve="elementsConcept" />
+            <node concept="2qgKlT" id="6TSlAOGNeRJ" role="2OqNvi">
+              <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
+              <node concept="2OqwBi" id="6TSlAOGNeRK" role="37wK5m">
+                <node concept="1YBJjd" id="6TSlAOGNeRL" role="2Oq$k0">
+                  <ref role="1YBMHb" node="C$q8A2yAjT" resolve="node" />
+                </node>
+                <node concept="3TrEf2" id="6TSlAOGNeRM" role="2OqNvi">
+                  <ref role="3Tt5mk" to="bbp5:C$q8A2yeI6" resolve="elementsConcept" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -327,7 +312,7 @@
               </node>
             </node>
             <node concept="Xl_RD" id="C$q8A2CyMl" role="3uHU7B">
-              <property role="Xl_RC" value="Set childs concept to " />
+              <property role="Xl_RC" value="Set Child Concept to " />
             </node>
           </node>
         </node>
diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
index 737e23c53..543e80479 100644
--- a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
+++ b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps
index 41bf8ac14..0e8256fe2 100644
--- a/code/richtext/languages/richtext/languageModels/editor.mps
+++ b/code/richtext/languages/richtext/languageModels/editor.mps
@@ -6401,6 +6401,238 @@
       </node>
       <node concept="3Tm1VV" id="7_3mISi1qdD" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="5$0zg9fAYuP" role="jymVt" />
+    <node concept="2YIFZL" id="5$0zg9fB9KO" role="jymVt">
+      <property role="TrG5h" value="duplicateCurrentLine" />
+      <node concept="3clFbS" id="5$0zg9fB9KR" role="3clF47">
+        <node concept="3cpWs8" id="24Qe2DSwcBP" role="3cqZAp">
+          <node concept="3cpWsn" id="24Qe2DSwcBS" role="3cpWs9">
+            <property role="TrG5h" value="selected" />
+            <node concept="3uibUv" id="24Qe2DSwcBT" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell_Label" resolve="EditorCell_Label" />
+            </node>
+            <node concept="2YIFZM" id="24Qe2DSwcBU" role="33vP2m">
+              <ref role="1Pybhc" node="2af7$rtxPFl" resolve="TextCellModifier" />
+              <ref role="37wK5l" node="7c02HRXkXZK" resolve="getSelectedLabel" />
+              <node concept="37vLTw" id="24Qe2DSwcBV" role="37wK5m">
+                <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="24Qe2DSwLvO" role="3cqZAp">
+          <node concept="2OqwBi" id="24Qe2DSwLvQ" role="3clFbG">
+            <node concept="2OqwBi" id="24Qe2DSwLvR" role="2Oq$k0">
+              <node concept="2OqwBi" id="24Qe2DSwLvS" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSwLvT" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSwLvU" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSwLvV" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="24Qe2DSwLvW" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="24Qe2DSwLvX" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="24Qe2DSwLvY" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSwLM6" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.HOME" resolve="HOME" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="24Qe2DSwPHu" role="3cqZAp">
+          <node concept="2OqwBi" id="24Qe2DSwPHv" role="3clFbG">
+            <node concept="2OqwBi" id="24Qe2DSwPHw" role="2Oq$k0">
+              <node concept="2OqwBi" id="24Qe2DSwPHx" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSwPHy" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSwPHz" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSwPH$" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="24Qe2DSwPH_" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="24Qe2DSwPHA" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="24Qe2DSwPHB" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSwQ18" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.SELECT_END" resolve="SELECT_END" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="635SBilAVR5" role="3cqZAp">
+          <node concept="2OqwBi" id="635SBilAVR6" role="3clFbG">
+            <node concept="2OqwBi" id="635SBilAVR7" role="2Oq$k0">
+              <node concept="2OqwBi" id="635SBilAVR8" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSww2T" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSwvTa" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSwwdi" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="635SBilAVRc" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="635SBilAVRd" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="635SBilAVRe" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSwwn7" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.COPY" resolve="COPY" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="24Qe2DSxlTL" role="3cqZAp">
+          <node concept="2OqwBi" id="24Qe2DSxlTM" role="3clFbG">
+            <node concept="2OqwBi" id="24Qe2DSxlTN" role="2Oq$k0">
+              <node concept="2OqwBi" id="24Qe2DSxlTO" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSxlTP" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSxlTQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSxlTR" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="24Qe2DSxlTS" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="24Qe2DSxlTT" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="24Qe2DSxlTU" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSxmjy" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.RIGHT" resolve="RIGHT" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3746LTsraRD" role="3cqZAp">
+          <node concept="2OqwBi" id="3746LTsraRF" role="3clFbG">
+            <node concept="2OqwBi" id="3746LTsraRG" role="2Oq$k0">
+              <node concept="2OqwBi" id="3746LTsraRH" role="2Oq$k0">
+                <node concept="2OqwBi" id="3746LTsraRI" role="2Oq$k0">
+                  <node concept="37vLTw" id="3746LTsraRJ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="3746LTsraRK" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="3746LTsraRL" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="3746LTsraRM" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3746LTsraRN" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="3746LTsrbh_" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.END" resolve="END" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="24Qe2DSwZVV" role="3cqZAp">
+          <node concept="2OqwBi" id="24Qe2DSwZVW" role="3clFbG">
+            <node concept="2OqwBi" id="24Qe2DSwZVX" role="2Oq$k0">
+              <node concept="2OqwBi" id="24Qe2DSwZVY" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSwZVZ" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSwZW0" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSwZW1" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="24Qe2DSwZW2" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="24Qe2DSwZW3" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="24Qe2DSwZW4" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSx0kg" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT" resolve="INSERT" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="24Qe2DSwwA5" role="3cqZAp">
+          <node concept="2OqwBi" id="24Qe2DSwwA6" role="3clFbG">
+            <node concept="2OqwBi" id="24Qe2DSwwA7" role="2Oq$k0">
+              <node concept="2OqwBi" id="24Qe2DSwwA8" role="2Oq$k0">
+                <node concept="2OqwBi" id="24Qe2DSwwA9" role="2Oq$k0">
+                  <node concept="37vLTw" id="24Qe2DSwwAa" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5$0zg9fBa4_" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="24Qe2DSwwAb" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="24Qe2DSwwAc" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="24Qe2DSwwAd" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+            <node concept="liA8E" id="24Qe2DSwwAe" role="2OqNvi">
+              <ref role="37wK5l" to="lwvz:~Selection.executeAction(jetbrains.mps.openapi.editor.cells.CellActionType)" resolve="executeAction" />
+              <node concept="Rm8GO" id="24Qe2DSwwVA" role="37wK5m">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.PASTE" resolve="PASTE" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5$0zg9fB9sC" role="1B3o_S" />
+      <node concept="3cqZAl" id="5$0zg9fB9xP" role="3clF45" />
+      <node concept="37vLTG" id="5$0zg9fBa4_" role="3clF46">
+        <property role="TrG5h" value="context" />
+        <node concept="3uibUv" id="5$0zg9fBa4$" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5$0zg9fB999" role="jymVt" />
     <node concept="2YIFZL" id="5$0zg9fAT5a" role="jymVt">
       <property role="TrG5h" value="removeTextFromCaretToLineStart" />
@@ -6676,29 +6908,14 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="5nOdiEwcODY" role="3cqZAp">
-          <node concept="3clFbS" id="5nOdiEwcOE0" role="3clFbx">
-            <node concept="3clFbF" id="6wQWU6ASCpB" role="3cqZAp">
-              <node concept="2OqwBi" id="6wQWU6ASGvU" role="3clFbG">
-                <node concept="37vLTw" id="6wQWU6ASG7j" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7VgKn9UFGJ9" resolve="homeCell" />
-                </node>
-                <node concept="liA8E" id="6wQWU6ASLYx" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
-                  <node concept="3cmrfG" id="6wQWU6ASM8v" role="37wK5m">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="5nOdiEwcPBk" role="3clFbw">
-            <node concept="37vLTw" id="5nOdiEwcPeM" role="2Oq$k0">
+        <node concept="3clFbF" id="6wQWU6ASCpB" role="3cqZAp">
+          <node concept="2OqwBi" id="6wQWU6ASGvU" role="3clFbG">
+            <node concept="37vLTw" id="6wQWU6ASG7j" role="2Oq$k0">
               <ref role="3cqZAo" node="7VgKn9UFGJ9" resolve="homeCell" />
             </node>
-            <node concept="liA8E" id="5nOdiEwcPV$" role="2OqNvi">
-              <ref role="37wK5l" to="g51k:~EditorCell_Label.isCaretPositionAllowed(int)" resolve="isCaretPositionAllowed" />
-              <node concept="3cmrfG" id="5nOdiEwcQHY" role="37wK5m">
+            <node concept="liA8E" id="6wQWU6ASLYx" role="2OqNvi">
+              <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
+              <node concept="3cmrfG" id="6wQWU6ASM8v" role="37wK5m">
                 <property role="3cmrfH" value="0" />
               </node>
             </node>
@@ -7510,29 +7727,14 @@
             </node>
             <node concept="9aQIb" id="3QsLzsx0iQ1" role="9aQIa">
               <node concept="3clFbS" id="3QsLzsx0iQ2" role="9aQI4">
-                <node concept="3clFbJ" id="5nOdiEwbC29" role="3cqZAp">
-                  <node concept="3clFbS" id="5nOdiEwbC2b" role="3clFbx">
-                    <node concept="3clFbF" id="24Qe2DSxdQI" role="3cqZAp">
-                      <node concept="2OqwBi" id="24Qe2DSxeaR" role="3clFbG">
-                        <node concept="37vLTw" id="24Qe2DSxdQG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5lBiF1A_oGC" resolve="homeCell" />
-                        </node>
-                        <node concept="liA8E" id="24Qe2DSxfWq" role="2OqNvi">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
-                          <node concept="3cmrfG" id="24Qe2DSxgiO" role="37wK5m">
-                            <property role="3cmrfH" value="0" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="5nOdiEwbDJj" role="3clFbw">
-                    <node concept="37vLTw" id="5nOdiEwbCyt" role="2Oq$k0">
+                <node concept="3clFbF" id="24Qe2DSxdQI" role="3cqZAp">
+                  <node concept="2OqwBi" id="24Qe2DSxeaR" role="3clFbG">
+                    <node concept="37vLTw" id="24Qe2DSxdQG" role="2Oq$k0">
                       <ref role="3cqZAo" node="5lBiF1A_oGC" resolve="homeCell" />
                     </node>
-                    <node concept="liA8E" id="5nOdiEwbEPT" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Label.isCaretPositionAllowed(int)" resolve="isCaretPositionAllowed" />
-                      <node concept="3cmrfG" id="5nOdiEwbFL7" role="37wK5m">
+                    <node concept="liA8E" id="24Qe2DSxfWq" role="2OqNvi">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
+                      <node concept="3cmrfG" id="24Qe2DSxgiO" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
                     </node>
@@ -7762,49 +7964,25 @@
             </node>
             <node concept="9aQIb" id="3QsLzswZE9m" role="9aQIa">
               <node concept="3clFbS" id="3QsLzswZE9n" role="9aQI4">
-                <node concept="3cpWs8" id="5nOdiEwbHs5" role="3cqZAp">
-                  <node concept="3cpWsn" id="5nOdiEwbHs6" role="3cpWs9">
-                    <property role="TrG5h" value="newCaretPosition" />
-                    <node concept="10Oyi0" id="5nOdiEwb_So" role="1tU5fm" />
-                    <node concept="2OqwBi" id="5nOdiEwbHs7" role="33vP2m">
-                      <node concept="2OqwBi" id="5nOdiEwbHs8" role="2Oq$k0">
-                        <node concept="37vLTw" id="5nOdiEwbHs9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5lBiF1A_nTi" resolve="endCell" />
-                        </node>
-                        <node concept="liA8E" id="5nOdiEwbHsa" role="2OqNvi">
-                          <ref role="37wK5l" to="93vl:1laD9eY8YDo" resolve="getText" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5nOdiEwbHsb" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
-                      </node>
+                <node concept="3clFbF" id="5lBiF1A_nTp" role="3cqZAp">
+                  <node concept="2OqwBi" id="5lBiF1A_nTq" role="3clFbG">
+                    <node concept="37vLTw" id="5lBiF1A_nTr" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5lBiF1A_nTi" resolve="endCell" />
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="5nOdiEwbK8N" role="3cqZAp">
-                  <node concept="3clFbS" id="5nOdiEwbK8P" role="3clFbx">
-                    <node concept="3clFbF" id="5lBiF1A_nTp" role="3cqZAp">
-                      <node concept="2OqwBi" id="5lBiF1A_nTq" role="3clFbG">
-                        <node concept="37vLTw" id="5lBiF1A_nTr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5lBiF1A_nTi" resolve="endCell" />
-                        </node>
-                        <node concept="liA8E" id="5lBiF1A_nTs" role="2OqNvi">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
-                          <node concept="37vLTw" id="5nOdiEwbHsc" role="37wK5m">
-                            <ref role="3cqZAo" node="5nOdiEwbHs6" resolve="newCaretPosition" />
+                    <node concept="liA8E" id="5lBiF1A_nTs" role="2OqNvi">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
+                      <node concept="2OqwBi" id="5lBiF1A_nTt" role="37wK5m">
+                        <node concept="2OqwBi" id="5lBiF1A_nTu" role="2Oq$k0">
+                          <node concept="37vLTw" id="5lBiF1A_nTv" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5lBiF1A_nTi" resolve="endCell" />
+                          </node>
+                          <node concept="liA8E" id="5lBiF1A_nTw" role="2OqNvi">
+                            <ref role="37wK5l" to="93vl:1laD9eY8YDo" resolve="getText" />
                           </node>
                         </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="5nOdiEwbMp_" role="3clFbw">
-                    <node concept="37vLTw" id="5nOdiEwbLej" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5lBiF1A_nTi" resolve="endCell" />
-                    </node>
-                    <node concept="liA8E" id="5nOdiEwbNWh" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Label.isCaretPositionAllowed(int)" resolve="isCaretPositionAllowed" />
-                      <node concept="37vLTw" id="5nOdiEwbONt" role="37wK5m">
-                        <ref role="3cqZAo" node="5nOdiEwbHs6" resolve="newCaretPosition" />
+                        <node concept="liA8E" id="5lBiF1A_nTx" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                        </node>
                       </node>
                     </node>
                   </node>
diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps
index f76d2bf1d..e9187f87b 100644
--- a/code/richtext/languages/richtext/languageModels/plugin.mps
+++ b/code/richtext/languages/richtext/languageModels/plugin.mps
@@ -51,7 +51,10 @@
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
       </concept>
+      <concept id="1203082695294" name="jetbrains.mps.lang.plugin.structure.DoUpdateBlock" flags="in" index="tkhdA" />
+      <concept id="1203082903663" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_AnActionEvent" flags="nn" index="tl45R" />
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
+      <concept id="1205679047295" name="jetbrains.mps.lang.plugin.structure.ActionParameterDeclaration" flags="ig" index="2S4$dB" />
       <concept id="1205681243813" name="jetbrains.mps.lang.plugin.structure.IsApplicableBlock" flags="in" index="2ScWuX" />
       <concept id="1562714432501166198" name="jetbrains.mps.lang.plugin.structure.SimpleShortcutChange" flags="lg" index="Zd509">
         <child id="1562714432501166206" name="keystroke" index="Zd501" />
@@ -62,6 +65,7 @@
       <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
+      <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
       <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
       <concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
         <reference id="1217252646389" name="key" index="1DUlNI" />
@@ -89,6 +93,7 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
@@ -124,6 +129,9 @@
         <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="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
@@ -211,6 +219,12 @@
         <reference id="126958800891274597" name="extensionPoint" index="1lYe$Y" />
       </concept>
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
       <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
         <reference id="3751132065236767084" name="decl" index="q3mfh" />
@@ -231,6 +245,7 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -245,7 +260,12 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
   <node concept="2DaZZR" id="11MD$rT$o_e" />
@@ -1483,6 +1503,13 @@
   </node>
   <node concept="Zd50a" id="6wQWU6AR3XG">
     <property role="TrG5h" value="Default" />
+    <node concept="Zd509" id="6wQWU6AC4$d" role="Zd508">
+      <ref role="1bYAoF" node="6wQWU6ABYg9" resolve="DuplicateAction" />
+      <node concept="pLAjd" id="6wQWU6AC4$e" role="Zd501">
+        <property role="pLAjc" value="ctrl" />
+        <property role="pLAjf" value="VK_D" />
+      </node>
+    </node>
     <node concept="Zd509" id="6wQWU6AR4nx" role="Zd508">
       <ref role="1bYAoF" node="6wQWU6AQXH$" resolve="DeleteToWordStart" />
       <node concept="pLAjd" id="6wQWU6AR4ny" role="Zd501">
@@ -2104,5 +2131,252 @@
       </node>
     </node>
   </node>
+  <node concept="sE7Ow" id="6wQWU6ABYg9">
+    <property role="TrG5h" value="DuplicateAction" />
+    <property role="2uzpH1" value="Duplicate Node" />
+    <property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
+    <node concept="1DS2jV" id="3M9DpEEa3Ar" role="1NuT2Z">
+      <property role="TrG5h" value="editorComponent" />
+      <ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_COMPONENT" resolve="EDITOR_COMPONENT" />
+      <node concept="1oajcY" id="7HZe2EwZDjx" role="1oa70y" />
+    </node>
+    <node concept="2S4$dB" id="3M9DpEEa3As" role="1NuT2Z">
+      <property role="TrG5h" value="inputNodes" />
+      <node concept="3Tm1VV" id="3M9DpEEa3At" role="1B3o_S" />
+      <node concept="2I9FWS" id="3M9DpEEa3Au" role="1tU5fm" />
+      <node concept="1oajcY" id="7HZe2EwZDg4" role="1oa70y" />
+    </node>
+    <node concept="tnohg" id="6wQWU6ABYga" role="tncku">
+      <node concept="3clFbS" id="6wQWU6ABYgb" role="2VODD2">
+        <node concept="3cpWs8" id="24Qe2DS_35T" role="3cqZAp">
+          <node concept="3cpWsn" id="24Qe2DS_35U" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="24Qe2DS_35V" role="1tU5fm">
+              <ref role="3uigEE" to="gyv0:7rlNW38SRsY" resolve="RichtextHelper" />
+            </node>
+            <node concept="2ShNRf" id="24Qe2DS_3gt" role="33vP2m">
+              <node concept="1pGfFk" id="24Qe2DS_3Jk" role="2ShVmc">
+                <ref role="37wK5l" to="gyv0:7rlNW38SY5I" resolve="RichtextHelper" />
+                <node concept="2OqwBi" id="24Qe2DS_422" role="37wK5m">
+                  <node concept="2WthIp" id="24Qe2DS_3JU" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="24Qe2DS_4lr" role="2OqNvi">
+                    <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6wQWU6ACgr0" role="3cqZAp">
+          <node concept="3clFbS" id="6wQWU6ACgr2" role="3clFbx">
+            <node concept="3clFbF" id="6wQWU6ACqeT" role="3cqZAp">
+              <node concept="2YIFZM" id="5$0zg9fBgX9" role="3clFbG">
+                <ref role="1Pybhc" to="23h6:5$0zg9fAzQG" resolve="TextModificationUtil" />
+                <ref role="37wK5l" to="23h6:5$0zg9fB9KO" resolve="duplicateCurrentLine" />
+                <node concept="2OqwBi" id="6wQWU6ACryq" role="37wK5m">
+                  <node concept="2OqwBi" id="6wQWU6ACqyR" role="2Oq$k0">
+                    <node concept="2WthIp" id="6wQWU6ACqh2" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="6wQWU6ACqRz" role="2OqNvi">
+                      <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6wQWU6ACsR7" role="2OqNvi">
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="9aQIb" id="6wQWU6ACt7i" role="9aQIa">
+            <node concept="3clFbS" id="6wQWU6ACt7j" role="9aQI4">
+              <node concept="3clFbF" id="6wQWU6ACwh8" role="3cqZAp">
+                <node concept="2YIFZM" id="6wQWU6ACwMS" role="3clFbG">
+                  <ref role="37wK5l" to="7bx7:~ActionUtils.updateAndPerformAction(com.intellij.openapi.actionSystem.AnAction,com.intellij.openapi.actionSystem.AnActionEvent)" resolve="updateAndPerformAction" />
+                  <ref role="1Pybhc" to="7bx7:~ActionUtils" resolve="ActionUtils" />
+                  <node concept="2ShNRf" id="6wQWU6AD$TF" role="37wK5m">
+                    <node concept="1pGfFk" id="6wQWU6AD_R6" role="2ShVmc">
+                      <ref role="37wK5l" to="jhqu:~CopyThisDown_Action.&lt;init&gt;()" resolve="CopyThisDown_Action" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="6wQWU6ACwT$" role="37wK5m">
+                    <ref role="1Pybhc" to="7bx7:~ActionUtils" resolve="ActionUtils" />
+                    <ref role="37wK5l" to="7bx7:~ActionUtils.createEvent(java.lang.String,com.intellij.openapi.actionSystem.DataContext)" resolve="createEvent" />
+                    <node concept="10M0yZ" id="6wQWU6ADpkb" role="37wK5m">
+                      <ref role="3cqZAo" to="qkt:~ActionPlaces.UNKNOWN" resolve="UNKNOWN" />
+                      <ref role="1PxDUh" to="qkt:~ActionPlaces" resolve="ActionPlaces" />
+                    </node>
+                    <node concept="2OqwBi" id="6wQWU6ADtcP" role="37wK5m">
+                      <node concept="2YIFZM" id="6wQWU6ADt6Y" role="2Oq$k0">
+                        <ref role="1Pybhc" to="ddhc:~DataManager" resolve="DataManager" />
+                        <ref role="37wK5l" to="ddhc:~DataManager.getInstance()" resolve="getInstance" />
+                      </node>
+                      <node concept="liA8E" id="6wQWU6ADtmx" role="2OqNvi">
+                        <ref role="37wK5l" to="ddhc:~DataManager.getDataContext(java.awt.Component)" resolve="getDataContext" />
+                        <node concept="2OqwBi" id="6wQWU6ADto4" role="37wK5m">
+                          <node concept="2WthIp" id="6wQWU6ADto7" role="2Oq$k0" />
+                          <node concept="1DTwFV" id="6wQWU6ADto9" role="2OqNvi">
+                            <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="24Qe2DS_5MG" role="3clFbw">
+            <node concept="2OqwBi" id="24Qe2DS_5fw" role="2Oq$k0">
+              <node concept="37vLTw" id="24Qe2DS_4S7" role="2Oq$k0">
+                <ref role="3cqZAo" node="24Qe2DS_35U" resolve="helper" />
+              </node>
+              <node concept="liA8E" id="24Qe2DS_5wB" role="2OqNvi">
+                <ref role="37wK5l" to="gyv0:7rlNW38WGyE" resolve="getTextNode" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="24Qe2DS_6XB" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="tkhdA" id="6wQWU6AEt0m" role="tmbBb">
+      <node concept="3clFbS" id="6wQWU6AEt0n" role="2VODD2">
+        <node concept="3cpWs8" id="6wQWU6ADG2i" role="3cqZAp">
+          <node concept="3cpWsn" id="6wQWU6ADG2j" role="3cpWs9">
+            <property role="TrG5h" value="presentation" />
+            <node concept="3uibUv" id="6wQWU6ADG2k" role="1tU5fm">
+              <ref role="3uigEE" to="qkt:~Presentation" resolve="Presentation" />
+            </node>
+            <node concept="2OqwBi" id="6wQWU6AEvPC" role="33vP2m">
+              <node concept="tl45R" id="6wQWU6AEvDo" role="2Oq$k0" />
+              <node concept="liA8E" id="6wQWU6AEw7N" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~AnActionEvent.getPresentation()" resolve="getPresentation" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6wQWU6AEwnt" role="3cqZAp">
+          <node concept="2OqwBi" id="6wQWU6AEwOk" role="3clFbG">
+            <node concept="37vLTw" id="6wQWU6AEwnr" role="2Oq$k0">
+              <ref role="3cqZAo" node="6wQWU6ADG2j" resolve="presentation" />
+            </node>
+            <node concept="liA8E" id="6wQWU6AEx75" role="2OqNvi">
+              <ref role="37wK5l" to="qkt:~Presentation.setEnabled(boolean)" resolve="setEnabled" />
+              <node concept="2YIFZM" id="6wQWU6ADIbB" role="37wK5m">
+                <ref role="37wK5l" to="ekwn:G99PKEYBMf" resolve="isWriteActionEnabled" />
+                <ref role="1Pybhc" to="ekwn:6KwcZ1G4033" resolve="EditorActionUtils" />
+                <node concept="2OqwBi" id="6wQWU6ADIbC" role="37wK5m">
+                  <node concept="2WthIp" id="6wQWU6ADIbD" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="6wQWU6ADIbE" role="2OqNvi">
+                    <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="6wQWU6ADIbF" role="37wK5m">
+                  <node concept="2OqwBi" id="6wQWU6ADIbG" role="2Oq$k0">
+                    <node concept="2WthIp" id="6wQWU6ADIbH" role="2Oq$k0" />
+                    <node concept="3gHZIF" id="6wQWU6ADIbI" role="2OqNvi">
+                      <ref role="2WH_rO" node="3M9DpEEa3As" resolve="inputNodes" />
+                    </node>
+                  </node>
+                  <node concept="3$u5V9" id="6wQWU6ADIbJ" role="2OqNvi">
+                    <node concept="1bVj0M" id="6wQWU6ADIbK" role="23t8la">
+                      <node concept="3clFbS" id="6wQWU6ADIbL" role="1bW5cS">
+                        <node concept="3clFbF" id="6wQWU6ADIbM" role="3cqZAp">
+                          <node concept="10QFUN" id="6wQWU6ADIbN" role="3clFbG">
+                            <node concept="3uibUv" id="6wQWU6ADIbO" role="10QFUM">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="2OqwBi" id="6wQWU6ADIbP" role="10QFUP">
+                              <node concept="2OqwBi" id="6wQWU6ADIbQ" role="2Oq$k0">
+                                <node concept="2WthIp" id="6wQWU6ADIbR" role="2Oq$k0" />
+                                <node concept="1DTwFV" id="6wQWU6ADIbS" role="2OqNvi">
+                                  <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="6wQWU6ADIbT" role="2OqNvi">
+                                <ref role="37wK5l" to="exr9:~EditorComponent.findNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="findNodeCell" />
+                                <node concept="37vLTw" id="6wQWU6ADIbU" role="37wK5m">
+                                  <ref role="3cqZAo" node="6wQWU6ADIbV" resolve="it" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="6wQWU6ADIbV" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="6wQWU6ADIbW" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6wQWU6ADJOr" role="3cqZAp">
+          <node concept="3cpWsn" id="6wQWU6ADJOs" role="3cpWs9">
+            <property role="TrG5h" value="selectedCell" />
+            <node concept="3uibUv" id="6wQWU6ADJOt" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+            </node>
+            <node concept="2OqwBi" id="6wQWU6ADJOu" role="33vP2m">
+              <node concept="2OqwBi" id="6wQWU6ADJOv" role="2Oq$k0">
+                <node concept="2WthIp" id="6wQWU6ADJOw" role="2Oq$k0" />
+                <node concept="1DTwFV" id="6wQWU6ADJOx" role="2OqNvi">
+                  <ref role="2WH_rO" node="3M9DpEEa3Ar" resolve="editorComponent" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6wQWU6ADJOy" role="2OqNvi">
+                <ref role="37wK5l" to="exr9:~EditorComponent.getSelectedCell()" resolve="getSelectedCell" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6wQWU6ADNfT" role="3cqZAp">
+          <node concept="3clFbS" id="6wQWU6ADNfV" role="3clFbx">
+            <node concept="3clFbF" id="6wQWU6ADOeO" role="3cqZAp">
+              <node concept="2OqwBi" id="6wQWU6ADOF6" role="3clFbG">
+                <node concept="37vLTw" id="6wQWU6ADOeM" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6wQWU6ADG2j" resolve="presentation" />
+                </node>
+                <node concept="liA8E" id="6wQWU6ADP1_" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~Presentation.setText(java.lang.String)" resolve="setText" />
+                  <node concept="Xl_RD" id="6wQWU6ADPFa" role="37wK5m">
+                    <property role="Xl_RC" value="Duplicate Line" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="6wQWU6ADNPl" role="3clFbw">
+            <node concept="3uibUv" id="6wQWU6ADO2G" role="2ZW6by">
+              <ref role="3uigEE" to="93vl:5lTqPuSd937" resolve="EditorCell_Word" />
+            </node>
+            <node concept="37vLTw" id="6wQWU6ADNoL" role="2ZW6bz">
+              <ref role="3cqZAo" node="6wQWU6ADJOs" resolve="selectedCell" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="6wQWU6ADRc5" role="9aQIa">
+            <node concept="3clFbS" id="6wQWU6ADRc6" role="9aQI4">
+              <node concept="3clFbF" id="6wQWU6ADRJ7" role="3cqZAp">
+                <node concept="2OqwBi" id="6wQWU6ADSbJ" role="3clFbG">
+                  <node concept="37vLTw" id="6wQWU6ADRJ6" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6wQWU6ADG2j" resolve="presentation" />
+                  </node>
+                  <node concept="liA8E" id="6wQWU6ADSN4" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~Presentation.setText(java.lang.String)" resolve="setText" />
+                    <node concept="Xl_RD" id="6wQWU6ADSVF" role="37wK5m">
+                      <property role="Xl_RC" value="Duplicate Node" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd
index a35ace823..b6e1e289c 100644
--- a/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd
+++ b/code/richtext/solutions/de.slisson.mps.richtext.test.runtime/de.slisson.mps.richtext.test.runtime.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd
index 0721110ea..06826ea13 100644
--- a/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd
+++ b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd
@@ -6,9 +6,10 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/shadowmodels/languages/de.q60.mps.incremental/generator/template/main@generator.mps b/code/shadowmodels/languages/de.q60.mps.incremental/generator/template/main@generator.mps
index 83110925e..a20e12f85 100644
--- a/code/shadowmodels/languages/de.q60.mps.incremental/generator/template/main@generator.mps
+++ b/code/shadowmodels/languages/de.q60.mps.incremental/generator/template/main@generator.mps
@@ -238,7 +238,6 @@
         <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
       </concept>
       <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
-        <property id="7430509679011668804" name="counterVarName" index="1qytDF" />
         <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
       </concept>
       <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
@@ -1510,7 +1509,6 @@
         </node>
       </node>
       <node concept="1WS0z7" id="3rlBTn$7s$s" role="lGtFl">
-        <property role="1qytDF" value="" />
         <node concept="3JmXsc" id="3rlBTn$7s$t" role="3Jn$fo">
           <node concept="3clFbS" id="3rlBTn$7s$u" role="2VODD2">
             <node concept="3clFbF" id="3rlBTn$7s$v" role="3cqZAp">
@@ -1561,7 +1559,6 @@
           </node>
         </node>
         <node concept="1WS0z7" id="3rlBTn$7s$Q" role="lGtFl">
-          <property role="1qytDF" value="" />
           <node concept="3JmXsc" id="3rlBTn$7s$R" role="3Jn$fo">
             <node concept="3clFbS" id="3rlBTn$7s$S" role="2VODD2">
               <node concept="3clFbF" id="3rlBTn$7s$T" role="3cqZAp">
diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps
index 2cb45bd64..d89975674 100644
--- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps
+++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps
@@ -100,7 +100,7 @@
                 <ref role="24pWH3" node="1KLm$DhRLd8" resolve="ctx" />
               </node>
               <node concept="liA8E" id="1KLm$DhQ3QU" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="2OqwBi" id="1KLm$DhQ4nM" role="37wK5m">
                   <node concept="24pvgE" id="1KLm$DhQ3Rl" role="2Oq$k0" />
                   <node concept="3TrcHB" id="1KLm$DhQ4AS" role="2OqNvi">
diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps
index 5816d13dc..087b65136 100644
--- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps
+++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps
@@ -441,11 +441,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1KLm$DhSRpt" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+                  <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
                 </node>
               </node>
               <node concept="liA8E" id="1KLm$DhSSBT" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SModule.getModuleName():java.lang.String" resolve="getModuleName" />
+                <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
               </node>
             </node>
           </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.logging.runtime/models/de.q60.mps.logging.runtime.mps b/code/shadowmodels/solutions/de.q60.mps.logging.runtime/models/de.q60.mps.logging.runtime.mps
index 2c95bb1f1..29c76838a 100644
--- a/code/shadowmodels/solutions/de.q60.mps.logging.runtime/models/de.q60.mps.logging.runtime.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.logging.runtime/models/de.q60.mps.logging.runtime.mps
@@ -154,7 +154,7 @@
       </node>
       <node concept="3Tm6S6" id="7rXsP$3PvFy" role="1B3o_S" />
       <node concept="2YIFZM" id="7rXsP$3PH_B" role="33vP2m">
-        <ref role="37wK5l" to="33ny:~Collections.synchronizedList(java.util.List):java.util.List" resolve="synchronizedList" />
+        <ref role="37wK5l" to="33ny:~Collections.synchronizedList(java.util.List)" resolve="synchronizedList" />
         <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
         <node concept="2ShNRf" id="7rXsP$3QI82" role="37wK5m">
           <node concept="2Jqq0_" id="7rXsP$3QJJR" role="2ShVmc">
diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/de.q60.mps.polymorphicfunctions.runtime.mps b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/de.q60.mps.polymorphicfunctions.runtime.mps
index f42f5636b..9f28dd0a0 100644
--- a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/de.q60.mps.polymorphicfunctions.runtime.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/de.q60.mps.polymorphicfunctions.runtime.mps
@@ -5660,7 +5660,7 @@
                 <ref role="3cqZAo" node="7YhLqbpjEfD" resolve="repository" />
               </node>
               <node concept="liA8E" id="7YhLqbpjDYt" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModules():java.lang.Iterable" resolve="getModules" />
+                <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
               </node>
             </node>
           </node>
@@ -5768,7 +5768,7 @@
         <node concept="XkiVB" id="3zTK92KPlao" role="3cqZAp">
           <ref role="37wK5l" node="7YhLqbpjFao" resolve="ImplementationsFromRepository" />
           <node concept="2YIFZM" id="3zTK92KPlfT" role="37wK5m">
-            <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+            <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
             <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
           </node>
         </node>
@@ -5886,17 +5886,17 @@
                   <node concept="2OqwBi" id="1KLm$DhM1Ga" role="2Oq$k0">
                     <node concept="2YIFZM" id="1KLm$DhM1Gb" role="2Oq$k0">
                       <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
-                      <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication():com.intellij.openapi.application.Application" resolve="getApplication" />
+                      <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
                     </node>
                     <node concept="liA8E" id="1KLm$DhM1Gc" role="2OqNvi">
-                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
                       <node concept="3VsKOn" id="1KLm$DhM1Gd" role="37wK5m">
                         <ref role="3VsUkX" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1KLm$DhM1Ge" role="2OqNvi">
-                    <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager():jetbrains.mps.classloading.ClassLoaderManager" resolve="getClassLoaderManager" />
+                    <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager()" resolve="getClassLoaderManager" />
                   </node>
                 </node>
               </node>
@@ -5907,7 +5907,7 @@
                   <ref role="3cqZAo" node="1KLm$DhM1G7" resolve="classLoaderManager" />
                 </node>
                 <node concept="liA8E" id="1KLm$DhM1Gi" role="2OqNvi">
-                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.addListener(jetbrains.mps.classloading.DeployListener):void" resolve="addListener" />
+                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.addListener(jetbrains.mps.classloading.DeployListener)" resolve="addListener" />
                   <node concept="37vLTw" id="1KLm$DhM1Gj" role="37wK5m">
                     <ref role="3cqZAo" node="1KLm$DhM1Fu" resolve="deployListener" />
                   </node>
@@ -6046,7 +6046,7 @@
               </node>
               <node concept="2YIFZM" id="QurUgitd1w" role="ukAjM">
                 <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
-                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
               </node>
             </node>
           </node>
@@ -6128,18 +6128,18 @@
                 <node concept="2OqwBi" id="1KLm$DhM1Gt" role="33vP2m">
                   <node concept="2OqwBi" id="1KLm$DhM1Gu" role="2Oq$k0">
                     <node concept="2YIFZM" id="1KLm$DhM1Gv" role="2Oq$k0">
-                      <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication():com.intellij.openapi.application.Application" resolve="getApplication" />
+                      <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
                       <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
                     </node>
                     <node concept="liA8E" id="1KLm$DhM1Gw" role="2OqNvi">
-                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
                       <node concept="3VsKOn" id="1KLm$DhM1Gx" role="37wK5m">
                         <ref role="3VsUkX" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1KLm$DhM1Gy" role="2OqNvi">
-                    <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager():jetbrains.mps.classloading.ClassLoaderManager" resolve="getClassLoaderManager" />
+                    <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager()" resolve="getClassLoaderManager" />
                   </node>
                 </node>
               </node>
@@ -6150,7 +6150,7 @@
                   <ref role="3cqZAo" node="1KLm$DhM1Gr" resolve="classLoaderManager" />
                 </node>
                 <node concept="liA8E" id="1KLm$DhM1GA" role="2OqNvi">
-                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener):void" resolve="removeListener" />
+                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
                   <node concept="37vLTw" id="1KLm$DhM1GB" role="37wK5m">
                     <ref role="3cqZAo" node="1KLm$DhM1Fu" resolve="deployListener" />
                   </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/plugin.mps
index e9cffffe9..c92769c9f 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/plugin.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/plugin.mps
@@ -1035,7 +1035,7 @@
               </node>
             </node>
             <node concept="liA8E" id="7rXsP$3QQV0" role="2OqNvi">
-              <ref role="37wK5l" to="71xd:~BaseTool.openTool(boolean):void" resolve="openTool" />
+              <ref role="37wK5l" to="71xd:~BaseTool.openTool(boolean)" resolve="openTool" />
               <node concept="3clFbT" id="7rXsP$3QQV1" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/plugin.mps
index 4333aacd4..3b67c8b6f 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/plugin.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/plugin.mps
@@ -376,14 +376,14 @@
             <node concept="2OqwBi" id="m_yL2N4AVY" role="2Oq$k0">
               <node concept="1KvdUw" id="m_yL2N4Atw" role="2Oq$k0" />
               <node concept="liA8E" id="m_yL2N4Cdc" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
                 <node concept="3VsKOn" id="m_yL2N4AlX" role="37wK5m">
                   <ref role="3VsUkX" to="wvnl:~EditorExtensionRegistry" resolve="EditorExtensionRegistry" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="m_yL2N4Cto" role="2OqNvi">
-              <ref role="37wK5l" to="wvnl:~EditorExtensionRegistry.registerExtension(jetbrains.mps.openapi.editor.extensions.EditorExtension):void" resolve="registerExtension" />
+              <ref role="37wK5l" to="wvnl:~EditorExtensionRegistry.registerExtension(jetbrains.mps.openapi.editor.extensions.EditorExtension)" resolve="registerExtension" />
               <node concept="2OqwBi" id="m_yL2N4Cva" role="37wK5m">
                 <node concept="2WthIp" id="m_yL2N4Cvd" role="2Oq$k0" />
                 <node concept="2BZ7hE" id="m_yL2N4Cvf" role="2OqNvi">
@@ -402,14 +402,14 @@
             <node concept="2OqwBi" id="m_yL2N4CA1" role="2Oq$k0">
               <node concept="1KvdUw" id="m_yL2N4CA2" role="2Oq$k0" />
               <node concept="liA8E" id="m_yL2N4CA3" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                <ref role="37wK5l" to="z1c3:~MPSProject.getComponent(java.lang.Class)" resolve="getComponent" />
                 <node concept="3VsKOn" id="m_yL2N4CA4" role="37wK5m">
                   <ref role="3VsUkX" to="wvnl:~EditorExtensionRegistry" resolve="EditorExtensionRegistry" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="m_yL2N4CA5" role="2OqNvi">
-              <ref role="37wK5l" to="wvnl:~EditorExtensionRegistry.unregisterExtension(jetbrains.mps.openapi.editor.extensions.EditorExtension):void" resolve="unregisterExtension" />
+              <ref role="37wK5l" to="wvnl:~EditorExtensionRegistry.unregisterExtension(jetbrains.mps.openapi.editor.extensions.EditorExtension)" resolve="unregisterExtension" />
               <node concept="2OqwBi" id="m_yL2N4CA6" role="37wK5m">
                 <node concept="2WthIp" id="m_yL2N4CA7" role="2Oq$k0" />
                 <node concept="2BZ7hE" id="m_yL2N4CA8" role="2OqNvi">
@@ -566,7 +566,7 @@
                   <ref role="3cqZAo" node="m_yL2MNuGp" resolve="g_" />
                 </node>
                 <node concept="liA8E" id="m_yL2N1edB" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.create():java.awt.Graphics" resolve="create" />
+                  <ref role="37wK5l" to="z60i:~Graphics.create()" resolve="create" />
                 </node>
               </node>
               <node concept="3uibUv" id="m_yL2N1ed$" role="10QFUM">
@@ -959,7 +959,7 @@
                   <ref role="3cqZAo" node="m_yL2MNuGB" resolve="g_" />
                 </node>
                 <node concept="liA8E" id="2$PstQMmyfa" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.create():java.awt.Graphics" resolve="create" />
+                  <ref role="37wK5l" to="z60i:~Graphics.create()" resolve="create" />
                 </node>
               </node>
               <node concept="3uibUv" id="2$PstQMmyfb" role="10QFUM">
@@ -1158,11 +1158,11 @@
                   <ref role="3cqZAo" node="m_yL2MYGnE" resolve="editorComponent" />
                 </node>
                 <node concept="liA8E" id="1KLm$Di2trk" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext():jetbrains.mps.nodeEditor.EditorContext" resolve="getEditorContext" />
+                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
                 </node>
               </node>
               <node concept="liA8E" id="1KLm$Di2uWA" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorContext.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
               </node>
             </node>
             <node concept="37vLTw" id="1KLm$Di2p3N" role="37vLTJ">
@@ -1971,7 +1971,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="1zncNMQP1CO" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+                                <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
                               </node>
                             </node>
                           </node>
@@ -1985,7 +1985,7 @@
                           <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
                         </node>
                         <node concept="liA8E" id="m_yL2Ne6Tt" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                           <node concept="3cpWs3" id="m_yL2Nehht" role="37wK5m">
                             <node concept="2OqwBi" id="m_yL2Nepdv" role="3uHU7w">
                               <node concept="2JrnkZ" id="m_yL2Nensx" role="2Oq$k0">
@@ -1994,7 +1994,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="m_yL2NeqK2" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                               </node>
                             </node>
                             <node concept="Xl_RD" id="m_yL2Ne8tj" role="3uHU7B">
@@ -2008,7 +2008,7 @@
                       <node concept="3clFbS" id="m_yL2N5wRX" role="3clFbx">
                         <node concept="3cpWs6" id="m_yL2N5xyx" role="3cqZAp">
                           <node concept="2YIFZM" id="m_yL2N5$mm" role="3cqZAk">
-                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                             <node concept="37vLTw" id="m_yL2N5_QX" role="37wK5m">
                               <ref role="3cqZAo" node="m_yL2N5w26" resolve="compileTimeConstantValue" />
@@ -2044,7 +2044,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1zncNMQTZna" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
               </node>
             </node>
           </node>
@@ -2176,7 +2176,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2$PstQMoXld" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
               </node>
             </node>
           </node>
@@ -2224,7 +2224,7 @@
                 <node concept="3clFbF" id="m_yL2NbK0U" role="3cqZAp">
                   <node concept="37vLTI" id="m_yL2NbKLL" role="3clFbG">
                     <node concept="2YIFZM" id="m_yL2NbL0G" role="37vLTx">
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
                       <node concept="37vLTw" id="m_yL2NbL6B" role="37wK5m">
                         <ref role="3cqZAo" node="m_yL2NbIf$" resolve="max" />
@@ -2290,7 +2290,7 @@
             <ref role="3VsUkX" node="m_yL2MNvpd" resolve="InterpreterEditorExtension" />
           </node>
           <node concept="liA8E" id="m_yL2MNOp5" role="2OqNvi">
-            <ref role="37wK5l" to="wyt6:~Class.getName():java.lang.String" resolve="getName" />
+            <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
           </node>
         </node>
       </node>
@@ -2335,7 +2335,7 @@
               </node>
             </node>
             <node concept="liA8E" id="m_yL2MNxVi" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.putClientProperty(java.lang.Object,java.lang.Object):void" resolve="putClientProperty" />
+              <ref role="37wK5l" to="dxuu:~JComponent.putClientProperty(java.lang.Object,java.lang.Object)" resolve="putClientProperty" />
               <node concept="37vLTw" id="m_yL2MNQcM" role="37wK5m">
                 <ref role="3cqZAo" node="m_yL2MNy3u" resolve="PAINTER_KEY" />
               </node>
@@ -2358,7 +2358,7 @@
               </node>
             </node>
             <node concept="liA8E" id="m_yL2N4JGV" role="2OqNvi">
-              <ref role="37wK5l" to="exr9:~EditorComponent.addAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter):void" resolve="addAdditionalPainter" />
+              <ref role="37wK5l" to="exr9:~EditorComponent.addAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="addAdditionalPainter" />
               <node concept="37vLTw" id="m_yL2N4JZL" role="37wK5m">
                 <ref role="3cqZAo" node="m_yL2MNR9y" resolve="painter" />
               </node>
@@ -2427,7 +2427,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="m_yL2MNYJx" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JComponent.getClientProperty(java.lang.Object):java.lang.Object" resolve="getClientProperty" />
+                  <ref role="37wK5l" to="dxuu:~JComponent.getClientProperty(java.lang.Object)" resolve="getClientProperty" />
                   <node concept="37vLTw" id="m_yL2MNYJy" role="37wK5m">
                     <ref role="3cqZAo" node="m_yL2MNy3u" resolve="PAINTER_KEY" />
                   </node>
@@ -2454,7 +2454,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="m_yL2MO2Fw" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.removeAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter):void" resolve="removeAdditionalPainter" />
+                  <ref role="37wK5l" to="exr9:~EditorComponent.removeAdditionalPainter(jetbrains.mps.nodeEditor.AdditionalPainter)" resolve="removeAdditionalPainter" />
                   <node concept="37vLTw" id="m_yL2MO2Tp" role="37wK5m">
                     <ref role="3cqZAo" node="m_yL2MNT6H" resolve="painter" />
                   </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/virtualinterfaces.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/virtualinterfaces.mps
index ea361f6b7..6f773d5d0 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/virtualinterfaces.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/models/virtualinterfaces.mps
@@ -314,7 +314,7 @@
                   <node concept="24pvgE" id="1KLm$DhWpAI" role="2JrQYb" />
                 </node>
                 <node concept="liA8E" id="1KLm$DhWpAJ" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                 </node>
               </node>
             </node>
@@ -422,7 +422,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="1KLm$Di3Ijk" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
                   </node>
@@ -481,7 +481,7 @@
               <node concept="17QB3L" id="1KLm$Di5C_5" role="1tU5fm" />
               <node concept="2YIFZM" id="1KLm$Di5ClV" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                <ref role="37wK5l" to="wyt6:~Integer.toString(int):java.lang.String" resolve="toString" />
+                <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
                 <node concept="2OqwBi" id="1KLm$Di5ClW" role="37wK5m">
                   <node concept="24pvgE" id="1KLm$Di5ClX" role="2Oq$k0" />
                   <node concept="3TrcHB" id="1KLm$Di5ClY" role="2OqNvi">
@@ -619,7 +619,7 @@
         <node concept="3clFbS" id="2$PstQMmgLE" role="24nq6t">
           <node concept="3cpWs6" id="2$PstQMmgLF" role="3cqZAp">
             <node concept="2YIFZM" id="2$PstQMmkQ6" role="3cqZAk">
-              <ref role="37wK5l" to="wyt6:~Boolean.toString(boolean):java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Boolean.toString(boolean)" resolve="toString" />
               <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
               <node concept="2OqwBi" id="2$PstQMmgLG" role="37wK5m">
                 <node concept="24pvgE" id="2$PstQMmgLH" role="2Oq$k0" />
@@ -963,7 +963,7 @@
             <node concept="10P55v" id="1KLm$DhWL$r" role="1tU5fm" />
             <node concept="3cpWs3" id="1KLm$DhWIt6" role="33vP2m">
               <node concept="2YIFZM" id="1KLm$DhWLa8" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhWIt7" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhWIt8" role="2Oq$k0">
@@ -975,7 +975,7 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="1KLm$DhWKrC" role="3uHU7B">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhWIta" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhWItb" role="2Oq$k0">
@@ -1037,7 +1037,7 @@
             <node concept="10P55v" id="1KLm$DhWNx1" role="1tU5fm" />
             <node concept="3cpWs3" id="1KLm$DhWNx2" role="33vP2m">
               <node concept="2YIFZM" id="1KLm$DhWNx3" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhWNx4" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhWNx5" role="2Oq$k0">
@@ -1107,7 +1107,7 @@
             <node concept="10P55v" id="1KLm$DhWPuo" role="1tU5fm" />
             <node concept="3cpWs3" id="1KLm$DhWU65" role="33vP2m">
               <node concept="2YIFZM" id="1KLm$DhWPuq" role="3uHU7B">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhWPur" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhWPus" role="2Oq$k0">
@@ -1178,7 +1178,7 @@
             <node concept="10P55v" id="1KLm$DhXoIu" role="1tU5fm" />
             <node concept="3cpWs3" id="1KLm$DhXoIv" role="33vP2m">
               <node concept="2YIFZM" id="1KLm$DhXoIw" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhXoIx" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhXoIy" role="2Oq$k0">
@@ -1190,7 +1190,7 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="1KLm$DhXoI$" role="3uHU7B">
-                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                 <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                 <node concept="2OqwBi" id="1KLm$DhXoI_" role="37wK5m">
                   <node concept="3kvyP4" id="1KLm$DhXoIA" role="2Oq$k0">
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/concurrentrepo.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/concurrentrepo.mps
index c09294091..468940018 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/concurrentrepo.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/concurrentrepo.mps
@@ -6492,7 +6492,7 @@
                 <node concept="3clFbF" id="763TrXRCrPy" role="3cqZAp">
                   <node concept="37vLTI" id="763TrXRCsRg" role="3clFbG">
                     <node concept="2YIFZM" id="763TrXRCtDf" role="37vLTx">
-                      <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                      <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                       <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                     </node>
                     <node concept="37vLTw" id="763TrXRCrPw" role="37vLTJ">
@@ -6763,7 +6763,7 @@
           <node concept="2OqwBi" id="7pvOHdLq_sM" role="3clFbG">
             <node concept="Xjq3P" id="D$OtjtXdXd" role="2Oq$k0" />
             <node concept="liA8E" id="7pvOHdLqBEO" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Thread.start():void" resolve="start" />
+              <ref role="37wK5l" to="wyt6:~Thread.start()" resolve="start" />
             </node>
           </node>
         </node>
@@ -7128,7 +7128,7 @@
             <node concept="3cpWsd" id="763TrXRDIL4" role="3uHU7B">
               <node concept="2YIFZM" id="763TrXRDIL5" role="3uHU7B">
                 <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
               </node>
               <node concept="37vLTw" id="763TrXRDIL6" role="3uHU7w">
                 <ref role="3cqZAo" node="763TrXRCmG5" resolve="lastClassChange" />
@@ -7166,7 +7166,7 @@
             </node>
             <node concept="3cpWsd" id="763TrXRDGx0" role="3uHU7B">
               <node concept="2YIFZM" id="763TrXRDGx1" role="3uHU7B">
-                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                 <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               </node>
               <node concept="37vLTw" id="763TrXRDGx2" role="3uHU7w">
@@ -7267,7 +7267,7 @@
             <node concept="3cpWsd" id="763TrXRDL2E" role="3uHU7B">
               <node concept="2YIFZM" id="763TrXRDL2F" role="3uHU7B">
                 <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
               </node>
               <node concept="37vLTw" id="763TrXRDL2G" role="3uHU7w">
                 <ref role="3cqZAo" node="763TrXRCmG5" resolve="lastClassChange" />
@@ -7372,7 +7372,7 @@
             </node>
             <node concept="3cpWsd" id="763TrXRDQh5" role="3uHU7B">
               <node concept="2YIFZM" id="763TrXRDQh6" role="3uHU7B">
-                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                 <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               </node>
               <node concept="37vLTw" id="763TrXRDQh7" role="3uHU7w">
@@ -7389,7 +7389,7 @@
                 <property role="TrG5h" value="transformStart" />
                 <node concept="3cpWsb" id="QurUgik3Sy" role="1tU5fm" />
                 <node concept="2YIFZM" id="5G4qAEn9EvD" role="33vP2m">
-                  <ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
+                  <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
                   <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                 </node>
               </node>
@@ -7453,7 +7453,7 @@
                 <property role="TrG5h" value="transformEnd" />
                 <node concept="3cpWsb" id="D$OtjtYC$B" role="1tU5fm" />
                 <node concept="2YIFZM" id="D$OtjtYC$C" role="33vP2m">
-                  <ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
+                  <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
                   <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                 </node>
               </node>
@@ -8042,11 +8042,11 @@
                     <ref role="3cqZAo" node="D$OtjtYuuS" resolve="repository" />
                   </node>
                   <node concept="liA8E" id="2BYLcdbZUJl" role="2OqNvi">
-                    <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                    <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2BYLcdbZVJ2" role="2OqNvi">
-                  <ref role="37wK5l" to="lui2:~ModelAccess.canRead():boolean" resolve="canRead" />
+                  <ref role="37wK5l" to="lui2:~ModelAccess.canRead()" resolve="canRead" />
                 </node>
               </node>
             </node>
@@ -8163,10 +8163,10 @@
             <node concept="10QFUN" id="D$OtjtVFb6" role="33vP2m">
               <node concept="2OqwBi" id="D$OtjtVFb7" role="10QFUP">
                 <node concept="1rXfSq" id="D$OtjtVHS9" role="2Oq$k0">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
                 <node concept="liA8E" id="D$OtjtVFb9" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Class.getClassLoader():java.lang.ClassLoader" resolve="getClassLoader" />
+                  <ref role="37wK5l" to="wyt6:~Class.getClassLoader()" resolve="getClassLoader" />
                 </node>
               </node>
               <node concept="3uibUv" id="D$OtjtVFba" role="10QFUM">
@@ -8181,7 +8181,7 @@
               <ref role="3cqZAo" node="D$OtjtVFb4" resolve="cl" />
             </node>
             <node concept="liA8E" id="D$OtjtVFbe" role="2OqNvi">
-              <ref role="37wK5l" to="3qmy:~ModuleClassLoader.isDisposed():boolean" resolve="isDisposed" />
+              <ref role="37wK5l" to="3qmy:~ModuleClassLoader.isDisposed()" resolve="isDisposed" />
             </node>
           </node>
         </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps
index 6decb6668..0bb7aa081 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps
@@ -7905,7 +7905,7 @@
                         <ref role="3VsUkX" to="qvpu:~ContextArea" resolve="ContextArea" />
                       </node>
                       <node concept="liA8E" id="1KLm$Di9lkO" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
                       </node>
                     </node>
                     <node concept="Xl_RD" id="1KLm$Di9hCb" role="3uHU7w">
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps
index 27bf0c28c..4f72b7901 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps
@@ -644,7 +644,7 @@
               <node concept="1pGfFk" id="1lswC14_o9L" role="2ShVmc">
                 <ref role="37wK5l" to="dglc:QurUgi6nZ4" resolve="RepositoryMirror" />
                 <node concept="2YIFZM" id="1lswC14_o9M" role="37wK5m">
-                  <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+                  <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
                   <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
                 </node>
               </node>
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps
index 8973f3ddd..01b923597 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps
@@ -18277,7 +18277,7 @@
                         <ref role="3VsUkX" to="qvpu:~ContextArea" resolve="ContextArea" />
                       </node>
                       <node concept="liA8E" id="1KLm$Di8jjD" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
                       </node>
                     </node>
                   </node>
diff --git a/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd b/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd
index 78f61d799..a4003bfd3 100644
--- a/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd
+++ b/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd
@@ -9,6 +9,7 @@
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/statistics/de.itemis.mps.statistics.mpl b/code/statistics/de.itemis.mps.statistics.mpl
index 8244f1d93..e97474cfe 100644
--- a/code/statistics/de.itemis.mps.statistics.mpl
+++ b/code/statistics/de.itemis.mps.statistics.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/code/statistics/models/de.itemis.mps.statistics.plugin.mps b/code/statistics/models/de.itemis.mps.statistics.plugin.mps
index e4a78337f..c066f8f29 100644
--- a/code/statistics/models/de.itemis.mps.statistics.plugin.mps
+++ b/code/statistics/models/de.itemis.mps.statistics.plugin.mps
@@ -15,11 +15,11 @@
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" implicit="true" />
     <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action(MPS.Platform/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
   <registry>
@@ -85,6 +85,7 @@
       <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="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -105,6 +106,7 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -151,6 +153,7 @@
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
+      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -252,20 +255,40 @@
                 </node>
               </node>
               <node concept="3clFbS" id="5WCc3M3CG_r" role="2LFqv$">
+                <node concept="3cpWs8" id="3NchqG$0m8a" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NchqG$0m8b" role="3cpWs9">
+                    <property role="TrG5h" value="target" />
+                    <node concept="3uibUv" id="3NchqG$0luQ" role="1tU5fm">
+                      <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                    </node>
+                    <node concept="2OqwBi" id="3NchqG$0m8c" role="33vP2m">
+                      <node concept="2GrUjf" id="3NchqG$0m8d" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="5WCc3M3CG_p" resolve="dep" />
+                      </node>
+                      <node concept="liA8E" id="3NchqG$0m8e" role="2OqNvi">
+                        <ref role="37wK5l" to="lui2:~SDependency.getTarget()" resolve="getTarget" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="3NchqG$0mQS" role="3cqZAp">
+                  <node concept="3clFbS" id="3NchqG$0mQU" role="3clFbx">
+                    <node concept="3N13vt" id="3NchqG$0nV3" role="3cqZAp" />
+                  </node>
+                  <node concept="3clFbC" id="3NchqG$0npH" role="3clFbw">
+                    <node concept="10Nm6u" id="3NchqG$0nv4" role="3uHU7w" />
+                    <node concept="37vLTw" id="3NchqG$0ngP" role="3uHU7B">
+                      <ref role="3cqZAo" node="3NchqG$0m8b" resolve="target" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3cpWs8" id="5WCc3M3CJiT" role="3cqZAp">
                   <node concept="3cpWsn" id="5WCc3M3CJiU" role="3cpWs9">
                     <property role="TrG5h" value="dependencyStr" />
-                    <node concept="3uibUv" id="5WCc3M3CJ1Y" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                    </node>
+                    <node concept="17QB3L" id="3NchqG$0p0W" role="1tU5fm" />
                     <node concept="2OqwBi" id="5WCc3M3CJiV" role="33vP2m">
-                      <node concept="2OqwBi" id="5WCc3M3CJiW" role="2Oq$k0">
-                        <node concept="2GrUjf" id="5WCc3M3CJiX" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="5WCc3M3CG_p" resolve="dep" />
-                        </node>
-                        <node concept="liA8E" id="5WCc3M3CJiY" role="2OqNvi">
-                          <ref role="37wK5l" to="lui2:~SDependency.getTarget()" resolve="getTarget" />
-                        </node>
+                      <node concept="37vLTw" id="3NchqG$0m8f" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3NchqG$0m8b" resolve="target" />
                       </node>
                       <node concept="liA8E" id="4bHoaiHuruR" role="2OqNvi">
                         <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
diff --git a/code/statistics/models/de.itemis.mps.statistics.structure.mps b/code/statistics/models/de.itemis.mps.statistics.structure.mps
index aa04c5d74..effe37737 100644
--- a/code/statistics/models/de.itemis.mps.statistics.structure.mps
+++ b/code/statistics/models/de.itemis.mps.statistics.structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
index 4683eb527..d916fc109 100644
--- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
+++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
@@ -6,10 +6,9 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="ext" classes="provided" ext="no">
       <classes generated="true" />
     </facet>
-    <facet pluginId="com.intellij" type="ideaPlugin" />
   </facets>
   <stubModelEntries>
     <stubModelEntry path="${platform_lib}/app.jar" />
diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
index 3c04071bd..ce23a897c 100644
--- a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
+++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/models/de.itemis.mps.editor.enumeration.runtime.mps b/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/models/de.itemis.mps.editor.enumeration.runtime.mps
index 5dd48feff..67deefaba 100644
--- a/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/models/de.itemis.mps.editor.enumeration.runtime.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/models/de.itemis.mps.editor.enumeration.runtime.mps
@@ -202,6 +202,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
+      <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
@@ -3210,6 +3211,25 @@
         </node>
       </node>
       <node concept="3clFbS" id="4g2H4r3Ws9o" role="3clF47">
+        <node concept="3clFbF" id="6zwr99Mojd_" role="3cqZAp">
+          <node concept="3vZ8r8" id="6zwr99MojXL" role="3clFbG">
+            <node concept="3clFbC" id="6zwr99MomH6" role="37vLTx">
+              <node concept="10Nm6u" id="6zwr99Monf8" role="3uHU7w" />
+              <node concept="2OqwBi" id="6zwr99Mom4e" role="3uHU7B">
+                <node concept="1rXfSq" id="6zwr99MolmY" role="2Oq$k0">
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode()" resolve="getSNode" />
+                </node>
+                <node concept="liA8E" id="6zwr99Momq3" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6zwr99Mojdz" role="37vLTJ">
+              <ref role="3cqZAo" to="emqf:~CellProviderWithRole.myReadOnly" resolve="myReadOnly" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6zwr99Mqi_n" role="3cqZAp" />
         <node concept="3cpWs8" id="4g2H4r3Ws9q" role="3cqZAp">
           <node concept="3cpWsn" id="4g2H4r3Ws9p" role="3cpWs9">
             <property role="3TUv4t" value="false" />
diff --git a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
index f2c41084f..3fb3d2471 100644
--- a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
+++ b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
@@ -209,6 +209,7 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
+      <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
@@ -1466,6 +1467,25 @@
         </node>
       </node>
       <node concept="3clFbS" id="4g2H4r3Ws9o" role="3clF47">
+        <node concept="3clFbF" id="6zwr99MqhLl" role="3cqZAp">
+          <node concept="3vZ8r8" id="6zwr99MqhLm" role="3clFbG">
+            <node concept="3clFbC" id="6zwr99MqhLn" role="37vLTx">
+              <node concept="10Nm6u" id="6zwr99MqhLo" role="3uHU7w" />
+              <node concept="2OqwBi" id="6zwr99MqhLp" role="3uHU7B">
+                <node concept="1rXfSq" id="6zwr99MqhLq" role="2Oq$k0">
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode()" resolve="getSNode" />
+                </node>
+                <node concept="liA8E" id="6zwr99MqhLr" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6zwr99MqhLs" role="37vLTJ">
+              <ref role="3cqZAo" to="emqf:~CellProviderWithRole.myReadOnly" resolve="myReadOnly" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6zwr99MqhBm" role="3cqZAp" />
         <node concept="3cpWs8" id="4g2H4r3Ws9q" role="3cqZAp">
           <node concept="3cpWsn" id="4g2H4r3Ws9p" role="3cpWs9">
             <property role="3TUv4t" value="false" />
@@ -3539,6 +3559,25 @@
         </node>
       </node>
       <node concept="3clFbS" id="6bmIkNC7z3y" role="3clF47">
+        <node concept="3clFbF" id="6zwr99Mojd_" role="3cqZAp">
+          <node concept="3vZ8r8" id="6zwr99MojXL" role="3clFbG">
+            <node concept="3clFbC" id="6zwr99MomH6" role="37vLTx">
+              <node concept="10Nm6u" id="6zwr99Monf8" role="3uHU7w" />
+              <node concept="2OqwBi" id="6zwr99Mom4e" role="3uHU7B">
+                <node concept="1rXfSq" id="6zwr99MolmY" role="2Oq$k0">
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode()" resolve="getSNode" />
+                </node>
+                <node concept="liA8E" id="6zwr99Momq3" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6zwr99Mojdz" role="37vLTJ">
+              <ref role="3cqZAo" to="emqf:~CellProviderWithRole.myReadOnly" resolve="myReadOnly" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6zwr99MqfLh" role="3cqZAp" />
         <node concept="3cpWs8" id="6bmIkNC7z3$" role="3cqZAp">
           <node concept="3cpWsn" id="6bmIkNC7z3z" role="3cpWs9">
             <property role="3TUv4t" value="false" />
diff --git a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
index 40fe83fec..096f24c94 100644
--- a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
+++ b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
@@ -510,7 +510,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4LkNbu$3TqU" role="2OqNvi">
-                  <ref role="37wK5l" to="f4zo:~EditorCell_Collection.getCellsCount():int" resolve="getCellsCount" />
+                  <ref role="37wK5l" to="f4zo:~EditorCell_Collection.getCellsCount()" resolve="getCellsCount" />
                 </node>
               </node>
             </node>
diff --git a/docs/extensions/editor/querylist.md b/docs/extensions/editor/querylist.md
index 7653769d4..6647ad599 100644
--- a/docs/extensions/editor/querylist.md
+++ b/docs/extensions/editor/querylist.md
@@ -13,6 +13,10 @@ The querylist cell allows displaying arbitrary nodes in the editor.
 - **insert new**: a function that's called when the insert action is invoked.
 - **delete element**: a function that's called when the delete/backspace action is invoked
 - **substitute info**: a custom completion menu entry
+- **uses braces**: use braces around the collection
+- **uses folding**: use folding provided by the collection cell
+- **collapse by default**: a function that decided if the cell should be collapsed by default
+- **disable model checking**: don't show model check errors
 
 The editor is set to readonly by default. The language supports nodes that can be edited but be aware that you might
 run into issues when the same node is shown multiple times in the same editor.