diff --git a/.github/workflows/mps-compatibility.yaml b/.github/workflows/mps-compatibility.yaml
index 9a22a6bb..731aa3ed 100644
--- a/.github/workflows/mps-compatibility.yaml
+++ b/.github/workflows/mps-compatibility.yaml
@@ -32,7 +32,13 @@ jobs:
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew :projectional-editor-ssr-mps:build -PciBuild=true -Pgpr.token=${{ secrets.GITHUB_TOKEN }} -Pmps.version.major=${{ matrix.version }}
+        run: >-
+          ./gradlew
+          :projectional-editor-ssr-mps:build
+          :projectional-editor-ssr-mps-languages:build
+          -PciBuild=true
+          -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
+          -Pmps.version.major=${{ matrix.version }}
       - name: Archive test report
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0bd03c9a..bbc970c4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,8 +6,7 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
+#      - id: end-of-file-fixer # disabled, because it modifies MPS XML files
       - id: check-toml
       - id: check-yaml
       - id: check-added-large-files
@@ -15,7 +14,7 @@ repos:
       - id: check-symlinks
       - id: fix-byte-order-marker
       - id: mixed-line-ending
-      - id: trailing-whitespace
+#      - id: trailing-whitespace # disabled, because it modifies multiline string literals to invalid values
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
     rev: v9.4.0
     hooks:
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 876c922b..80bf5350 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
     `kotlin-dsl`
 }
 
+dependencies {
+    implementation(kotlin("stdlib"))
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt b/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
index 9610fbaf..b31286df 100644
--- a/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
+++ b/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
@@ -27,7 +27,7 @@ val Project.mpsMajorVersion: String get() {
     if (project != rootProject) return rootProject.mpsVersion
     return project.findProperty("mps.version.major")?.toString()?.takeIf { it.isNotEmpty() }
         ?: project.findProperty("mps.version")?.toString()?.takeIf { it.isNotEmpty() }?.replace(Regex("""(20\d\d\.\d+).*"""), "$1")
-        ?: "2023.3"
+        ?: "2023.2"
 }
 
 val Project.mpsVersion: String get() {
@@ -61,6 +61,14 @@ val Project.mpsHomeDir: Provider<Directory> get() {
     return project.layout.buildDirectory.dir("mps-$mpsVersion")
 }
 
+val Project.mpsPluginsDir: File? get() {
+    val candidates = listOfNotNull(
+        project.findProperty("mps$mpsPlatformVersion.plugins.dir")?.toString()?.let { file(it) },
+        System.getProperty("user.home")?.let { file(it).resolve("/Library/Application Support/JetBrains/MPS2023.2/plugins/") },
+    )
+    return candidates.firstOrNull { it.isDirectory }
+}
+
 fun Project.copyMps(): File {
     if (project != rootProject) return rootProject.copyMps()
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a4ed8f7..7946e82f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,8 +6,8 @@ npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.2" }
 modelix-mps-buildtools = { id = "org.modelix.mps.build-tools", version.ref = "modelixBuildtools" }
 
 [versions]
-modelixCore = "7.2.0-pr707.7a5dda1"
-modelixBuildtools="1.4.1"
+modelixCore = "7.3.0"
+modelixBuildtools="1.4.2-kotlin.support"
 
 [libraries]
 modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" }
@@ -21,3 +21,4 @@ modelix-model-datastructure = { group = "org.modelix", name = "model-datastructu
 modelix-mps-model-adapters = { group = "org.modelix.mps", name = "model-adapters", version.ref = "modelixCore" }
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.9" }
 kotlin-html = "org.jetbrains.kotlinx:kotlinx-html:0.11.0"
+modelix-build-tools-lib = { group = "org.modelix.mps", name = "build-tools-lib", version.ref = "modelixBuildtools" }
diff --git a/kernelf-angular-demo/build.gradle.kts b/kernelf-angular-demo/build.gradle.kts
index 8c8f8c01..62325219 100644
--- a/kernelf-angular-demo/build.gradle.kts
+++ b/kernelf-angular-demo/build.gradle.kts
@@ -32,12 +32,12 @@ val updateTsModelApiVersion = tasks.create("updateTsModelApiVersion") {
         var text = packageJsonFile.readText()
         println("ts-model-api path: $localPath")
         val replacement = if (localPath.exists()) {
-            """"@modelix/ts-model-api": "file:${localPath.relativeTo(projectDir)}""""
+            """"@modelix/ts-model-api": "file:${localPath.relativeTo(projectDir).toString().replace("\\", "\\\\")}""""
         } else {
             """"@modelix/ts-model-api": "${rootProject.property("ts-model-api.version")}""""
         }
         println("ts-model-api version: $replacement")
-        text = text.replace(Regex(""""@modelix/ts-model-api": ".*""""), replacement)
+        text = text.replace(Regex(""""@modelix/ts-model-api": ".*""""), { replacement })
         packageJsonFile.writeText(text)
     }
 }
diff --git a/mps/.mps/modules.xml b/mps/.mps/modules.xml
index 09474367..882ff03c 100644
--- a/mps/.mps/modules.xml
+++ b/mps/.mps/modules.xml
@@ -2,13 +2,12 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/devkits/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit" folder="" />
-      <modulePath path="$PROJECT_DIR$/languages/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/org.modelix.mps.notation.runtime/org.modelix.mps.notation.runtime.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit" folder="" />
+      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/stubs-template/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd" folder="" />
     </projectModules>
   </component>
 </project>
diff --git a/mps/build.gradle.kts b/mps/build.gradle.kts
index 2de564de..64dedc2c 100644
--- a/mps/build.gradle.kts
+++ b/mps/build.gradle.kts
@@ -8,15 +8,20 @@ plugins {
 }
 
 mpsBuild {
+    dependsOn(":projectional-editor-ssr-mps:buildPlugin")
     mpsHome = mpsHomeDir.get().asFile.absolutePath
     javaHome = Jvm.current().javaHome
 
-    search(".")
+    search("../projectional-editor-ssr-mps/build/idea-sandbox/plugins/projectional-editor-ssr-mps")
+    search("modules")
     publication("editor-languages") {
         module("org.modelix.mps.webaspect.devkit")
+        module("org.modelix.mps.webaspect.genplan")
+        module("org.modelix.mps.baseLanguage2kotlin")
+        module("org.modelix.mps.notation")
     }
-    publication("already-packaged-modules") {
-        module("org.modelix.mps.editor.ssr.stubs")
+    publication("baseLanguage-notation") {
+        module("org.modelix.mps.notation.impl.baseLanguage")
     }
 }
 
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
diff --git a/mps/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl b/mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
similarity index 100%
rename from mps/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
rename to mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
diff --git a/mps/solutions/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps b/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
similarity index 99%
rename from mps/solutions/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
rename to mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
index 2c83def9..362bf057 100644
--- a/mps/solutions/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
+++ b/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
@@ -34,6 +34,7 @@
       <concept id="737165568293720756" name="org.modelix.mps.notation.structure.IndentCell" flags="ng" index="2OWiap" />
       <concept id="737165568293545234" name="org.modelix.mps.notation.structure.ChildrenCollectionCell" flags="ng" index="2OWXkZ">
         <reference id="737165568293545559" name="link" index="2OWXpU" />
+        <reference id="737165568293545885" name="subconceptToInsert" index="2OWXuK" />
         <child id="737165568293546266" name="layout" index="2OWX$R" />
         <child id="7525355686451955469" name="separatorCell" index="1r02wH" />
       </concept>
@@ -121,6 +122,7 @@
           <node concept="2OWiap" id="CUW2QYNjjz" role="2OY0$2" />
           <node concept="2OWXkZ" id="CUW2QYMNqb" role="2OY0$2">
             <ref role="2OWXpU" to="tpee:4EqhHTp4Mw3" resolve="member" />
+            <ref role="2OWXuK" to="tpee:1hodSy9TH5A" resolve="PlaceholderMember" />
             <node concept="2OYvdK" id="CUW2QYNjnP" role="2OWX$R" />
           </node>
         </node>
@@ -238,6 +240,7 @@
       <ref role="3JBHV4" to="tpee:fzclF80" resolve="StatementList" />
       <node concept="2OWXkZ" id="42C8o9nAVwl" role="3JBHQ1">
         <ref role="2OWXpU" to="tpee:fzcqZ_x" resolve="statement" />
+        <ref role="2OWXuK" to="tpee:fzclF8l" resolve="Statement" />
         <node concept="2OYvdK" id="42C8o9nAVwo" role="2OWX$R" />
       </node>
     </node>
@@ -1437,7 +1440,10 @@
       <ref role="3JBHV4" to="tpee:h_B$H5g" resolve="AbstractOperation" />
       <node concept="3JB3jO" id="4JzlXapjSpU" role="3JBHQ1" />
     </node>
-    <node concept="3JBHHy" id="4dQjfTHY9SY" role="3JBHiB" />
+    <node concept="3JBH_3" id="m1OUzpj50M" role="3JBHiB">
+      <ref role="3JBHV4" to="tpee:1hodSy9TH5A" resolve="PlaceholderMember" />
+      <node concept="3JB3jO" id="m1OUzpj59Z" role="3JBHQ1" />
+    </node>
   </node>
   <node concept="3JBFZQ" id="22f9nDgKep2">
     <property role="TrG5h" value="jetbrains.mps.lang.smodel" />
diff --git a/mps/solutions/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd b/mps/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd
similarity index 100%
rename from mps/solutions/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd
rename to mps/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd
diff --git a/mps/languages/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps b/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
similarity index 88%
rename from mps/languages/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
rename to mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
index de539a75..1232833f 100644
--- a/mps/languages/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
+++ b/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
@@ -35,8 +35,8 @@
     <import index="wsib" ref="r:d1d5cd51-6710-43f8-bd5b-f958da6e1ca2(org.modelix.mps.notation.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="1xrd" ref="b50d89c0-0fb9-4105-b652-222148c26a9b/kotlin:kotlin.collections(jetbrains.mps.kotlin.stdlib/)" implicit="true" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -76,6 +76,9 @@
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="ln" index="5jKBG">
+        <child id="1510949579266801461" name="sourceNodeQuery" index="5jGum" />
+      </concept>
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
@@ -90,6 +93,10 @@
         <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
       <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4" />
+      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+      </concept>
       <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
         <reference id="1167087469901" name="templateNode" index="2VPoh2" />
       </concept>
@@ -99,6 +106,10 @@
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
+      <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
+        <reference id="1168285871518" name="applicableConcept" index="3gUMe" />
+        <child id="1092060348987" name="contentNode" index="13RCb5" />
+      </concept>
       <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
@@ -636,7 +647,45 @@
                   </node>
                 </node>
               </node>
-              <node concept="AQkLs" id="6xJrM0NrZ8e" role="THmaL" />
+              <node concept="1NbEFs" id="m1OUzpjPHc" role="THmaL">
+                <ref role="AarEw" to="dbfy:~ChildCellTemplateBuilder.newLineConcept(org/modelix/model/api/IConcept)" resolve="newLineConcept" />
+                <node concept="1XD0eI" id="m1OUzpjPHd" role="TWiod">
+                  <node concept="1XD0k2" id="1pzCNySbu8_" role="1XD0ZN">
+                    <node concept="5jKBG" id="1pzCNySbu8A" role="lGtFl">
+                      <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
+                      <node concept="3NFfHV" id="1pzCNySbu8B" role="5jGum">
+                        <node concept="3clFbS" id="1pzCNySbu8C" role="2VODD2">
+                          <node concept="3clFbF" id="1pzCNySbu8D" role="3cqZAp">
+                            <node concept="2OqwBi" id="1pzCNySbu8E" role="3clFbG">
+                              <node concept="30H73N" id="1pzCNySbu8F" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="1pzCNySbu8G" role="2OqNvi">
+                                <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="m1OUzpjPHh" role="lGtFl">
+                  <node concept="3IZrLx" id="m1OUzpjPHi" role="3IZSJc">
+                    <node concept="3clFbS" id="m1OUzpjPHj" role="2VODD2">
+                      <node concept="3clFbF" id="m1OUzpjPHk" role="3cqZAp">
+                        <node concept="2OqwBi" id="m1OUzpjPHl" role="3clFbG">
+                          <node concept="2OqwBi" id="m1OUzpjPHm" role="2Oq$k0">
+                            <node concept="30H73N" id="m1OUzpjPHn" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="m1OUzpjPHo" role="2OqNvi">
+                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" />
+                            </node>
+                          </node>
+                          <node concept="3x8VRR" id="m1OUzpjTgx" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
           <node concept="1NbEFs" id="CUW2QYOQW8" role="21Pmik">
@@ -722,7 +771,49 @@
       <node concept="gft3U" id="CUW2QYP18L" role="1lVwrX">
         <node concept="1XD0a7" id="CUW2QYP18M" role="gfFT$">
           <node concept="1NbEtQ" id="CUW2QYP18N" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.vertical(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="vertical" />
+            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.vertical(kotlin/Function1&lt;ChildCellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="vertical" />
+            <node concept="1XD0f0" id="1pzCNySd5q8" role="1XD06E">
+              <node concept="1NbEFs" id="1pzCNySbFDm" role="THmaL">
+                <ref role="AarEw" to="dbfy:~ChildCellTemplateBuilder.newLineConcept(org/modelix/model/api/IConcept)" resolve="newLineConcept" />
+                <node concept="1XD0eI" id="1pzCNySbFDn" role="TWiod">
+                  <node concept="1XD0k2" id="1pzCNySbFDo" role="1XD0ZN">
+                    <node concept="5jKBG" id="1pzCNySbFDp" role="lGtFl">
+                      <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
+                      <node concept="3NFfHV" id="1pzCNySbFDq" role="5jGum">
+                        <node concept="3clFbS" id="1pzCNySbFDr" role="2VODD2">
+                          <node concept="3clFbF" id="1pzCNySbFDs" role="3cqZAp">
+                            <node concept="2OqwBi" id="1pzCNySbFDt" role="3clFbG">
+                              <node concept="30H73N" id="1pzCNySbFDu" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="1pzCNySbFDv" role="2OqNvi">
+                                <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="1pzCNySbFDw" role="lGtFl">
+                  <node concept="3IZrLx" id="1pzCNySbFDx" role="3IZSJc">
+                    <node concept="3clFbS" id="1pzCNySbFDy" role="2VODD2">
+                      <node concept="3clFbF" id="1pzCNySbFDz" role="3cqZAp">
+                        <node concept="2OqwBi" id="1pzCNySbFD$" role="3clFbG">
+                          <node concept="2OqwBi" id="1pzCNySbFD_" role="2Oq$k0">
+                            <node concept="30H73N" id="1pzCNySbFDA" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="1pzCNySbFDB" role="2OqNvi">
+                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                            </node>
+                          </node>
+                          <node concept="3x8VRR" id="1pzCNySbFDC" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="AQkLs" id="1pzCNySd5K3" role="THmaL" />
+            </node>
           </node>
           <node concept="1NbEFs" id="CUW2QYP18O" role="21Pmik">
             <ref role="AarEw" to="1g18:~MPSChildLink.new(org/jetbrains/mps/openapi/language/SContainmentLink)" resolve="MPSChildLink" />
@@ -1253,94 +1344,20 @@
           <node concept="1NbEtQ" id="1ixZ$UHlTBU" role="1XD07G">
             <ref role="AarEw" to="dbfy:~EditorAspect.conceptEditor(org/modelix/model/api/IConcept,kotlin/Function1&lt;NotationRootCellTemplateBuilder&lt;org/modelix/model/api/INode,org/modelix/model/api/IConcept&gt;,kotlin/Unit&gt;)" resolve="conceptEditor" />
             <node concept="1XD0eI" id="1ixZ$UHlX_H" role="TWiod">
-              <node concept="1NbEFs" id="1ixZ$UHlXAB" role="1XD0ZN">
-                <ref role="AarEw" to="1g18:~MPSConcept.new(org/jetbrains/mps/openapi/language/SAbstractConcept)" resolve="MPSConcept" />
-                <node concept="1XD0eI" id="1ixZ$UHlXAC" role="TWiod">
-                  <node concept="1XD0a7" id="1ixZ$UHlXAD" role="1XD0ZN">
-                    <node concept="2yQVVM" id="1ixZ$UHlXAE" role="1XD07G">
-                      <ref role="2yQV70" to="2k9e:~MetaAdapterFactory.getConcept(jetbrains.mps.smodel.adapter.ids.SConceptId,java.lang.String)" resolve="getConcept" />
-                      <node concept="1XD0eI" id="1ixZ$UHlXAF" role="TWiod">
-                        <node concept="1XD0a7" id="1ixZ$UHlXAG" role="1XD0ZN">
-                          <node concept="2yQVVM" id="1ixZ$UHlXAH" role="1XD07G">
-                            <ref role="2yQV70" to="e8bb:~SConceptId.deserialize(java.lang.String)" resolve="deserialize" />
-                            <node concept="1XD0eI" id="1ixZ$UHlXAI" role="TWiod">
-                              <node concept="1XD08G" id="1ixZ$UHlXAJ" role="1XD0ZN">
-                                <node concept="Df6$J" id="1ixZ$UHlXAK" role="Df6Hu">
-                                  <node concept="21VMdE" id="1ixZ$UHlXAL" role="Df7GE">
-                                    <property role="21VMdD" value="serializedConceptId" />
-                                    <node concept="17Uvod" id="1ixZ$UHlXAM" role="lGtFl">
-                                      <property role="2qtEX9" value="content" />
-                                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                                      <node concept="3zFVjK" id="1ixZ$UHlXAN" role="3zH0cK">
-                                        <node concept="3clFbS" id="1ixZ$UHlXAO" role="2VODD2">
-                                          <node concept="3clFbF" id="1ixZ$UHlXAP" role="3cqZAp">
-                                            <node concept="2OqwBi" id="1ixZ$UHlXAQ" role="3clFbG">
-                                              <node concept="2YIFZM" id="1ixZ$UHlXAR" role="2Oq$k0">
-                                                <ref role="37wK5l" to="e8bb:~MetaIdByDeclaration.getConceptId(org.jetbrains.mps.openapi.model.SNode)" resolve="getConceptId" />
-                                                <ref role="1Pybhc" to="e8bb:~MetaIdByDeclaration" resolve="MetaIdByDeclaration" />
-                                                <node concept="2OqwBi" id="1ixZ$UHlXAS" role="37wK5m">
-                                                  <node concept="30H73N" id="1ixZ$UHlXAT" role="2Oq$k0" />
-                                                  <node concept="3TrEf2" id="1ixZ$UHlXAU" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="f8gn:7dm8yUsMfNE" resolve="concept" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="1ixZ$UHlXAV" role="2OqNvi">
-                                                <ref role="37wK5l" to="e8bb:~SConceptId.serialize()" resolve="serialize" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="1XD0em" id="1ixZ$UHlXAW" role="21Pmik">
-                            <node concept="2EYIWN" id="1ixZ$UHlXAX" role="1XD0Sn">
-                              <ref role="2EYIUZ" to="e8bb:~SConceptId" resolve="SConceptId" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1XD0eI" id="1ixZ$UHlXAY" role="TWiod">
-                        <node concept="1XD08G" id="1ixZ$UHlXAZ" role="1XD0ZN">
-                          <node concept="Df6$J" id="1ixZ$UHlXB0" role="Df6Hu">
-                            <node concept="21VMdE" id="1ixZ$UHlXB1" role="Df7GE">
-                              <property role="21VMdD" value="conceptName" />
-                              <node concept="17Uvod" id="1ixZ$UHlXB2" role="lGtFl">
-                                <property role="2qtEX9" value="content" />
-                                <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                                <node concept="3zFVjK" id="1ixZ$UHlXB3" role="3zH0cK">
-                                  <node concept="3clFbS" id="1ixZ$UHlXB4" role="2VODD2">
-                                    <node concept="3clFbF" id="1ixZ$UHlXB5" role="3cqZAp">
-                                      <node concept="2OqwBi" id="1ixZ$UHlXB6" role="3clFbG">
-                                        <node concept="2OqwBi" id="1ixZ$UHlXB7" role="2Oq$k0">
-                                          <node concept="30H73N" id="1ixZ$UHlXB8" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="1ixZ$UHlXB9" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="f8gn:7dm8yUsMfNE" resolve="concept" />
-                                          </node>
-                                        </node>
-                                        <node concept="2qgKlT" id="1ixZ$UHlXBa" role="2OqNvi">
-                                          <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
+              <node concept="1XD0k2" id="1pzCNySbtjH" role="1XD0ZN">
+                <node concept="5jKBG" id="1pzCNySbtpc" role="lGtFl">
+                  <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
+                  <node concept="3NFfHV" id="1pzCNySbtuv" role="5jGum">
+                    <node concept="3clFbS" id="1pzCNySbtuw" role="2VODD2">
+                      <node concept="3clFbF" id="1pzCNySbtu$" role="3cqZAp">
+                        <node concept="2OqwBi" id="1ixZ$UHlXAS" role="3clFbG">
+                          <node concept="30H73N" id="1ixZ$UHlXAT" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="1ixZ$UHlXAU" role="2OqNvi">
+                            <ref role="3Tt5mk" to="f8gn:7dm8yUsMfNE" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="1XD0em" id="1ixZ$UHlXBb" role="21Pmik">
-                      <node concept="2EYIWN" id="1ixZ$UHlXBc" role="1XD0Sn">
-                        <ref role="2EYIUZ" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
-                      </node>
-                    </node>
                   </node>
                 </node>
               </node>
@@ -1463,4 +1480,90 @@
     <node concept="eKYAL" id="63DBII8pVZx" role="1XD0Tu" />
     <node concept="n94m4" id="63DBII8pVW5" role="lGtFl" />
   </node>
+  <node concept="13MO4I" id="1pzCNySbqH2">
+    <property role="TrG5h" value="template_SConcept_as_IConcept" />
+    <ref role="3gUMe" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+    <node concept="1NbEFs" id="1pzCNySbqH4" role="13RCb5">
+      <ref role="AarEw" to="1g18:~MPSConcept.new(org/jetbrains/mps/openapi/language/SAbstractConcept)" resolve="MPSConcept" />
+      <node concept="1XD0eI" id="1pzCNySbqH5" role="TWiod">
+        <node concept="1XD0a7" id="1pzCNySbqH6" role="1XD0ZN">
+          <node concept="2yQVVM" id="1pzCNySbqH7" role="1XD07G">
+            <ref role="2yQV70" to="2k9e:~MetaAdapterFactory.getConcept(jetbrains.mps.smodel.adapter.ids.SConceptId,java.lang.String)" resolve="getConcept" />
+            <node concept="1XD0eI" id="1pzCNySbqH8" role="TWiod">
+              <node concept="1XD0a7" id="1pzCNySbqH9" role="1XD0ZN">
+                <node concept="2yQVVM" id="1pzCNySbqHa" role="1XD07G">
+                  <ref role="2yQV70" to="e8bb:~SConceptId.deserialize(java.lang.String)" resolve="deserialize" />
+                  <node concept="1XD0eI" id="1pzCNySbqHb" role="TWiod">
+                    <node concept="1XD08G" id="1pzCNySbqHc" role="1XD0ZN">
+                      <node concept="Df6$J" id="1pzCNySbqHd" role="Df6Hu">
+                        <node concept="21VMdE" id="1pzCNySbqHe" role="Df7GE">
+                          <property role="21VMdD" value="serializedConceptId" />
+                          <node concept="17Uvod" id="1pzCNySbqHf" role="lGtFl">
+                            <property role="2qtEX9" value="content" />
+                            <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
+                            <node concept="3zFVjK" id="1pzCNySbqHg" role="3zH0cK">
+                              <node concept="3clFbS" id="1pzCNySbqHh" role="2VODD2">
+                                <node concept="3clFbF" id="1pzCNySbqHi" role="3cqZAp">
+                                  <node concept="2OqwBi" id="1pzCNySbqHj" role="3clFbG">
+                                    <node concept="2YIFZM" id="1pzCNySbqHk" role="2Oq$k0">
+                                      <ref role="37wK5l" to="e8bb:~MetaIdByDeclaration.getConceptId(org.jetbrains.mps.openapi.model.SNode)" resolve="getConceptId" />
+                                      <ref role="1Pybhc" to="e8bb:~MetaIdByDeclaration" resolve="MetaIdByDeclaration" />
+                                      <node concept="30H73N" id="1pzCNySbqHm" role="37wK5m" />
+                                    </node>
+                                    <node concept="liA8E" id="1pzCNySbqHo" role="2OqNvi">
+                                      <ref role="37wK5l" to="e8bb:~SConceptId.serialize()" resolve="serialize" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1XD0em" id="1pzCNySbqHp" role="21Pmik">
+                  <node concept="2EYIWN" id="1pzCNySbqHq" role="1XD0Sn">
+                    <ref role="2EYIUZ" to="e8bb:~SConceptId" resolve="SConceptId" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1XD0eI" id="1pzCNySbqHr" role="TWiod">
+              <node concept="1XD08G" id="1pzCNySbqHs" role="1XD0ZN">
+                <node concept="Df6$J" id="1pzCNySbqHt" role="Df6Hu">
+                  <node concept="21VMdE" id="1pzCNySbqHu" role="Df7GE">
+                    <property role="21VMdD" value="conceptName" />
+                    <node concept="17Uvod" id="1pzCNySbqHv" role="lGtFl">
+                      <property role="2qtEX9" value="content" />
+                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
+                      <node concept="3zFVjK" id="1pzCNySbqHw" role="3zH0cK">
+                        <node concept="3clFbS" id="1pzCNySbqHx" role="2VODD2">
+                          <node concept="3clFbF" id="1pzCNySbqHy" role="3cqZAp">
+                            <node concept="2OqwBi" id="1pzCNySbqHz" role="3clFbG">
+                              <node concept="30H73N" id="1pzCNySbqH_" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="1pzCNySbqHB" role="2OqNvi">
+                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1XD0em" id="1pzCNySbqHC" role="21Pmik">
+            <node concept="2EYIWN" id="1pzCNySbqHD" role="1XD0Sn">
+              <ref role="2EYIUZ" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="raruj" id="1pzCNySbrAM" role="lGtFl" />
+    </node>
+  </node>
 </model>
diff --git a/mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.behavior.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.behavior.mps
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.behavior.mps
rename to mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.behavior.mps
diff --git a/mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.constraints.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.constraints.mps
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.constraints.mps
rename to mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.constraints.mps
diff --git a/mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.editor.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.editor.mps
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.editor.mps
rename to mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.editor.mps
diff --git a/mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
rename to mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
diff --git a/mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.typesystem.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.typesystem.mps
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/models/org.modelix.mps.notation.typesystem.mps
rename to mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.typesystem.mps
diff --git a/mps/languages/org.modelix.mps.notation/org.modelix.mps.notation.mpl b/mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl
similarity index 100%
rename from mps/languages/org.modelix.mps.notation/org.modelix.mps.notation.mpl
rename to mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl
diff --git a/mps/devkits/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit b/mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
similarity index 100%
rename from mps/devkits/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
rename to mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
diff --git a/mps/solutions/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps b/mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
similarity index 100%
rename from mps/solutions/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
rename to mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
diff --git a/mps/solutions/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd b/mps/modules/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd
similarity index 100%
rename from mps/solutions/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd
rename to mps/modules/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd
diff --git a/mps/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd b/mps/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd
deleted file mode 100644
index 0f197c95..00000000
--- a/mps/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.modelix.mps.editor.ssr.stubs" uuid="771cf896-ab1b-409b-93b4-48c3bbb6b23f" moduleVersion="0">
-  <models>
-    <modelRoot type="kotlin_jvm" contentPath="${module}/../../../../lib">
-      <sourceRoot location="instrumented-projectional-editor-ssr-mps-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-      <sourceRoot location="model-adapters-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <sourceRoot location="model-api-gen-runtime-jvm-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <sourceRoot location="model-api-jvm-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <sourceRoot location="projectional-editor-jvm-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet compile="off" classes="provided" ext="no" languageLevel="JAVA_10" type="java">
-      <library location="${module}/../../../../lib/trove-1.0.2.jar" />
-      <library location="${module}/../../../../lib/alpn-api-1.1.3.v20160715.jar" />
-      <library location="${module}/../../../../lib/annotations-23.0.0.jar" />
-      <library location="${module}/../../../../lib/config-1.4.2.jar" />
-      <library location="${module}/../../../../lib/incremental-jvm-0.2.0.jar" />
-      <library location="${module}/../../../../lib/instrumented-projectional-editor-ssr-mps-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/jansi-2.4.0.jar" />
-      <library location="${module}/../../../../lib/kaml-jvm-0.55.0.jar" />
-      <library location="${module}/../../../../lib/kotlin-logging-jvm-3.0.5.jar" />
-      <library location="${module}/../../../../lib/kotlin-logging-jvm-5.1.0.jar" />
-      <library location="${module}/../../../../lib/kotlin-reflect-1.8.22.jar" />
-      <library location="${module}/../../../../lib/kotlin-stdlib-1.9.20.jar" />
-      <library location="${module}/../../../../lib/kotlin-stdlib-jdk7-1.9.20.jar" />
-      <library location="${module}/../../../../lib/kotlin-stdlib-jdk8-1.9.20.jar" />
-      <library location="${module}/../../../../lib/kotlin-utils-jvm-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/kotlinx-benchmark-runtime-jvm-0.4.9.jar" />
-      <library location="${module}/../../../../lib/kotlinx-coroutines-core-jvm-1.7.3.jar" />
-      <library location="${module}/../../../../lib/kotlinx-coroutines-jdk8-1.7.3.jar" />
-      <library location="${module}/../../../../lib/kotlinx-coroutines-swing-1.7.3.jar" />
-      <library location="${module}/../../../../lib/kotlinx-html-jvm-0.10.1.jar" />
-      <library location="${module}/../../../../lib/kotlinx-serialization-core-jvm-1.6.1.jar" />
-      <library location="${module}/../../../../lib/kotlinx-serialization-json-jvm-1.6.1.jar" />
-      <library location="${module}/../../../../lib/ktor-events-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-http-cio-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-http-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-io-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-network-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-serialization-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-server-core-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-server-host-common-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-server-html-builder-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-server-netty-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-server-websockets-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-utils-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-websocket-serialization-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/ktor-websockets-jvm-2.3.6.jar" />
-      <library location="${module}/../../../../lib/logback-classic-1.4.11.jar" />
-      <library location="${module}/../../../../lib/logback-core-1.4.11.jar" />
-      <library location="${module}/../../../../lib/model-adapters-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/model-api-gen-runtime-jvm-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/model-api-jvm-3.14.2-5-ge5dfd43.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/netty-buffer-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-codec-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-codec-http-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-codec-http2-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-common-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-handler-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-resolver-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-classes-epoll-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-classes-kqueue-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-native-epoll-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-native-kqueue-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/netty-transport-native-unix-common-4.1.97.Final.jar" />
-      <library location="${module}/../../../../lib/projectional-editor-jvm-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/projectional-editor-ssr-common-jvm-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/projectional-editor-ssr-server-2.0.0-63-g332bf2a.dirty-SNAPSHOT.jar" />
-      <library location="${module}/../../../../lib/slf4j-api-2.0.7.jar" />
-      <library location="${module}/../../../../lib/snakeyaml-engine-2.6.jar" />
-    </facet>
-  </facets>
-  <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)</dependency>
-    <dependency reexport="false">d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)</dependency>
-    <dependency reexport="false">6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:2405a196-e75d-462c-938b-ae8e3fac20aa:jetbrains.mps.baseLanguage.kotlinRefs" version="0" />
-    <language slang="l:4caf0310-491e-41f5-8a9b-2006b3a94898:jetbrains.mps.execution.util" version="0" />
-    <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="11" />
-    <language slang="l:9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0:jetbrains.mps.kotlin.javaRefs" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-    <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-    <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
-    <module reference="771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)" version="0" />
-  </dependencyVersions>
-</solution>
diff --git a/mps/org.modelix.mps.notation.runtime/org.modelix.mps.notation.runtime.msd b/mps/org.modelix.mps.notation.runtime/org.modelix.mps.notation.runtime.msd
deleted file mode 100644
index 79b6144d..00000000
--- a/mps/org.modelix.mps.notation.runtime/org.modelix.mps.notation.runtime.msd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="org.modelix.mps.notation.runtime" uuid="9985d38b-4a59-4237-ad4f-5ce71e9e5b11" moduleVersion="0">
-  <models>
-    <modelRoot type="default" contentPath="${module}">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <languageVersions />
-  <dependencyVersions>
-    <module reference="9985d38b-4a59-4237-ad4f-5ce71e9e5b11(org.modelix.mps.notation.runtime)" version="0" />
-  </dependencyVersions>
-</solution>
diff --git a/mps/stubs-template/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd b/mps/stubs-template/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd
new file mode 100644
index 00000000..3f83bd49
--- /dev/null
+++ b/mps/stubs-template/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd
@@ -0,0 +1,107 @@
+<solution name="org.modelix.mps.editor.ssr.stubs" uuid="771cf896-ab1b-409b-93b4-48c3bbb6b23f" moduleVersion="0">
+    <models>
+        <modelRoot type="kotlin_jvm" contentPath="${module}/../../../../lib">
+            <sourceRoot location="projectional-editor-ssr-server-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <sourceRoot location="projectional-editor-ssr-common-jvm-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <sourceRoot location="projectional-editor-jvm-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <sourceRoot location="model-adapters-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <sourceRoot location="incremental-jvm-0.2.0.jar" />
+            <sourceRoot location="model-api-gen-runtime-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <sourceRoot location="model-api-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <sourceRoot location="kotlin-utils-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <sourceRoot location="projectional-editor-ssr-mps-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+        </modelRoot>
+    </models>
+    <facets>
+        <facet compile="off" classes="provided" ext="no" languageLevel="JAVA_10" type="java">
+            <library location="${module}/../../../../lib/projectional-editor-ssr-server-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/projectional-editor-ssr-common-jvm-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/projectional-editor-jvm-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/model-adapters-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/incremental-jvm-0.2.0.jar" />
+            <library location="${module}/../../../../lib/ktor-server-websockets-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-server-html-builder-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-server-netty-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-server-host-common-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-server-core-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-websocket-serialization-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-serialization-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-events-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-websockets-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-http-cio-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-http-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-network-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-utils-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/ktor-io-jvm-2.3.10.jar" />
+            <library location="${module}/../../../../lib/kotlinx-coroutines-jdk8-1.8.0.jar" />
+            <library location="${module}/../../../../lib/model-api-gen-runtime-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/model-api-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/kotlin-utils-jvm-0.0.1-7.3.0.dirty-SNAPSHOT.jar" />
+            <library location="${module}/../../../../lib/kotlinx-coroutines-core-jvm-1.8.0.jar" />
+            <library location="${module}/../../../../lib/kotlinx-coroutines-swing-1.8.0.jar" />
+            <library location="${module}/../../../../lib/kotlin-logging-jvm-3.0.5.jar" />
+            <library location="${module}/../../../../lib/kaml-jvm-0.59.0.jar" />
+            <library location="${module}/../../../../lib/kotlinx-serialization-core-jvm-1.6.3.jar" />
+            <library location="${module}/../../../../lib/kotlinx-serialization-json-jvm-1.6.3.jar" />
+            <library location="${module}/../../../../lib/kotlinx-benchmark-runtime-jvm-0.4.9.jar" />
+            <library location="${module}/../../../../lib/kotlinx-html-jvm-0.11.0.jar" />
+            <library location="${module}/../../../../lib/kotlin-logging-jvm-6.0.9.jar" />
+            <library location="${module}/../../../../lib/kotlin-reflect-1.8.22.jar" />
+            <library location="${module}/../../../../lib/kotlin-stdlib-jdk8-1.9.23.jar" />
+            <library location="${module}/../../../../lib/kotlin-stdlib-jdk7-1.9.23.jar" />
+            <library location="${module}/../../../../lib/snakeyaml-engine-kmp-jvm-2.7.5.jar" />
+            <library location="${module}/../../../../lib/okio-jvm-3.9.0.jar" />
+            <library location="${module}/../../../../lib/urlencoder-lib-jvm-1.5.0.jar" />
+            <library location="${module}/../../../../lib/kotlin-stdlib-1.9.23.jar" />
+            <library location="${module}/../../../../lib/logback-classic-1.5.6.jar" />
+            <library location="${module}/../../../../lib/annotations-23.0.0.jar" />
+            <library location="${module}/../../../../lib/trove-1.0.2.jar" />
+            <library location="${module}/../../../../lib/logback-core-1.5.6.jar" />
+            <library location="${module}/../../../../lib/slf4j-api-2.0.13.jar" />
+            <library location="${module}/../../../../lib/config-1.4.3.jar" />
+            <library location="${module}/../../../../lib/jansi-2.4.1.jar" />
+            <library location="${module}/../../../../lib/netty-codec-http2-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/alpn-api-1.1.3.v20160715.jar" />
+            <library location="${module}/../../../../lib/netty-transport-native-kqueue-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-transport-native-epoll-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-codec-http-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-handler-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-codec-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-transport-classes-kqueue-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-transport-classes-epoll-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-transport-native-unix-common-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-transport-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-buffer-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-resolver-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/netty-common-4.1.106.Final.jar" />
+            <library location="${module}/../../../../lib/trove4j-3.0.3.jar" />
+            <library location="${module}/../../../../lib/projectional-editor-ssr-mps-2.0.0-82-gbed72d3-SNAPSHOT.jar" />
+        </facet>
+    </facets>
+    <dependencies>
+        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+        <dependency reexport="false">b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)</dependency>
+        <dependency reexport="false">d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)</dependency>
+        <dependency reexport="false">6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)</dependency>
+        <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    </dependencies>
+    <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+        <language slang="l:2405a196-e75d-462c-938b-ae8e3fac20aa:jetbrains.mps.baseLanguage.kotlinRefs" version="0" />
+        <language slang="l:4caf0310-491e-41f5-8a9b-2006b3a94898:jetbrains.mps.execution.util" version="0" />
+        <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="11" />
+        <language slang="l:9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0:jetbrains.mps.kotlin.javaRefs" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    </languageVersions>
+    <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
+        <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
+        <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
+        <module reference="771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)" version="0" />
+    </dependencyVersions>
+</solution>
diff --git a/projectional-editor-ssr-mps-languages/build.gradle.kts b/projectional-editor-ssr-mps-languages/build.gradle.kts
new file mode 100644
index 00000000..2399ebd7
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/build.gradle.kts
@@ -0,0 +1,149 @@
+import org.modelix.mpsHomeDir
+import org.modelix.mpsPluginsDir
+
+buildscript {
+    dependencies {
+        classpath(coreLibs.semver)
+        classpath(libs.modelix.build.tools.lib)
+    }
+}
+
+plugins {
+    kotlin("jvm")
+    id("org.jetbrains.intellij") version "1.17.3"
+}
+
+kotlin {
+    jvmToolchain(11)
+}
+
+dependencies {
+    testImplementation(project(":projectional-editor-ssr-mps"))
+    testImplementation(project(":projectional-editor"))
+    testImplementation(libs.modelix.mps.model.adapters)
+}
+
+intellij {
+    localPath = mpsHomeDir.map { it.asFile.absolutePath }
+    instrumentCode = false
+    plugins = listOf(project(":projectional-editor-ssr-mps")) + listOf(
+//        "Git4Idea",
+//        "Subversion",
+//        "com.intellij.copyright",
+//        "com.intellij.laf.macos",
+//        "com.intellij.platform.images",
+//        "com.intellij.properties",
+//        "com.intellij.properties.bundle.editor",
+//        "com.intellij.tasks",
+//        "com.jetbrains.changeReminder",
+//        "jetbrains.jetpad",
+//        "jetbrains.mps.build",
+//        "jetbrains.mps.build.ui",
+//        "jetbrains.mps.console",
+        "jetbrains.mps.core",
+//        "jetbrains.mps.debugger.api",
+//        "jetbrains.mps.debugger.java",
+//        "jetbrains.mps.editor.contextActions",
+//        "jetbrains.mps.editor.diagram",
+//        "jetbrains.mps.editor.spellcheck",
+//        "jetbrains.mps.editor.tooltips",
+//        "jetbrains.mps.execution.api",
+//        "jetbrains.mps.execution.configurations",
+//        "jetbrains.mps.execution.languages",
+//        "jetbrains.mps.git4idea.stubs",
+//        "jetbrains.mps.ide",
+//        "jetbrains.mps.ide.devkit",
+//        "jetbrains.mps.ide.httpsupport",
+//        "jetbrains.mps.ide.java",
+//        "jetbrains.mps.ide.make",
+//        "jetbrains.mps.ide.memtool",
+//        "jetbrains.mps.ide.migration.workbench",
+//        "jetbrains.mps.ide.modelchecker",
+//        "jetbrains.mps.ide.mpsmigration",
+        "jetbrains.mps.kotlin",
+//        "jetbrains.mps.navbar",
+//        "jetbrains.mps.rcp",
+//        "jetbrains.mps.samples",
+//        "jetbrains.mps.testing",
+//        "jetbrains.mps.tool.make",
+//        "jetbrains.mps.trove",
+//        "jetbrains.mps.vcs",
+//        "org.intellij.plugins.markdown",
+//        "org.jetbrains.plugins.github",
+//        "org.jetbrains.settingsRepository",
+
+//        "com.intellij",
+//        "com.jetbrains.sh",
+//        "org.jetbrains.plugins.terminal",
+    )
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            apiVersion = "1.6"
+        }
+    }
+    patchPluginXml {
+        sinceBuild.set("232")
+        untilBuild.set("233.*")
+    }
+
+    buildSearchableOptions {
+        enabled = false
+    }
+
+//    signPlugin {
+//        certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
+//        privateKey.set(System.getenv("PRIVATE_KEY"))
+//        password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
+//    }
+//
+//    publishPlugin {
+//        token.set(System.getenv("PUBLISH_TOKEN"))
+//    }
+
+    runIde {
+        autoReloadPlugins.set(true)
+    }
+
+    val pluginDir = mpsPluginsDir
+    if (pluginDir != null) {
+        create<Sync>("installMpsPlugin") {
+            dependsOn(prepareSandbox)
+            from(project.layout.buildDirectory.dir("idea-sandbox/plugins/${project.name}"))
+            into(pluginDir.resolve(project.name))
+        }
+    }
+
+    withType<org.jetbrains.intellij.tasks.PrepareSandboxTask>().configureEach {
+        dependsOn(project(":mps").tasks.named("packageMpsPublications"))
+
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(project.layout.projectDirectory.file("src/main/resources/META-INF"))
+            .exclude("plugin.xml")
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(patchPluginXml.flatMap { it.outputFiles })
+
+        listOf("editor-languages", "baseLanguage-notation").forEach { publicationName ->
+            intoChild(pluginName.map { "$it/languages" })
+                .from(zipTree({ project(":mps").layout.buildDirectory.file("mpsbuild/publications/$publicationName.zip") }))
+                .eachFile {
+                    path = path.replaceFirst("packaged-modules/", "")
+                }
+        }
+    }
+}
+
+group = "org.modelix.mps"
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            artifactId = "projectional-editor-languages-plugin"
+            artifact(tasks.buildPlugin) {
+                extension = "zip"
+            }
+        }
+    }
+}
diff --git a/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/plugin.xml b/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/plugin.xml
new file mode 100644
index 00000000..a82cc8b8
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/plugin.xml
@@ -0,0 +1,28 @@
+<!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
+<idea-plugin require-restart="true">
+    <!-- Unique identifier of the plugin. It should be FQN. It cannot be changed between the plugin versions. -->
+    <id>org.modelix.mps.editor.languages</id>
+
+    <!-- Public plugin name should be written in Title Case.
+         Guidelines: https://plugins.jetbrains.com/docs/marketplace/plugin-overview-page.html#plugin-name -->
+    <name>Notation Language for the Modelix Web Editor</name>
+
+    <!-- A displayed Vendor name or Organization ID displayed on the Plugins Page. -->
+    <vendor email="modelix@itemis.de" url="https://modelix.org/">itemis AG</vendor>
+
+    <!-- Description of the plugin displayed on the Plugin Page and IDE Plugin Manager.
+         Simple HTML elements (text formatting, paragraphs, and lists) can be added inside of <![CDATA[ ]]> tag.
+         Guidelines: https://plugins.jetbrains.com/docs/marketplace/plugin-overview-page.html#plugin-description -->
+    <description><![CDATA[
+    Languages for MPS that allow customizing the Modelix projectional text editor for your own languages.
+  ]]></description>
+
+    <!-- Product and plugin compatibility requirements.
+         Read more: https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
+    <depends>com.intellij.modules.mps</depends>
+    <depends>jetbrains.mps.core</depends>
+    <depends>org.modelix.mps.editor</depends>
+    <extensions defaultExtensionNs="com.intellij">
+        <mps.LanguageLibrary dir="/languages" />
+    </extensions>
+</idea-plugin>
diff --git a/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/pluginIcon.svg b/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/pluginIcon.svg
new file mode 100644
index 00000000..ddaf89cb
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/src/main/resources/META-INF/pluginIcon.svg
@@ -0,0 +1,66 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g transform="scale(0.08, 0.08) translate(0, 0)">
+        <!--      <rect fill="#fff" stroke-width="50" x="2" y="2" width="496" height="496" stroke="#000"/>-->
+        <!--      <path fill="#fff" stroke-width="4"  stroke="#545454" d="M22,2 h456 a20,20 0 0 1 20,20 v456 a20,20 0 0 1 -20,20 h-456 a20,20 0 0 1 -20,-20 v-456 a20,20 0 0 1 20,-20 z" />-->
+
+        <g transform="translate(-20, 0)">
+            <!-- tree root (border) -->
+            <!--      <line fill="none" stroke="#384d49" x1="125" y1="150" x2="275" y2="50" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="275" y1="50" x2="225" y2="150" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="275" y1="50" x2="340" y2="250" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="460" y1="250" x2="275" y2="50" stroke-width="28"/>
+                  <ellipse fill="#7ba8a1" stroke="#384d49" stroke-width="8" cx="275" cy="50" rx="25" ry="25"/>-->
+
+            <!-- tree root -->
+            <line fill="none" stroke="#888" x1="125" y1="150" x2="275" y2="50" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="275" y1="50" x2="225" y2="150" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="275" y1="50" x2="340" y2="250" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="460" y1="250" x2="275" y2="50" stroke-width="25"/>
+            <ellipse fill="#888" stroke="#888" stroke-width="8" cx="275" cy="50" rx="25" ry="25"/>
+
+            <!-- M (border) -->
+            <!--      <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="75" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="175" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="275" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="125" cy="150" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="225" cy="150" rx="25" ry="25"/>
+                  <line fill="none" stroke="#002a4d" x1="75" y1="350" x2="125" y2="150" stroke-width="28"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="125" y1="150" x2="175" y2="350"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="225" y1="150" x2="175" y2="350"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="275" y1="350" x2="225" y2="150"/>-->
+
+            <!-- M -->
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="75" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="175" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="275" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="125" cy="150" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="225" cy="150" rx="25" ry="25"/>
+            <line fill="none" stroke="#00457c" x1="75" y1="350" x2="125" y2="150" stroke-width="25"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="125" y1="150" x2="175" y2="350"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="225" y1="150" x2="175" y2="350"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="275" y1="350" x2="225" y2="150"/>
+
+            <!-- X (border) -->
+            <!--      <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="340" cy="250" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="340" cy="450" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="400" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="460" cy="250" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="460" cy="450" rx="25" ry="25"/>
+                  <line fill="none" stroke="#4d3826" x1="340" y1="250" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="460" y1="250" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="340" y1="450" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="460" y1="450" x2="400" y2="350" stroke-width="28"/>-->
+
+            <!-- X -->
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="340" cy="250" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="340" cy="450" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="400" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="460" cy="250" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="460" cy="450" rx="25" ry="25"/>
+            <line fill="none" stroke="#000" x1="340" y1="250" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="460" y1="250" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="340" y1="450" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="460" y1="450" x2="400" y2="350" stroke-width="25"/>
+        </g>
+    </g>
+</svg>
diff --git a/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt
new file mode 100644
index 00000000..df211fd3
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt
@@ -0,0 +1,73 @@
+package org.modelix.editor.ssr.mps
+
+import org.modelix.editor.CaretSelection
+import org.modelix.editor.EditorEngine
+import org.modelix.editor.JSKeyboardEvent
+import org.modelix.editor.JSKeyboardEventType
+import org.modelix.editor.KnownKeys
+import org.modelix.editor.NodeCellReference
+import org.modelix.editor.getVisibleText
+import org.modelix.editor.lastLeaf
+import org.modelix.editor.layoutable
+import org.modelix.incremental.IncrementalEngine
+import org.modelix.model.api.INode
+import org.modelix.model.mpsadapters.MPSNode
+
+/**
+ * Test editor for MPS baseLanguage ClassConcept
+ */
+class BaseLanguageTests : TestBase("SimpleProject") {
+    fun `test inserting new line into class`() {
+        lateinit var rootNode: MPSNode
+        lateinit var firstMethod: INode
+        readAction {
+            val solution = mpsProject.projectModules.first { it.moduleName == "Solution1" }
+            val model = solution.models.first()
+            rootNode = model.rootNodes.first().let { MPSNode(it) }
+            firstMethod = rootNode.allChildren.first { it.concept?.getShortName() == "InstanceMethodDeclaration" }
+        }
+
+        fun memberConcepts() = readAction {
+            rootNode.allChildren.filter { it.getContainmentLink()?.getSimpleName() == "member" }.map { it.concept?.getShortName() }
+        }
+        assertEquals(listOf("InstanceMethodDeclaration"), memberConcepts())
+
+        val incrementalEngine = IncrementalEngine()
+        val editorEngine = EditorEngine(incrementalEngine)
+        val mpsIntegration = EditorIntegrationForMPS(editorEngine)
+        mpsIntegration.init(mpsProject.repository)
+
+        val editor = editorEngine.editNode(rootNode)
+        fun assertEditorText(expected: String) {
+            assertEquals(expected, editor.getRootCell().layout.toString())
+        }
+
+        assertEditorText(
+            """
+            class Class1 {
+              public void method1(<no parameter>) {
+                <no statement>
+              }
+            }
+            """.trimIndent(),
+        )
+
+        val firstMethodCell = editor.resolveCell(NodeCellReference(firstMethod.reference)).first()
+        val lastLeafCell = firstMethodCell.lastLeaf()
+        assertEquals("}", lastLeafCell.getVisibleText())
+
+        editor.changeSelection(CaretSelection(lastLeafCell.layoutable()!!, -1))
+        editor.processKeyEvent(JSKeyboardEvent(JSKeyboardEventType.KEYDOWN, KnownKeys.Enter))
+
+        assertEditorText(
+            """
+                class Class1 {
+                  public void method1(<no parameter>) {
+                    <no statement>
+                  }
+                  
+                }
+            """.trimIndent(),
+        )
+    }
+}
diff --git a/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestBase.kt b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestBase.kt
new file mode 100644
index 00000000..7d6e9e6f
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestBase.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2023.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.modelix.editor.ssr.mps
+
+import com.intellij.ide.impl.OpenProjectTask
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.project.ex.ProjectManagerEx
+import com.intellij.openapi.util.Disposer
+import com.intellij.testFramework.TestApplicationManager
+import com.intellij.testFramework.UsefulTestCase
+import jetbrains.mps.ide.ThreadUtils
+import jetbrains.mps.ide.project.ProjectHelper
+import jetbrains.mps.project.MPSProject
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.absolute
+import kotlin.io.path.deleteRecursively
+
+/**
+ * Based on org.jetbrains.uast.test.env.AbstractLargeProjectTest
+ */
+@Suppress("removal")
+abstract class TestBase(val testDataName: String?) : UsefulTestCase() {
+    init {
+        // workaround for MPS 2023.3 failing to start in test mode
+        System.setProperty("intellij.platform.load.app.info.from.resources", "true")
+    }
+
+    protected lateinit var project: Project
+
+    override fun runInDispatchThread() = false
+
+    override fun setUp() {
+        super.setUp()
+        TestApplicationManager.getInstance()
+        project = openTestProject()
+    }
+
+    override fun tearDown() {
+        super.tearDown()
+    }
+
+    @OptIn(ExperimentalPathApi::class)
+    private fun openTestProject(): Project {
+        val projectDirParent = Path.of("build", "test-projects").absolute()
+        projectDirParent.toFile().mkdirs()
+        val projectDir = Files.createTempDirectory(projectDirParent, "mps-project")
+        projectDir.deleteRecursively()
+        projectDir.toFile().mkdirs()
+        projectDir.toFile().deleteOnExit()
+        val project = if (testDataName != null) {
+            val sourceDir = File("testdata/$testDataName")
+            sourceDir.copyRecursively(projectDir.toFile(), overwrite = true)
+            ProjectManagerEx.getInstanceEx().openProject(projectDir, OpenProjectTask())!!
+        } else {
+            ProjectManagerEx.getInstanceEx().newProject(projectDir, OpenProjectTask())!!
+        }
+
+        disposeOnTearDownInEdt { ProjectManager.getInstance().closeAndDispose(project) }
+
+        ApplicationManager.getApplication().invokeAndWait {
+            // empty - openTestProject executed not in EDT, so, invokeAndWait just forces
+            // processing of all events that were queued during project opening
+        }
+
+        return project
+    }
+
+    private fun disposeOnTearDownInEdt(runnable: Runnable) {
+        Disposer.register(
+            testRootDisposable,
+            Disposable {
+                ApplicationManager.getApplication().invokeAndWait(runnable)
+            },
+        )
+    }
+
+    protected val mpsProject: MPSProject get() {
+        return checkNotNull(ProjectHelper.fromIdeaProject(project)) { "MPS project not loaded" }
+    }
+
+    protected fun <R> writeAction(body: () -> R): R {
+        return mpsProject.modelAccess.computeWriteAction(body)
+    }
+
+    protected fun <R> writeActionOnEdt(body: () -> R): R {
+        return onEdt { writeAction { body() } }
+    }
+
+    protected fun <R> onEdt(body: () -> R): R {
+        var result: R? = null
+        ThreadUtils.runInUIThreadAndWait {
+            result = body()
+        }
+        return result as R
+    }
+
+    protected fun <R> readAction(body: () -> R): R {
+        var result: R? = null
+        mpsProject.modelAccess.runReadAction {
+            result = body()
+        }
+        return result as R
+    }
+}
diff --git a/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestFrameworkSetupTest.kt b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestFrameworkSetupTest.kt
new file mode 100644
index 00000000..05251c41
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/TestFrameworkSetupTest.kt
@@ -0,0 +1,35 @@
+package org.modelix.editor.ssr.mps
+
+import com.intellij.ide.plugins.PluginManager
+import jetbrains.mps.classloading.ModuleClassLoader
+import jetbrains.mps.module.ReloadableModuleBase
+
+/**
+ * Check that the environment is initialized properly and all plugins and modules are loaded properly.
+ */
+class TestFrameworkSetupTest : TestBase("SimpleProject") {
+    fun `test plugins loaded`() {
+        // IDEA plugins
+        assertContainsElements(
+            PluginManager.getPlugins().map { it.pluginId.idString }.sorted(),
+            "org.modelix.mps.editor.languages",
+            "org.modelix.mps.editor",
+        )
+
+        // MPS modules inside those IDEA plugins
+        readAction {
+            assertContainsElements(
+                mpsProject.repository.modules.map { it.moduleName ?: "" }.sorted(),
+                "org.modelix.mps.editor.ssr.stubs",
+                "org.modelix.mps.notation.impl.baseLanguage",
+            )
+        }
+    }
+
+    fun `test module is valid for classloading`() {
+        readAction {
+            val module = mpsProject.repository.modules.filterIsInstance<ReloadableModuleBase>().first { it.moduleName == "org.modelix.mps.notation.impl.baseLanguage" }
+            assertInstanceOf(module.classLoader, ModuleClassLoader::class.java)
+        }
+    }
+}
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/migration.xml b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/migration.xml
new file mode 100644
index 00000000..d512ce45
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/migration.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MigrationProperties">
+    <entry key="project.baseline.version" value="211" />
+  </component>
+</project>
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/modules.xml b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/modules.xml
new file mode 100644
index 00000000..d24dfe06
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MPSProject">
+    <projectModules>
+      <modulePath path="$PROJECT_DIR$/solutions/Solution1/Solution1.msd" folder="" />
+    </projectModules>
+  </component>
+</project>
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/vcs.xml b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/vcs.xml
new file mode 100644
index 00000000..fbbc5665
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/workspace.xml b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/workspace.xml
new file mode 100644
index 00000000..3a6ee076
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/.mps/workspace.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="ac0134d2-599b-416f-a373-cbb0c0a284ad" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/../../../gradle/libs.versions.toml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../gradle/libs.versions.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../kernelf-angular-demo/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../../kernelf-angular-demo/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../mps/.mps/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../mps/.mps/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../mps/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/../../../mps/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../mps/org.modelix.mps.editor.ssr.stubs/org.modelix.mps.editor.ssr.stubs.msd" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../mps/solutions/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps" beforeDir="false" afterPath="$PROJECT_DIR$/../../../mps/solutions/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/../../build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../src/test/kotlin/org/modelix/editor/ssr/mps/TypeClassFromScratchTest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/../../src/test/kotlin/org/modelix/editor/ssr/mps/TypeClassFromScratchTest.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.mps/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.mps/modules.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ConceptEditorHintSettings">
+    <option name="enabledHints">
+      <set>
+        <option value="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor" />
+        <option value="de.slisson.mps.conditionalEditor.hints.editor.conditionalEditorHints.conditionalEditor_doNotUseThisHint" />
+      </set>
+    </option>
+  </component>
+  <component name="ConsoleHistory">
+    <option name="tabs">
+      <list>
+        <TabState>
+          <option name="title" value="Console" />
+          <tab>
+            <model ref="d2f1f619-ed23-42ff-86f7-9726a525b5a1/r:23b4df01-d76c-4aac-a8f1-21148b771571(TempModuled2f1f619-ed23-42ff-86f7-9726a525b5a1/ConsoleModel_236997202077868)">
+              <persistence version="9" />
+              <languages>
+                <devkit ref="70d3d6da-af63-483d-a75f-9c8acf8de332(jetbrains.mps.console.devkit)" />
+              </languages>
+              <imports />
+              <registry>
+                <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base">
+                  <concept id="1583916890557930028" name="jetbrains.mps.console.base.structure.ConsoleRoot" flags="ng" index="aymSD">
+                    <child id="1583916890557930415" name="history" index="aymYE" />
+                    <child id="1583916890557930417" name="commandHolder" index="aymYO" />
+                    <child id="9025248442620242919" name="cursor" index="1PhJh3" />
+                  </concept>
+                  <concept id="5758176878586720817" name="jetbrains.mps.console.base.structure.CommandHolderRef" flags="ng" index="2_V_lH">
+                    <reference id="5758176878586720818" name="target" index="2_V_lI" />
+                  </concept>
+                  <concept id="351968380916615243" name="jetbrains.mps.console.base.structure.CommandHolder" flags="ng" index="2Clz$F" />
+                  <concept id="757553790980850366" name="jetbrains.mps.console.base.structure.History" flags="ng" index="3balQm" />
+                </language>
+              </registry>
+              <node concept="aymSD" id="Eq0TZU4ibr">
+                <node concept="3balQm" id="Eq0TZU4ibs" role="aymYE" />
+                <node concept="2Clz$F" id="Eq0TZU4ibt" role="aymYO" />
+                <node concept="2_V_lH" id="Eq0TZU4ibu" role="1PhJh3">
+                  <ref role="2_V_lI" node="Eq0TZU4ibt" resolve="CommandHolder" />
+                </node>
+              </node>
+            </model>
+          </tab>
+        </TabState>
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
+  </component>
+  <component name="MPSBookmarkManager">
+    <option name="myBookmarkInfos">
+      <array>
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+        <BookmarkInfo />
+      </array>
+    </option>
+  </component>
+  <component name="MessagesViewTool">
+    <option name="defaultListState">
+      <MessageListState>
+        <option name="autoscrollToSource" value="true" />
+        <option name="info" value="true" />
+        <option name="warnings" value="true" />
+      </MessageListState>
+    </option>
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 1
+}</component>
+  <component name="ProjectId" id="2fiajp1WM3oyy0Do5YAoxqHrMBN" />
+  <component name="ProjectPluginManager">
+    <option name="pluginsState">
+      <option name="de.slisson.mps.editor.multiline.runtime.plugin.Runtime_ProjectPlugin">
+        <value>
+          <PluginState>
+            <option name="myComponentsState">
+              <list>
+                <ComponentState>
+                  <option name="first" value="de.slisson.mps.editor.multiline.runtime.plugin.Multiline_PreferencesComponent" />
+                  <params />
+                </ComponentState>
+              </list>
+            </option>
+          </PluginState>
+        </value>
+      </option>
+      <option name="jetbrains.mps.ide.actions.Ide_ProjectPlugin">
+        <value>
+          <PluginState>
+            <option name="myComponentsState">
+              <list>
+                <ComponentState>
+                  <option name="first" value="jetbrains.mps.ide.actions.BehaviorDialogsPersistentOptions_PreferencesComponent" />
+                  <params>
+                    <option name="addReturnsOnImplement" value="false" />
+                    <option name="sortAlphabetically" value="false" />
+                    <option name="removeAttributes" value="true" />
+                  </params>
+                </ComponentState>
+              </list>
+            </option>
+          </PluginState>
+        </value>
+      </option>
+    </option>
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" />
+    <panes>
+      <pane id="ProjectPane">
+        <subPane />
+      </pane>
+      <pane id="Scope" />
+      <pane id="CustomProjectView_com.mbeddr.mpsutil.projectview.views.plugin.LogicalViewClone">
+        <subPane />
+      </pane>
+      <pane id="FileSystem" />
+      <pane id="CustomProjectView_com.mbeddr.mpsutil.projectview.views.plugin.ByConcept">
+        <subPane />
+      </pane>
+    </panes>
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.projectLibraryManager&quot;
+  }
+}</component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="ac0134d2-599b-416f-a373-cbb0c0a284ad" name="Changes" comment="" />
+      <created>1714286490472</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1714286490472</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="UsagesViewTool">
+    <version id="1" />
+    <tabs />
+    <default_view_options>
+      <options category_option="false" module_option="true" model_option="true" root_option="true" path_option="false" count_option="true" info_option="true" view_searched_nodes_option="true" group_searched_nodes_option="true" autoscroll_option="false" />
+    </default_view_options>
+  </component>
+</project>
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/Solution1.msd b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/Solution1.msd
new file mode 100644
index 00000000..f015948f
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/Solution1.msd
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="Solution1" uuid="6517ba0d-f632-49c5-a166-401587c2c3ca" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="6517ba0d-f632-49c5-a166-401587c2c3ca(Solution1)" version="0" />
+  </dependencyVersions>
+</solution>
diff --git a/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/models/Solution1.model1.mps b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/models/Solution1.model1.mps
new file mode 100644
index 00000000..64b0724b
--- /dev/null
+++ b/projectional-editor-ssr-mps-languages/testdata/SimpleProject/solutions/Solution1/models/Solution1.model1.mps
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:630db018-71e0-498d-8b21-6ec252b3533a(Solution1.model1)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="3cIAtmcX1Sw">
+    <property role="TrG5h" value="Class1" />
+    <node concept="3clFb_" id="3cIAtmcX1Te" role="jymVt">
+      <property role="TrG5h" value="method1" />
+      <node concept="3cqZAl" id="3cIAtmcX1Tg" role="3clF45" />
+      <node concept="3Tm1VV" id="3cIAtmcX1Th" role="1B3o_S" />
+      <node concept="3clFbS" id="3cIAtmcX1Ti" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="3cIAtmcX1Sx" role="1B3o_S" />
+  </node>
+</model>
diff --git a/projectional-editor-ssr-mps/build.gradle.kts b/projectional-editor-ssr-mps/build.gradle.kts
index 28b776f3..cb5a30e1 100644
--- a/projectional-editor-ssr-mps/build.gradle.kts
+++ b/projectional-editor-ssr-mps/build.gradle.kts
@@ -2,10 +2,12 @@ import com.jetbrains.plugin.structure.intellij.utils.JDOMUtil
 import org.jdom2.Element
 import org.jetbrains.intellij.transformXml
 import org.modelix.mpsHomeDir
+import org.modelix.mpsPluginsDir
 
 buildscript {
     dependencies {
         classpath(coreLibs.semver)
+        classpath(libs.modelix.build.tools.lib)
     }
 }
 
@@ -87,7 +89,7 @@ tasks {
         doLast {
             val ownJar: File = prepareSandbox.get().pluginJar.get().asFile
 
-            val originalFile = project(":mps").layout.projectDirectory.file("$stubsSolutionName/$stubsSolutionName.msd").asFile
+            val originalFile = project(":mps").layout.projectDirectory.file("stubs-template/$stubsSolutionName/$stubsSolutionName.msd").asFile
             val xml = originalFile.inputStream().use { JDOMUtil.loadDocument(it) }
 
             val modelRoot = xml.descendants.filterIsInstance<org.jdom2.Element>().first { it.name == "modelRoot" }
@@ -117,12 +119,12 @@ tasks {
         archiveFileName = "$stubsSolutionName.jar"
     }
 
-    val mpsPluginDir = project.findProperty("mps232.plugins.dir")?.toString()?.let { file(it) }
-    if (mpsPluginDir != null && mpsPluginDir.isDirectory) {
+    val pluginDir = mpsPluginsDir
+    if (pluginDir != null) {
         create<Sync>("installMpsPlugin") {
             dependsOn(prepareSandbox)
             from(project.layout.buildDirectory.dir("idea-sandbox/plugins/${project.name}"))
-            into(mpsPluginDir.resolve(project.name))
+            into(pluginDir.resolve(project.name))
         }
     }
 
@@ -130,16 +132,11 @@ tasks {
         dependsOn(packageStubsSolution)
         intoChild(pluginName.map { "$it/languages" })
             .from(packageStubsSolution.map { it.archiveFile })
-
-        if ("true" == project.findProperty("ciBuild")) {
-            // packaging the MPS modules during development would make them all read-only
-            dependsOn(project(":mps").tasks.named("packageMpsPublications"))
-            intoChild(pluginName.map { "$it/languages" })
-                .from(zipTree({ project(":mps").layout.buildDirectory.file("mpsbuild/publications/editor-languages.zip") }))
-                .eachFile {
-                    path = path.replaceFirst("packaged-modules/", "")
-                }
-        }
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(project.layout.projectDirectory.file("src/main/resources/META-INF"))
+            .exclude("plugin.xml")
+        intoChild(pluginName.map { "$it/META-INF" })
+            .from(patchPluginXml.flatMap { it.outputFiles })
     }
 }
 
diff --git a/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/EditorIntegrationForMPS.kt b/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/EditorIntegrationForMPS.kt
new file mode 100644
index 00000000..9f79cf30
--- /dev/null
+++ b/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/EditorIntegrationForMPS.kt
@@ -0,0 +1,34 @@
+package org.modelix.editor.ssr.mps
+
+import org.jetbrains.mps.openapi.module.SRepository
+import org.modelix.constraints.ConstraintsAspect
+import org.modelix.editor.EditorEngine
+import org.modelix.model.api.ILanguageRepository
+import org.modelix.model.mpsadapters.MPSChangeTranslator
+import org.modelix.model.mpsadapters.MPSLanguageRepository
+import org.modelix.scopes.ScopeAspect
+
+class EditorIntegrationForMPS(val editorEngine: EditorEngine) {
+    private var aspectsFromMPS: LanguageAspectsFromMPSModules? = null
+    private var mpsChangeTranslator: MPSChangeTranslator? = null
+    private var mpsLanguageRepository: MPSLanguageRepository? = null
+
+    fun init(repository: SRepository) {
+        mpsLanguageRepository = MPSLanguageRepository(repository)
+        ILanguageRepository.register(mpsLanguageRepository!!)
+        mpsChangeTranslator = MPSChangeTranslator()
+        mpsChangeTranslator!!.start(repository)
+        aspectsFromMPS = LanguageAspectsFromMPSModules(repository)
+        ScopeAspect.registerScopeProvider(MPSScopeProvider)
+        ConstraintsAspect.checkers.add(MPSConstraints)
+        editorEngine.addRegistry(aspectsFromMPS!!)
+    }
+
+    fun dispose() {
+        mpsLanguageRepository?.let { ILanguageRepository.unregister(it) }
+        mpsLanguageRepository = null
+
+        ScopeAspect.unregisterScopeProvider(MPSScopeProvider)
+        ConstraintsAspect.checkers.remove(MPSConstraints)
+    }
+}
diff --git a/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/ModelixSSRServerForMPS.kt b/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/ModelixSSRServerForMPS.kt
index d0f9313d..c47d5d70 100644
--- a/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/ModelixSSRServerForMPS.kt
+++ b/projectional-editor-ssr-mps/src/main/kotlin/org/modelix/editor/ssr/mps/ModelixSSRServerForMPS.kt
@@ -54,7 +54,6 @@ import org.jetbrains.mps.openapi.language.SContainmentLink
 import org.jetbrains.mps.openapi.language.SProperty
 import org.jetbrains.mps.openapi.language.SReferenceLink
 import org.jetbrains.mps.openapi.model.SNode
-import org.modelix.constraints.ConstraintsAspect
 import org.modelix.constraints.IConstraintViolation
 import org.modelix.constraints.IConstraintsChecker
 import org.modelix.editor.ExistingNode
@@ -64,23 +63,19 @@ import org.modelix.editor.ssr.server.ModelixSSRServer
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IChildLink
 import org.modelix.model.api.IConcept
-import org.modelix.model.api.ILanguageRepository
 import org.modelix.model.api.INode
 import org.modelix.model.api.IProperty
 import org.modelix.model.api.IReferenceLink
 import org.modelix.model.api.NodeReference
 import org.modelix.model.api.runSynchronized
-import org.modelix.model.mpsadapters.MPSChangeTranslator
 import org.modelix.model.mpsadapters.MPSChildLink
 import org.modelix.model.mpsadapters.MPSConcept
-import org.modelix.model.mpsadapters.MPSLanguageRepository
 import org.modelix.model.mpsadapters.MPSNode
 import org.modelix.model.mpsadapters.MPSProperty
 import org.modelix.model.mpsadapters.MPSReferenceLink
 import org.modelix.model.mpsadapters.MPSRepositoryAsNode
 import org.modelix.scopes.IScope
 import org.modelix.scopes.IScopeProvider
-import org.modelix.scopes.ScopeAspect
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.time.Duration
@@ -103,10 +98,8 @@ class ModelixSSRServerForMPS : Disposable {
 
     private var ssrServer: ModelixSSRServer? = null
     private var ktorServer: ApplicationEngine? = null
-    private var aspectsFromMPS: LanguageAspectsFromMPSModules? = null
-    private var mpsChangeTranslator: MPSChangeTranslator? = null
-    private var mpsLanguageRepository: MPSLanguageRepository? = null
     private val projects: MutableSet<Project> = Collections.synchronizedSet(HashSet())
+    private var mpsIntegration: EditorIntegrationForMPS? = null
 
     fun registerProject(project: Project) {
         projects.add(project)
@@ -135,17 +128,10 @@ class ModelixSSRServerForMPS : Disposable {
 
             println("starting modelix SSR server")
 
-            val repository = getMPSProjects().first().repository
-            mpsLanguageRepository = MPSLanguageRepository(repository)
-            ILanguageRepository.register(mpsLanguageRepository!!)
-            mpsChangeTranslator = MPSChangeTranslator()
-            mpsChangeTranslator!!.start(repository)
             val ssrServer = ModelixSSRServer((getRootNode() ?: return).getArea())
             this.ssrServer = ssrServer
-            aspectsFromMPS = LanguageAspectsFromMPSModules(repository)
-            ScopeAspect.registerScopeProvider(MPSScopeProvider)
-            ConstraintsAspect.checkers.add(MPSConstraints)
-            ssrServer.editorEngine.addRegistry(aspectsFromMPS!!)
+            mpsIntegration = EditorIntegrationForMPS(ssrServer.editorEngine)
+            mpsIntegration!!.init(getMPSProjects().first().repository)
             ktorServer = embeddedServer(Netty, port = 43593) {
                 initKtorServer(ssrServer)
             }
@@ -167,11 +153,11 @@ class ModelixSSRServerForMPS : Disposable {
                     repository.getArea().executeRead {
                         body {
                             ul {
-                                repository.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Repository.modules).forEach {
+                                repository.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Repository.modules).sortedBy { it.name }.forEach {
                                     li {
                                         a {
                                             href = "module/${URLEncoder.encode(it.reference.serialize(), StandardCharsets.UTF_8)}/"
-                                            +(it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) ?: "<no name>")
+                                            +(it.name ?: "<no name>")
                                         }
                                     }
                                 }
@@ -188,11 +174,11 @@ class ModelixSSRServerForMPS : Disposable {
                         val module = repository.getArea().resolveNode(NodeReference(moduleRef))!!
                         body {
                             ul {
-                                module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models).forEach {
+                                module.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.models).sortedBy { it.name }.forEach {
                                     li {
                                         a {
                                             href = "../../model/${URLEncoder.encode(it.reference.serialize(), StandardCharsets.UTF_8)}/"
-                                            +(it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) ?: "<no name>")
+                                            +(it.name ?: "<no name>")
                                         }
                                     }
                                 }
@@ -209,11 +195,11 @@ class ModelixSSRServerForMPS : Disposable {
                         val model = repository.getArea().resolveNode(NodeReference(modelRef))!!
                         body {
                             ul {
-                                model.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes).forEach {
+                                model.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes).sortedBy { it.name }.forEach {
                                     li {
                                         a {
                                             href = "../../editor/${URLEncoder.encode(it.reference.serialize(), StandardCharsets.UTF_8)}/"
-                                            +(it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name) ?: "<no name>")
+                                            +(it.name ?: "<no name>")
                                         }
                                     }
                                 }
@@ -255,12 +241,8 @@ class ModelixSSRServerForMPS : Disposable {
             ktorServer = null
             ssrServer?.dispose()
             ssrServer = null
-
-            mpsLanguageRepository?.let { ILanguageRepository.unregister(it) }
-            mpsLanguageRepository = null
-
-            ScopeAspect.unregisterScopeProvider(MPSScopeProvider)
-            ConstraintsAspect.checkers.remove(MPSConstraints)
+            mpsIntegration?.dispose()
+            mpsIntegration = null
         }
     }
 
@@ -283,7 +265,7 @@ object MPSScopeProvider : IScopeProvider {
             val containmentLink: SContainmentLink = sourceNode.getContainmentLink().toMPS()!!
             val index = sourceNode.index()
             val association: SReferenceLink = link.toMPS()!!
-            val concept: SAbstractConcept = (sourceNode.getNode()?.concept ?: sourceNode.expectedConcept()).toMPS()!!
+            val concept: SAbstractConcept = sourceNode.expectedConcept().toMPS()!!
             ModelConstraints.getReferenceDescriptor(
                 contextNode,
                 containmentLink,
@@ -309,10 +291,14 @@ object MPSConstraints : IConstraintsChecker {
         // Constraints only prevent creating a node. If it already exists, it's handled by the model checker.
         if (node.getNode() != null) return emptyList()
 
+        val parentNode = node.getParent()?.getNode().toMPS()
+        // MPS doesn't support constraint checking without a parent node
+        if (parentNode == null) return emptyList()
+
         // ConstraintsCanBeFacade.checkCanBeRoot()
 
         val containmentContext = ContainmentContext.Builder()
-            .parentNode(node.getParent()?.getNode().toMPS())
+            .parentNode(parentNode)
             .link(node.getContainmentLink().toMPS())
             .childConcept(node.expectedConcept().toMPS()!!)
             .build()
@@ -323,7 +309,7 @@ object MPSConstraints : IConstraintsChecker {
             ConstraintsCanBeFacade.checkCanBeAncestor(
                 CanBeAncestorContext.Builder()
                     .ancestorNode(ancestorNode)
-                    .parentNode(node.getParent()?.getNode().toMPS())
+                    .parentNode(parentNode)
                     .childConcept(node.expectedConcept().toMPS()!!)
                     .descendantNode(node.getNode().toMPS())
                     .link(node.getContainmentLink().toMPS())
@@ -343,4 +329,6 @@ fun IReferenceLink?.toMPS(): SReferenceLink? = if (this is MPSReferenceLink) thi
 fun IProperty?.toMPS(): SProperty? = if (this is MPSProperty) this.property else null
 fun IConcept?.toMPS(): SAbstractConcept? = if (this is MPSConcept) this.concept else null
 
+val INode.name get() = getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
+
 class MPSConstraintViolation(val rule: Rule<*>) : IConstraintViolation
diff --git a/projectional-editor-ssr-mps/src/main/resources/META-INF/pluginIcon.svg b/projectional-editor-ssr-mps/src/main/resources/META-INF/pluginIcon.svg
index 1555925e..ddaf89cb 100644
--- a/projectional-editor-ssr-mps/src/main/resources/META-INF/pluginIcon.svg
+++ b/projectional-editor-ssr-mps/src/main/resources/META-INF/pluginIcon.svg
@@ -1,27 +1,66 @@
 <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
     <g transform="scale(0.08, 0.08) translate(0, 0)">
-        <line fill="none" stroke="#adeee3" x1="425" y1="250" x2="275" y2="50" id="svg_41" stroke-width="15"/>
-        <line fill="none" stroke="#adeee3" x1="275" y1="50" x2="325" y2="250" id="svg_40" stroke-width="15"/>
-        <line fill="none" stroke="#adeee3" x1="275" y1="50" x2="225" y2="150" id="svg_38" stroke-width="15"/>
-        <line fill="none" stroke="#adeee3" x1="125" y1="150" x2="275" y2="50" id="svg_35" stroke-width="15"/>
-        <ellipse fill="#adeee3" stroke="#adeee3" stroke-width="0" cx="275" cy="50" id="svg_33" rx="25" ry="25"/>
-        <ellipse fill="#6290c3" stroke="#6290c3" stroke-width="0" cx="75" cy="350" id="svg_12" rx="25" ry="25"/>
-        <ellipse fill="#6290c3" stroke="#6290c3" stroke-width="0" cx="175" cy="350" id="svg_13" rx="25" ry="25"/>
-        <ellipse fill="#6290c3" stroke="#6290c3" stroke-width="0" cx="275" cy="350" id="svg_14" rx="25" ry="25"/>
-        <ellipse fill="#6290c3" stroke="#6290c3" stroke-width="0" cx="125" cy="150" id="svg_15" rx="25" ry="25"/>
-        <ellipse fill="#6290c3" stroke="#6290c3" stroke-width="0" cx="225" cy="150" id="svg_16" rx="25" ry="25"/>
-        <line fill="none" stroke="#6290c3" x1="75" y1="350" x2="125" y2="150" id="svg_17" stroke-width="20"/>
-        <line fill="none" stroke="#6290c3" stroke-width="20" x1="125" y1="150" x2="175" y2="350" id="svg_18"/>
-        <line fill="none" stroke="#6290c3" stroke-width="20" x1="225" y1="150" x2="175" y2="350" id="svg_19"/>
-        <line fill="none" stroke="#6290c3" stroke-width="20" x1="275" y1="350" x2="225" y2="150" id="svg_20"/>
-        <ellipse fill="#343434" stroke="#343434" stroke-width="0" cx="375" cy="350" id="svg_23" rx="25" ry="25"/>
-        <ellipse fill="#343434" stroke="#343434" stroke-width="0" cx="325" cy="250" id="svg_24" rx="25" ry="25"/>
-        <ellipse fill="#343434" stroke="#343434" stroke-width="0" cx="425" cy="250" id="svg_25" rx="25" ry="25"/>
-        <ellipse fill="#343434" stroke="#343434" stroke-width="0" cx="325" cy="450" id="svg_26" rx="25" ry="25"/>
-        <ellipse fill="#343434" stroke="#343434" stroke-width="0" cx="425" cy="450" id="svg_27" rx="25" ry="25"/>
-        <line fill="none" stroke="#343434" x1="325" y1="250" x2="375" y2="350" id="svg_28" stroke-width="20"/>
-        <line fill="none" stroke="#343434" x1="425" y1="250" x2="375" y2="350" id="svg_29" stroke-width="20"/>
-        <line fill="none" stroke="#343434" x1="325" y1="450" x2="375" y2="350" id="svg_30" stroke-width="20"/>
-        <line fill="none" stroke="#343434" x1="425" y1="450" x2="375" y2="350" id="svg_31" stroke-width="20"/>
+        <!--      <rect fill="#fff" stroke-width="50" x="2" y="2" width="496" height="496" stroke="#000"/>-->
+        <!--      <path fill="#fff" stroke-width="4"  stroke="#545454" d="M22,2 h456 a20,20 0 0 1 20,20 v456 a20,20 0 0 1 -20,20 h-456 a20,20 0 0 1 -20,-20 v-456 a20,20 0 0 1 20,-20 z" />-->
+
+        <g transform="translate(-20, 0)">
+            <!-- tree root (border) -->
+            <!--      <line fill="none" stroke="#384d49" x1="125" y1="150" x2="275" y2="50" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="275" y1="50" x2="225" y2="150" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="275" y1="50" x2="340" y2="250" stroke-width="28"/>
+                  <line fill="none" stroke="#384d49" x1="460" y1="250" x2="275" y2="50" stroke-width="28"/>
+                  <ellipse fill="#7ba8a1" stroke="#384d49" stroke-width="8" cx="275" cy="50" rx="25" ry="25"/>-->
+
+            <!-- tree root -->
+            <line fill="none" stroke="#888" x1="125" y1="150" x2="275" y2="50" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="275" y1="50" x2="225" y2="150" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="275" y1="50" x2="340" y2="250" stroke-width="25"/>
+            <line fill="none" stroke="#888" x1="460" y1="250" x2="275" y2="50" stroke-width="25"/>
+            <ellipse fill="#888" stroke="#888" stroke-width="8" cx="275" cy="50" rx="25" ry="25"/>
+
+            <!-- M (border) -->
+            <!--      <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="75" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="175" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="275" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="125" cy="150" rx="25" ry="25"/>
+                  <ellipse fill="#00457c" stroke="#002a4d" stroke-width="8" cx="225" cy="150" rx="25" ry="25"/>
+                  <line fill="none" stroke="#002a4d" x1="75" y1="350" x2="125" y2="150" stroke-width="28"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="125" y1="150" x2="175" y2="350"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="225" y1="150" x2="175" y2="350"/>
+                  <line fill="none" stroke="#002a4d" stroke-width="28" x1="275" y1="350" x2="225" y2="150"/>-->
+
+            <!-- M -->
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="75" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="175" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="275" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="125" cy="150" rx="25" ry="25"/>
+            <ellipse fill="#00457c" stroke="#00457c" stroke-width="8" cx="225" cy="150" rx="25" ry="25"/>
+            <line fill="none" stroke="#00457c" x1="75" y1="350" x2="125" y2="150" stroke-width="25"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="125" y1="150" x2="175" y2="350"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="225" y1="150" x2="175" y2="350"/>
+            <line fill="none" stroke="#00457c" stroke-width="25" x1="275" y1="350" x2="225" y2="150"/>
+
+            <!-- X (border) -->
+            <!--      <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="340" cy="250" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="340" cy="450" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="400" cy="350" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="460" cy="250" rx="25" ry="25"/>
+                  <ellipse fill="#545454" stroke="#4d3826" stroke-width="8" cx="460" cy="450" rx="25" ry="25"/>
+                  <line fill="none" stroke="#4d3826" x1="340" y1="250" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="460" y1="250" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="340" y1="450" x2="400" y2="350" stroke-width="28"/>
+                  <line fill="none" stroke="#4d3826" x1="460" y1="450" x2="400" y2="350" stroke-width="28"/>-->
+
+            <!-- X -->
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="340" cy="250" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="340" cy="450" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="400" cy="350" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="460" cy="250" rx="25" ry="25"/>
+            <ellipse fill="#000" stroke="#000" stroke-width="8" cx="460" cy="450" rx="25" ry="25"/>
+            <line fill="none" stroke="#000" x1="340" y1="250" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="460" y1="250" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="340" y1="450" x2="400" y2="350" stroke-width="25"/>
+            <line fill="none" stroke="#000" x1="460" y1="450" x2="400" y2="350" stroke-width="25"/>
+        </g>
     </g>
 </svg>
diff --git a/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/modules.xml b/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/modules.xml
new file mode 100644
index 00000000..47f90476
--- /dev/null
+++ b/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/modules.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MPSProject">
+    <projectModules />
+  </component>
+</project>
diff --git a/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/vcs.xml b/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/vcs.xml
new file mode 100644
index 00000000..fbbc5665
--- /dev/null
+++ b/projectional-editor-ssr-mps/testdata/SimpleProject/.mps/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
diff --git a/projectional-editor-ssr-server/src/main/kotlin/org/modelix/editor/ssr/server/ModelixSSRServer.kt b/projectional-editor-ssr-server/src/main/kotlin/org/modelix/editor/ssr/server/ModelixSSRServer.kt
index 1e53c267..94c894e2 100644
--- a/projectional-editor-ssr-server/src/main/kotlin/org/modelix/editor/ssr/server/ModelixSSRServer.kt
+++ b/projectional-editor-ssr-server/src/main/kotlin/org/modelix/editor/ssr/server/ModelixSSRServer.kt
@@ -44,11 +44,8 @@ import java.util.Collections
 import kotlin.collections.HashMap
 import kotlin.collections.LinkedHashSet
 import kotlin.collections.List
-import kotlin.collections.Map
 import kotlin.collections.MutableMap
 import kotlin.collections.MutableSet
-import kotlin.collections.asSequence
-import kotlin.collections.emptyMap
 import kotlin.collections.filter
 import kotlin.collections.forEach
 import kotlin.collections.get
@@ -172,7 +169,6 @@ class ModelixSSRServer(private val nodeResolutionScope: INodeResolutionScope) {
         private inner class EditorSession(val editorId: String) {
             private var editorComponent: EditorComponent? = null
             private val commonElementPrefix = editorId + "-"
-            private var domStateOnClient: Map<String, HTMLElementUpdateData> = emptyMap()
 
             private fun getEditor() = checkNotNull(editorComponent) { "Editor $editorId isn't initialized" }
 
@@ -201,55 +197,57 @@ class ModelixSSRServer(private val nodeResolutionScope: INodeResolutionScope) {
             fun sendUpdate() {
                 LOG.debug { "($editorId) sendUpdate" }
                 editorComponent!!.update()
-                val dom = editorComponent!!.getHtmlElement()!!
-                LOG.debug { "($editorId) dom: $dom" }
-                val latestDomState = HashMap<String, HTMLElementUpdateData>()
-                // TODO performance
-                var rootData = toUpdateData(dom, latestDomState)
-                if (rootData is ElementReference) rootData = latestDomState[rootData.id]!!
-                check(rootData is HTMLElementUpdateData)
-                if (rootData.id != editorId) {
-                    latestDomState.remove(rootData.id)
-                    rootData = rootData.copy(id = editorId)
-                    latestDomState[editorId] = rootData
+                val dom = editorComponent!!.getHtmlElement()!! as VirtualDom.Node
+                val changedElements = HashMap<String, HTMLElementUpdateData>()
+                var rootData: INodeUpdateData? = toUpdateData(dom, changedElements)
+                dom.resetModificationMarker()
+                if (rootData is ElementReference) rootData = changedElements[rootData.id]
+                if (rootData != null) {
+                    check(rootData is HTMLElementUpdateData)
+                    if (rootData.id != editorId) {
+                        changedElements.remove(rootData.id)
+                        rootData = rootData.copy(id = editorId)
+                        changedElements[editorId] = rootData
+                    }
                 }
 
-                val changesOnly = latestDomState.entries.asSequence()
-                    .filter { domStateOnClient[it.key] != it.value }
-                    .map { it.value }.toList()
-                if (changesOnly.isEmpty()) return
-
-                domStateOnClient = latestDomState
+                if (changedElements.isEmpty()) return
 
                 ws.outgoing.trySend(
                     Frame.Text(
                         MessageFromServer(
                             editorId = editorId,
                             domUpdate = DomTreeUpdate(
-                                elements = changesOnly,
+                                elements = changedElements.values.toList(),
                             ),
                         ).toJson(),
                     ),
                 )
             }
 
-            fun toUpdateData(node: IVirtualDom.Node, id2data: MutableMap<String, HTMLElementUpdateData>): INodeUpdateData {
+            fun toUpdateData(node: VirtualDom.Node, id2data: MutableMap<String, HTMLElementUpdateData>): INodeUpdateData {
                 return when (node) {
-                    is IVirtualDom.Text -> TextNodeUpdateData(node.textContent ?: "")
-                    is IVirtualDom.Element -> {
+                    is VirtualDom.Text -> TextNodeUpdateData(node.textContent ?: "")
+                    is VirtualDom.Element -> {
                         val id = node.id?.takeIf { it.isNotEmpty() }?.let {
                             if (it.startsWith(commonElementPrefix)) it else commonElementPrefix + it
                         }
-                        val data = HTMLElementUpdateData(
+                        fun createData() = HTMLElementUpdateData(
                             id = id,
                             tagName = node.tagName,
                             attributes = node.getAttributes() - "id",
                             children = node.childNodes.toList().map { toUpdateData(it, id2data) },
                         )
                         if (id == null) {
-                            data
+                            createData()
                         } else {
-                            id2data[id] = data
+                            if (node.wasModified()) {
+                                id2data[id] = createData()
+                            } else {
+                                if (node.wasAnyDescendantModified()) {
+                                    node.childNodes.forEach { toUpdateData(it, id2data) }
+                                }
+                            }
                             ElementReference(id)
                         }
                     }
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CaretSelection.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CaretSelection.kt
index 0e9a81f8..bdcb9655 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CaretSelection.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CaretSelection.kt
@@ -164,10 +164,12 @@ class CaretSelection(val layoutable: LayoutableCell, val start: Int, val end: In
                 }
                 ).toList()
             val params = CodeCompletionParameters(editor, typedText)
-            val actions = providers.flatMap { it.flattenApplicableActions(params) }
-            val matchingActions = actions
-                .filter { it.getMatchingText().startsWith(typedText) }
-                .applyShadowing()
+            val matchingActions = editor.runRead {
+                val actions = providers.flatMap { it.flattenApplicableActions(params) }
+                actions
+                    .filter { it.getMatchingText().startsWith(typedText) }
+                    .applyShadowing()
+            }
             if (matchingActions.isNotEmpty()) {
                 if (matchingActions.size == 1 && matchingActions.first().getMatchingText() == typedText) {
                     matchingActions.first().execute(editor)
@@ -209,7 +211,7 @@ class CaretSelection(val layoutable: LayoutableCell, val start: Int, val end: In
         // complete immediately if there is a single matching action
         val providers = layoutable.cell.getSubstituteActions()
         val params = CodeCompletionParameters(editor, newText)
-        val actions = providers.flatMap { it.flattenApplicableActions(params) }.toList()
+        val actions = editor.runRead { providers.flatMap { it.flattenApplicableActions(params) }.toList() }
         val matchingActions = actions
             .filter { it.getMatchingText() == newText }
             .applyShadowing()
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplate.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplate.kt
index e5de5dd1..1e72da12 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplate.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplate.kt
@@ -8,6 +8,7 @@ import org.modelix.model.api.INode
 import org.modelix.model.api.INodeReference
 import org.modelix.model.api.IProperty
 import org.modelix.model.api.IReferenceLink
+import org.modelix.model.api.isSubConceptOf
 import org.modelix.scopes.ScopeAspect
 import kotlin.jvm.JvmName
 
@@ -333,7 +334,7 @@ class ReferenceCellTemplate(
         return sourceNode.getReferenceTarget(link)
     }
     override fun getInstantiationActions(location: INonExistingNode, parameters: CodeCompletionParameters): List<IActionOrProvider> {
-        val sourceNode = NonExistingChild(location.getParent()!!, location.getContainmentLink()!!, location.index()).ofSubConcept(concept)
+        val sourceNode = location.replacement(concept)
         val scope = ScopeAspect.getScope(sourceNode, link)
         val targets = scope.getVisibleElements(sourceNode, link)
         return targets.map { target ->
@@ -358,8 +359,7 @@ class ReferenceCellTemplate(
             val sourceNode = location.getOrCreateNode(concept)
             sourceNode.setReferenceTarget(link, target.getOrCreateNode())
             editor.selectAfterUpdate {
-                CaretPositionPolicy(createCellReference(sourceNode))
-                    .getBestSelection(editor)
+                CaretPositionPolicy(createCellReference(sourceNode)).getBestSelection(editor)
             }
         }
     }
@@ -384,6 +384,13 @@ class ChildCellTemplate(
 
     private var separatorCell: CellTemplate? = null
 
+    /**
+     * When pressing ENTER a new node of this concept is inserted.
+     * If this concept is null, then a special placeholder cell is added to the editor and a node can be created using
+     * the code completion menu.
+     */
+    var newLineConcept: IConcept? = null
+
     fun setSeparator(newSeparator: CellTemplate) {
         this.separatorCell = newSeparator
         reference?.let { newSeparator.setReference(SeparatorCellTemplateReference(it)) }
@@ -398,7 +405,7 @@ class ChildCellTemplate(
         val childNodes = getChildNodes(node)
         val substitutionPlaceholder = context.editorState.substitutionPlaceholderPositions[createCellReference(node)]
         val placeholderIndex = substitutionPlaceholder?.index?.coerceIn(0..childNodes.size) ?: 0
-        val addSubstitutionPlaceholder: (Int) -> Unit = { index ->
+        fun addSubstitutionPlaceholder(index: Int) {
             val isDefaultPlaceholder = childNodes.isEmpty()
             val placeholderText = if (isDefaultPlaceholder) "<no ${link.getSimpleName()}>" else "<choose ${link.getSimpleName()}>"
             val placeholder = TextCellData("", placeholderText)
@@ -413,10 +420,12 @@ class ChildCellTemplate(
             placeholder.properties[CommonCellProperties.tabTarget] = true
             cell.addChild(placeholder)
         }
-        val addInsertActionCell: (Int) -> Unit = { index ->
+        fun addInsertActionCell(index: Int) {
             if (link.isMultiple) {
                 val actionCell = CellData()
-                val action = InsertSubstitutionPlaceholderAction(context.editorState, createCellReference(node), index)
+                val action = newLineConcept?.let {
+                    InstantiateNodeAction(NonExistingChild(ExistingNode(node), link, index), it)
+                } ?: InsertSubstitutionPlaceholderAction(context.editorState, createCellReference(node), index)
                 actionCell.properties[CellActionProperties.insert] = action
                 cell.addChild(actionCell)
             }
@@ -460,8 +469,20 @@ class ChildCellTemplate(
     fun getChildNodes(node: INode) = node.getChildren(link).toList()
 
     override fun getInstantiationActions(location: INonExistingNode, parameters: CodeCompletionParameters): List<IActionOrProvider>? {
-        // TODO
-        return listOf()
+        // This cell produces "wrappers".
+        // For example, in MPS baseLanguage you can type "int" (which is a Type) where a Statement is expected,
+        // and it is automatically wrapped with a LocalVariableDeclarationStatement.
+        // If the to-be-wrapped concept is already allowed without the wrapper, then it's not necessary to generate
+        // such an action.
+        if (link.targetConcept.isSubConceptOf(location.expectedConcept())) {
+            return emptyList()
+        }
+
+        // prevent endless nesting
+        if (location.ancestors(true).takeWhile { it.getNode() == null }.count() > 10) return emptyList()
+
+        val childNode = NonExistingChild(location.replacement(concept), link)
+        return listOf(ReplaceNodeActionProvider(childNode))
     }
 }
 data class PlaceholderCellReference(val childCellRef: TemplateCellReference) : CellReference()
@@ -483,6 +504,19 @@ class InsertSubstitutionPlaceholderAction(
     }
 }
 
+class InstantiateNodeAction(val location: INonExistingNode, val concept: IConcept) : ICellAction {
+    override fun isApplicable(): Boolean = true
+
+    override fun execute(editor: EditorComponent) {
+        val newNode = location.getExistingAncestor()!!.getArea().executeWrite {
+            location.replaceNode(concept)
+        }
+        editor.selectAfterUpdate {
+            CaretPositionPolicy(newNode).getBestSelection(editor)
+        }
+    }
+}
+
 fun CellTemplate.firstLeaf(): CellTemplate = if (getChildren().isEmpty()) this else getChildren().first().firstLeaf()
 fun CellTemplate.descendants(includeSelf: Boolean = false): Sequence<CellTemplate> {
     return if (includeSelf) {
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
index 036a896f..d9a4916d 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
@@ -265,19 +265,18 @@ open class CellTemplateBuilder<NodeT : Any, ConceptT : Any>(val template: CellTe
         ChildCellTemplate(template.concept, this).builder().also(body).template.also(template::addChild)
     }
 
-    fun ITypedChildListLink<*>.vertical(body: CellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
+    fun ITypedChildListLink<*>.vertical(body: ChildCellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
         this.untyped().vertical(body)
     }
 
-    fun IChildLink.vertical(body: CellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
-        // TODO add layout information
+    fun IChildLink.vertical(body: ChildCellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
         horizontal(separator = null) {
             template.properties[CommonCellProperties.layout] = ECellLayout.VERTICAL
             body()
         }
     }
 
-    fun ITypedChildListLink<*>.horizontal(separator: String? = ",", body: CellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
+    fun ITypedChildListLink<*>.horizontal(separator: String? = ",", body: ChildCellTemplateBuilder<NodeT, ConceptT>.() -> Unit = {}) {
         this.untyped().horizontal(separator, body)
     }
 
@@ -352,6 +351,10 @@ class ChildCellTemplateBuilder<NodeT : Any, ConceptT : Any>(
             CollectionCellTemplate(template.concept).also { body(it.builder()) },
         )
     }
+
+    fun newLineConcept(newLineConcept: IConcept) {
+        (template as ChildCellTemplate).newLineConcept = newLineConcept
+    }
 }
 
 class ReferenceCellTemplateBuilder<SourceNodeT : Any, SourceConceptT : Any, TargetNodeT>(
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/EditorEngine.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/EditorEngine.kt
index c8c02263..a3b082c8 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/EditorEngine.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/EditorEngine.kt
@@ -119,7 +119,7 @@ class EditorEngine(incrementalEngine: IncrementalEngine? = null) {
         }
     }
 
-    private fun resolveConceptEditor(concept: IConcept?): List<ConceptEditor> {
+    fun resolveConceptEditor(concept: IConcept?): List<ConceptEditor> {
         if (concept == null) return listOf(defaultConceptEditor)
         val editors = concept.getAllConcepts().firstNotNullOfOrNull { superConcept ->
             val conceptReference = superConcept.getReference()
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/INonExistingNode.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/INonExistingNode.kt
index 72f7717b..c0ade64b 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/INonExistingNode.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/INonExistingNode.kt
@@ -37,39 +37,33 @@ fun INonExistingNode.commonAncestor(otherNode: INonExistingNode): INonExistingNo
     return null
 }
 
-data class SpecializedNonExistingNode(val node: INonExistingNode, val subConcept: IConcept) : INonExistingNode {
-    override fun getExistingAncestor(): INode? = node.getExistingAncestor()
+data class NodeReplacement(val nodeToReplace: INonExistingNode, val replacementConcept: IConcept) : INonExistingNode {
+    override fun getExistingAncestor(): INode? = nodeToReplace.getExistingAncestor()
 
-    override fun getParent(): INonExistingNode? = node.getParent()
+    override fun getParent(): INonExistingNode? = nodeToReplace.getParent()
 
-    override fun getContainmentLink(): IChildLink? = node.getContainmentLink()
+    override fun getContainmentLink(): IChildLink? = nodeToReplace.getContainmentLink()
 
-    override fun index(): Int = node.index()
+    override fun index(): Int = nodeToReplace.index()
 
     override fun replaceNode(subConcept: IConcept?): INode {
-        return node.replaceNode(coerceOutputConcept(subConcept))
+        return nodeToReplace.replaceNode(coerceOutputConcept(subConcept))
     }
 
     override fun getOrCreateNode(subConcept: IConcept?): INode {
-        return node.getOrCreateNode(coerceOutputConcept(subConcept))
+        return replaceNode(subConcept)
     }
 
     override fun getNode(): INode? {
-        return node.getNode()
+        return null
     }
 
     override fun expectedConcept(): IConcept {
-        return subConcept
+        return replacementConcept
     }
 }
 
-fun INonExistingNode.ofSubConcept(subConcept: IConcept): INonExistingNode {
-    return if (expectedConcept().isSubConceptOf(subConcept)) {
-        this
-    } else {
-        SpecializedNonExistingNode(this, subConcept)
-    }
-}
+fun INonExistingNode.replacement(newConcept: IConcept): INonExistingNode = NodeReplacement(this, newConcept)
 
 fun INonExistingNode.coerceOutputConcept(subConcept: IConcept?): IConcept? {
     val expectedConcept = expectedConcept()
@@ -100,8 +94,7 @@ data class ExistingNode(private val node: INode) : INonExistingNode {
     }
 
     override fun getOrCreateNode(subConcept: IConcept?): INode {
-        val outputConcept = coerceOutputConcept(subConcept)
-        return if (node.isInstanceOf(outputConcept)) {
+        return if (subConcept == null || node.isInstanceOf(coerceOutputConcept(subConcept))) {
             node
         } else {
             replaceNode(subConcept)
@@ -130,9 +123,7 @@ data class NonExistingChild(private val parent: INonExistingNode, val link: IChi
 
     override fun replaceNode(subConcept: IConcept?): INode {
         val parentNode = parent.getOrCreateNode(null)
-        val existing = parentNode.getChildren(link).toList().getOrNull(index)
         val newNode = parentNode.addNewChild(link, index, coerceOutputConcept(subConcept))
-        existing?.remove()
         return newNode
     }
 
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/IncrementalVirtualDOMBuilder.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/IncrementalVirtualDOMBuilder.kt
index 6fd5b699..a0a7e161 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/IncrementalVirtualDOMBuilder.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/IncrementalVirtualDOMBuilder.kt
@@ -44,9 +44,11 @@ class IncrementalVirtualDOMBuilder(val document: IVirtualDom, existingRootElemen
                     if (index < parent.childNodes.size) {
                         val actualChild = parent.childNodes.get(index)
                         if (actualChild != expectedChild) {
+                            expectedChild.parent?.removeChild(expectedChild)
                             parent.insertBefore(expectedChild, actualChild)
                         }
                     } else {
+                        expectedChild.parent?.removeChild(expectedChild)
                         parent.appendChild(expectedChild)
                     }
                 }
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/ReplaceNodeActionProvider.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/ReplaceNodeActionProvider.kt
index 81a26b29..88b081da 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/ReplaceNodeActionProvider.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/ReplaceNodeActionProvider.kt
@@ -12,7 +12,7 @@ data class ReplaceNodeActionProvider(val location: INonExistingNode) : ICodeComp
         val allowedConcepts = expectedConcept.getAllSubConcepts(true)
             .filterNot { it.isAbstract() }
             .filter { concept ->
-                val newNode = SpecializedNonExistingNode(NonExistingChild(location.getParent()!!, location.getContainmentLink()!!, location.index()), concept)
+                val newNode = location.replacement(concept)
                 ConstraintsAspect.canCreate(newNode)
             }
         val cellModels = allowedConcepts.map { concept ->
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/VirtualDom.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/VirtualDom.kt
index e8da6cb4..24780620 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/VirtualDom.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/VirtualDom.kt
@@ -160,9 +160,33 @@ class VirtualDom(override val ui: IVirtualDomUI, val idPrefix: String = "") : IV
     }
 
     open inner class Node : IVirtualDom.Node {
+        private var wasModified: Boolean = true
+        private var wasAnyDescendantModified: Boolean = true
         private val userObjects: MutableMap<String, Any> = HashMap()
-        override var parent: IVirtualDom.Node? = null
-        override val childNodes: MutableList<IVirtualDom.Node> = ArrayList()
+        override var parent: Node? = null
+        override val childNodes: MutableList<Node> = ArrayList()
+
+        fun resetModificationMarker() {
+            if (!wasModified && wasAnyDescendantModified) return
+            childNodes.forEach { it.resetModificationMarker() }
+            wasAnyDescendantModified = false
+            wasModified = false
+        }
+
+        fun markModified() {
+            wasModified = true
+            parent?.markDescendantModified()
+        }
+
+        fun markDescendantModified() {
+            if (wasAnyDescendantModified) return
+            wasAnyDescendantModified = true
+            parent?.markDescendantModified()
+        }
+
+        fun wasAnyDescendantModified() = wasAnyDescendantModified
+
+        fun wasModified(): Boolean = wasModified
 
         override fun getVDom(): IVirtualDom = this@VirtualDom
 
@@ -180,24 +204,46 @@ class VirtualDom(override val ui: IVirtualDomUI, val idPrefix: String = "") : IV
             if (referenceNode == null) return appendChild(newNode)
             val index = childNodes.indexOf(referenceNode)
             require(index >= 0) { "$referenceNode is not a child of $this" }
-            childNodes.add(index, newNode)
+            addChild(index, newNode)
             return newNode
         }
+
         override fun appendChild(child: IVirtualDom.Node): IVirtualDom.Node {
-            childNodes += child
+            addChild(childNodes.size, child)
             return child
         }
+
         override fun replaceChild(newChild: IVirtualDom.Node, oldChild: IVirtualDom.Node): IVirtualDom.Node {
             val index = childNodes.indexOf(oldChild)
             require(index >= 0) { "$oldChild is not a child of $this" }
-            childNodes[index] = newChild
+
+            removeChildAt(index)
+            addChild(index, newChild)
             return oldChild
         }
+
         override fun removeChild(child: IVirtualDom.Node): IVirtualDom.Node {
-            require(childNodes.remove(child)) { "$child is not a child of $this" }
+            val index = childNodes.indexOf(child)
+            require(index >= 0) { "$child is not a child of $this" }
+            removeChildAt(index)
             return child
         }
 
+        fun removeChildAt(index: Int) {
+            val child = childNodes.removeAt(index)
+            child.parent = null
+            markModified()
+        }
+
+        fun addChild(index: Int, child: IVirtualDom.Node) {
+            require(child is Node)
+            check(child.parent == null) { "Node is already attached to a parent node" }
+            childNodes.add(index, child)
+            child.parent = this
+            markModified()
+            if (child.wasModified() || child.wasAnyDescendantModified()) markDescendantModified()
+        }
+
         override fun remove() {
             parent?.removeChild(this)
         }
@@ -208,21 +254,54 @@ class VirtualDom(override val ui: IVirtualDomUI, val idPrefix: String = "") : IV
         override fun getAttributeNames(): Array<String> = attributes.keys.toTypedArray()
         override fun getAttribute(qualifiedName: String): String? = attributes[qualifiedName]
         override fun setAttribute(qualifiedName: String, value: String) {
+            if (attributes[qualifiedName] == value) return
             attributes[qualifiedName] = value
             if (qualifiedName == "id") {
                 elementsMap[value] = this
             }
+            markModified()
+        }
+        override fun removeAttribute(qualifiedName: String) {
+            if (attributes.remove(qualifiedName) != null) {
+                markModified()
+            }
         }
-        override fun removeAttribute(qualifiedName: String) { attributes.remove(qualifiedName) }
         override fun getAttributes(): Map<String, String> = attributes
 
         override fun getInnerBounds(): Bounds = ui.getInnerBounds(this)
         override fun getOuterBounds(): Bounds = ui.getOuterBounds(this)
+
+        override fun toString(): String {
+            return buildString {
+                append("<$tagName>")
+                attributes.forEach { attribute ->
+                    append(" ")
+                    append(attribute.key)
+                    append("=\"")
+                    append(attribute.value)
+                    append("\"")
+                }
+                append(">")
+                childNodes.forEach { child ->
+                    append(child)
+                }
+                append("</$tagName>")
+            }
+        }
     }
 
     inner class HTMLElement(tagName: String) : Element(tagName), IVirtualDom.HTMLElement
 
     inner class Text : Node(), IVirtualDom.Text {
         override var textContent: String? = null
+            set(value) {
+                if (field == value) return
+                field = value
+                markModified()
+            }
+
+        override fun toString(): String {
+            return textContent ?: ""
+        }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0ebdc8c4..c7e58dd3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -35,4 +35,5 @@ include("mps")
 include("projectional-editor-ssr-client")
 include("projectional-editor-ssr-common")
 include("projectional-editor-ssr-mps")
+include("projectional-editor-ssr-mps-languages")
 include("projectional-editor-ssr-server")