diff --git a/.github/workflows/mps-compatibility.yaml b/.github/workflows/mps-compatibility.yaml
index 40b322f6..eed73266 100644
--- a/.github/workflows/mps-compatibility.yaml
+++ b/.github/workflows/mps-compatibility.yaml
@@ -18,7 +18,7 @@ jobs:
           # also adjust the compatibility version range of the MPS plugin
           - "2023.2"
           - "2023.3"
-#          - "2024.1"
+          - "2024.1"
     steps:
       - uses: actions/checkout@v5
 #      - uses: actions/setup-node@v3
diff --git a/README.md b/README.md
index 9e23ea04..4a3fd0a6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ See also https://www.jetbrains.com/help/idea/directories-used-by-the-ide-to-stor
 
 You may have to create the plugins folder if it doesn't exist yet.
 
-Currently, these MPS versions are supported: 2023.2, 2023.3
+Currently, these MPS versions are supported: 2023.2, 2023.3, 2024.1
 
 # Usage
 
diff --git a/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt b/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
index 24ecb435..4e404d4a 100644
--- a/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
+++ b/buildSrc/src/main/kotlin/org/modelix/CopyMps.kt
@@ -29,7 +29,7 @@ val Project.mpsMajorVersion: String get() {
     if (project != rootProject) return rootProject.mpsMajorVersion
     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.2"
+        ?: "2024.1"
 }
 
 val Project.mpsVersion: String get() {
@@ -45,9 +45,9 @@ val Project.mpsVersion: String get() {
                     "2021.3" to "2021.3.5",
                     "2022.2" to "2022.2.4",
                     "2022.3" to "2022.3.3",
-                    "2023.2" to "2023.2.2",
+                    "2023.2" to "2023.2.3",
                     "2023.3" to "2023.3.2",
-                    "2024.1" to "2024.1.1",
+                    "2024.1" to "2024.1.5",
                 )[it],
             ) { "Unknown MPS version: $it" }
         }
diff --git a/editor-common-mps/build.gradle.kts b/editor-common-mps/build.gradle.kts
index 994ac194..249790a4 100644
--- a/editor-common-mps/build.gradle.kts
+++ b/editor-common-mps/build.gradle.kts
@@ -51,7 +51,7 @@ kotlin {
 tasks {
     patchPluginXml {
         sinceBuild.set("232")
-        untilBuild.set("233.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {
diff --git a/mps-image-editor-server/build.gradle.kts b/mps-image-editor-server/build.gradle.kts
index e5081a8d..1c0b6298 100644
--- a/mps-image-editor-server/build.gradle.kts
+++ b/mps-image-editor-server/build.gradle.kts
@@ -33,7 +33,7 @@ intellij {
 tasks {
     patchPluginXml {
         sinceBuild.set("232")
-        untilBuild.set("233.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {
diff --git a/mps/.mps/migration.xml b/mps/.mps/migration.xml
index 8a35c3fa..9fdfd76d 100644
--- a/mps/.mps/migration.xml
+++ b/mps/.mps/migration.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
     <entry key="project.baseline.version" value="232" />
+    <entry key="project.migrated.version" value="241" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps b/mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps
index 47ed09e4..e3023ebd 100644
--- a/mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps
+++ b/mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps
@@ -26,7 +26,7 @@
       </concept>
       <concept id="8876946878573903262" name="org.modelix.mps.react.structure.ConceptRenderer" flags="ng" index="gmrQT">
         <reference id="8310867745953086698" name="concept" index="3JBHV4" />
-        <child id="8876946878573903455" name="component" index="gmrTS" />
+        <child id="8876946878573903455" name="components" index="gmrTS" />
       </concept>
       <concept id="5355184975888307501" name="org.modelix.mps.react.structure.StateVariable" flags="ng" index="2o1qlL">
         <child id="5355184975888310505" name="initializer" index="2o1p2P" />
@@ -55,7 +55,7 @@
       </concept>
       <concept id="5355184975881056557" name="org.modelix.mps.react.structure.NamedRendererBase" flags="ng" index="2rHO5L">
         <child id="5355184975881056561" name="parameters" index="2rHO5H" />
-        <child id="5355184975881056562" name="component" index="2rHO5I" />
+        <child id="5355184975881056562" name="components" index="2rHO5I" />
       </concept>
       <concept id="2833354970324905743" name="org.modelix.mps.react.structure.RenderNode" flags="ng" index="1nBVpq">
         <child id="2833354970324905746" name="nodeToRender" index="1nBVp7" />
@@ -1091,7 +1091,7 @@
             <property role="Xl_RC" value="Beispiel" />
           </node>
           <node concept="3z9kRR" id="G39ofCeJ1I" role="3z8GDl">
-            <ref role="3z9kRQ" node="G39ofCeJ0i" resolve="accTitll" />
+            <ref role="3z9kRQ" node="G39ofCeJ0i" resolve="accTitle" />
           </node>
         </node>
       </node>
diff --git a/mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd b/mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd
index 21ca2afb..2a5586ea 100644
--- a/mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd
+++ b/mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl b/mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl
index 8d50e686..f69bb700 100644
--- a/mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl
+++ b/mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps b/mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps
index 3c042973..db3a41f9 100644
--- a/mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps
+++ b/mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps
@@ -49,7 +49,7 @@
     <property role="EcuMT" value="3030577733520086760" />
     <property role="TrG5h" value="ReactRoot" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2vPZMAmue7o" role="1TKVEi">
       <property role="IQ2ns" value="2879488090856546776" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -64,7 +64,7 @@
   <node concept="1TIwiD" id="2vPZMAmue7m">
     <property role="EcuMT" value="2879488090856546774" />
     <property role="TrG5h" value="Element" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2vPZMAmue7n" role="1TKVEl">
       <property role="IQ2nx" value="2879488090856546775" />
       <property role="TrG5h" value="label" />
@@ -75,7 +75,7 @@
     <property role="EcuMT" value="2879488090872081360" />
     <property role="TrG5h" value="TreeNode" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAnpuJh" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -101,7 +101,7 @@
     <property role="EcuMT" value="2879488090880630244" />
     <property role="TrG5h" value="ReadOrEdit" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2vPZMAnWa4r" role="1TKVEl">
       <property role="IQ2nx" value="2879488090881171739" />
       <property role="TrG5h" value="a" />
@@ -122,13 +122,13 @@
     <property role="EcuMT" value="223742654175067082" />
     <property role="TrG5h" value="Blank" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="G39ofDDj5m">
     <property role="EcuMT" value="793519207838200150" />
     <property role="TrG5h" value="NewTree" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="G39ofDDjEL" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -143,7 +143,7 @@
   <node concept="1TIwiD" id="2NkZbYerWzG">
     <property role="EcuMT" value="3230484732390131948" />
     <property role="TrG5h" value="NewTreeItem" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NkZbYerX97" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -169,7 +169,7 @@
     <property role="EcuMT" value="2646768005436038431" />
     <property role="TrG5h" value="WidgetTest" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2iVdnDeSAqk" role="1TKVEl">
       <property role="IQ2nx" value="2646768005436040852" />
       <property role="TrG5h" value="text" />
@@ -195,7 +195,7 @@
     <property role="EcuMT" value="6637716746545074245" />
     <property role="TrG5h" value="RefTest" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5KtU3pXwbBQ" role="1TKVEi">
       <property role="IQ2ns" value="6637716746545445366" />
       <property role="20kJfa" value="target" />
@@ -209,7 +209,7 @@
     <property role="EcuMT" value="3693585498076077970" />
     <property role="TrG5h" value="ErrorChecking" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3d2g73CmY$t" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -224,7 +224,7 @@
     <property role="TrG5h" value="Record" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="record" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1XYAF4MuRh6" role="1TKVEi">
       <property role="IQ2ns" value="2269421348088149062" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -241,7 +241,7 @@
     <property role="TrG5h" value="Member" />
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="member" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1XYAF4MuQFh" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -258,7 +258,7 @@
     <property role="3GE5qa" value="record" />
     <property role="TrG5h" value="Type" />
     <property role="R5$K7" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="1XYAF4MuSsK">
     <property role="EcuMT" value="2269421348088153904" />
diff --git a/mps/modules/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
index f943b704..ed2f6485 100644
--- a/mps/modules/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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -24,7 +24,7 @@
     <language slang="l:515552c7-fcc0-4ab4-9789-2f3c49344e85:jetbrains.mps.baseLanguage.varVariable" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" 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:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="13" />
     <language slang="l:b17a9ec8-44a5-40a1-9216-058d277424eb:jetbrains.mps.kotlin.internal" version="0" />
     <language slang="l:9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0:jetbrains.mps.kotlin.javaRefs" version="0" />
     <language slang="l:eb56ebf4-df56-438e-af06-fc1cd08b495a:jetbrains.mps.kotlin.smodel" version="0" />
diff --git a/mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl b/mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl
index a49c39c5..11a94d69 100644
--- a/mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl
+++ b/mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
@@ -40,7 +40,7 @@
         <language slang="l:515552c7-fcc0-4ab4-9789-2f3c49344e85:jetbrains.mps.baseLanguage.varVariable" version="0" />
         <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" 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:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="13" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
diff --git a/mps/modules/org.modelix.mps.react.ide/models/org.modelix.mps.react.ide.plugin.mps b/mps/modules/org.modelix.mps.react.ide/models/org.modelix.mps.react.ide.plugin.mps
index 990301b0..bbf9a5b0 100644
--- a/mps/modules/org.modelix.mps.react.ide/models/org.modelix.mps.react.ide.plugin.mps
+++ b/mps/modules/org.modelix.mps.react.ide/models/org.modelix.mps.react.ide.plugin.mps
@@ -247,7 +247,7 @@
             <node concept="liA8E" id="2vPZMAmtTPa" role="2OqNvi">
               <ref role="37wK5l" to="kt01:~Clipboard.setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner)" resolve="setContents" />
               <node concept="37vLTw" id="2vPZMAmtTPb" role="37wK5m">
-                <ref role="3cqZAo" node="2vPZMAmtRxJ" resolve="stringSelection" />
+                <ref role="3cqZAo" node="2vPZMAmtRxJ" resolve="s" />
               </node>
               <node concept="10Nm6u" id="2vPZMAmtTPc" role="37wK5m" />
             </node>
diff --git a/mps/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd b/mps/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd
index f78d2963..2931fd58 100644
--- a/mps/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd
+++ b/mps/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/mps/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd b/mps/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd
index e6f2578c..6a9ef551 100644
--- a/mps/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd
+++ b/mps/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd
@@ -42,7 +42,6 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="0a7577d1-d4e5-431d-98b1-fae38f9aee80(org.modelix.model.repositoryconcepts)" version="0" />
     <module reference="208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)" version="0" />
     <module reference="472b2a37-8fd8-48c2-911a-4dd23131201d(org.modelix.mps.react.impl.baseLanguage)" version="0" />
     <module reference="83a7cbdc-dd9d-4dad-be97-957aa1b07375(org.modelix.mps.react.ssr.stubs)" version="0" />
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps b/mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps
index e236dcea..5d4974dd 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps
@@ -77,7 +77,7 @@
       </concept>
       <concept id="8876946878573903262" name="org.modelix.mps.react.structure.ConceptRenderer" flags="ng" index="gmrQT">
         <reference id="8310867745953086698" name="concept" index="3JBHV4" />
-        <child id="8876946878573903455" name="component" index="gmrTS" />
+        <child id="8876946878573903455" name="components" index="gmrTS" />
       </concept>
       <concept id="8876946878573903439" name="org.modelix.mps.react.structure.GenericReactComponent" flags="ng" index="gmrTC">
         <property id="8876946878573977569" name="componentType" index="gmPZ6" />
@@ -490,7 +490,7 @@
   <node concept="bUwia" id="2vPZMAmvnIA">
     <property role="TrG5h" value="main" />
     <node concept="3aamgX" id="af0_0CUx85" role="3acgRq">
-      <ref role="30HIoZ" to="zaxg:af0_0CR$4e" resolve="CreateDeleteEditChild" />
+      <ref role="30HIoZ" to="zaxg:af0_0CR$4e" resolve="CreateDeleteRenderChild" />
       <node concept="1Koe21" id="af0_0CUJep" role="1lVwrX">
         <node concept="gmrQT" id="af0_0CUJxl" role="1Koe22">
           <ref role="3JBHV4" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -622,7 +622,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="7$1mkeArCYD" role="3acgRq">
-      <ref role="30HIoZ" to="zaxg:7$1mkeArAgt" resolve="ErrorBox" />
+      <ref role="30HIoZ" to="zaxg:7$1mkeArAgt" resolve="ErrorReporting" />
       <node concept="1Koe21" id="7$1mkeArIwS" role="1lVwrX">
         <node concept="gmrQT" id="7$1mkeArINu" role="1Koe22">
           <ref role="3JBHV4" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -665,7 +665,7 @@
                           <node concept="2OqwBi" id="3DPCGQwwvUW" role="3clFbG">
                             <node concept="30H73N" id="3DPCGQwwvpX" role="2Oq$k0" />
                             <node concept="3TrcHB" id="3DPCGQwwGUs" role="2OqNvi">
-                              <ref role="3TsBF5" to="zaxg:2CLPJ2uDwEt" resolve="onlyForFeature" />
+                              <ref role="3TsBF5" to="zaxg:2CLPJ2uDwEt" resolve="restrictToFeature" />
                             </node>
                           </node>
                         </node>
@@ -1477,7 +1477,7 @@
                                                       <node concept="2OqwBi" id="5KtU3pYoNpl" role="2Oq$k0">
                                                         <node concept="30H73N" id="5KtU3pYoN88" role="2Oq$k0" />
                                                         <node concept="3TrEf2" id="5KtU3pYoOld" role="2OqNvi">
-                                                          <ref role="3Tt5mk" to="zaxg:5KtU3pYn7YK" resolve="presentationFun" />
+                                                          <ref role="3Tt5mk" to="zaxg:5KtU3pYn7YK" resolve="labelFun" />
                                                         </node>
                                                       </node>
                                                       <node concept="1$rogu" id="5KtU3pYoPxX" role="2OqNvi" />
@@ -1502,7 +1502,7 @@
                                                 <node concept="2OqwBi" id="5KtU3pYomc0" role="2Oq$k0">
                                                   <node concept="30H73N" id="5KtU3pYolwM" role="2Oq$k0" />
                                                   <node concept="3TrEf2" id="5KtU3pYonm3" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="zaxg:5KtU3pYn7YK" resolve="presentationFun" />
+                                                    <ref role="3Tt5mk" to="zaxg:5KtU3pYn7YK" resolve="labelFun" />
                                                   </node>
                                                 </node>
                                                 <node concept="3x8VRR" id="5KtU3pYopD6" role="2OqNvi" />
@@ -1900,7 +1900,7 @@
                           <node concept="2OqwBi" id="2D6UMN62Z2n" role="3clFbG">
                             <node concept="1PxgMI" id="2D6UMN62TSO" role="2Oq$k0">
                               <node concept="chp4Y" id="2D6UMN62Udh" role="3oSUPX">
-                                <ref role="cht4Q" to="zaxg:2D6UMN62NpD" resolve="ChoiceSpecifierStatic" />
+                                <ref role="cht4Q" to="zaxg:2D6UMN62NpD" resolve="StringChoiceSpecifierStatic" />
                               </node>
                               <node concept="2OqwBi" id="2D6UMN62L3D" role="1m5AlR">
                                 <node concept="3TrEf2" id="2D6UMN62LYc" role="2OqNvi">
@@ -1932,7 +1932,7 @@
                         </node>
                         <node concept="1mIQ4w" id="6Z6l9RlxER3" role="2OqNvi">
                           <node concept="chp4Y" id="6Z6l9RlxER4" role="cj9EA">
-                            <ref role="cht4Q" to="zaxg:2D6UMN62NpD" resolve="ChoiceSpecifierStatic" />
+                            <ref role="cht4Q" to="zaxg:2D6UMN62NpD" resolve="StringChoiceSpecifierStatic" />
                           </node>
                         </node>
                       </node>
@@ -1965,7 +1965,7 @@
                                   <node concept="2OqwBi" id="gNsEGB7U$C" role="3clFbG">
                                     <node concept="1PxgMI" id="gNsEGB7TX7" role="2Oq$k0">
                                       <node concept="chp4Y" id="gNsEGB7UnD" role="3oSUPX">
-                                        <ref role="cht4Q" to="zaxg:gNsEGB5DCe" resolve="ChoiceSpecifierDynamic" />
+                                        <ref role="cht4Q" to="zaxg:gNsEGB5DCe" resolve="StringChoiceSpecifierDynamic" />
                                       </node>
                                       <node concept="2OqwBi" id="gNsEGB7EeS" role="1m5AlR">
                                         <node concept="3TrEf2" id="gNsEGB7EeV" role="2OqNvi">
@@ -2090,7 +2090,7 @@
                         </node>
                         <node concept="1mIQ4w" id="gNsEGBaVlY" role="2OqNvi">
                           <node concept="chp4Y" id="gNsEGBaVlZ" role="cj9EA">
-                            <ref role="cht4Q" to="zaxg:gNsEGB5DCe" resolve="ChoiceSpecifierDynamic" />
+                            <ref role="cht4Q" to="zaxg:gNsEGB5DCe" resolve="StringChoiceSpecifierDynamic" />
                           </node>
                         </node>
                       </node>
@@ -3933,7 +3933,7 @@
                             <node concept="2OqwBi" id="2iVdnDeSv38" role="3clFbG">
                               <node concept="2OqwBi" id="2iVdnDeSv39" role="2Oq$k0">
                                 <node concept="3TrEf2" id="2iVdnDeSv3a" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                                 <node concept="30H73N" id="2iVdnDeSv3b" role="2Oq$k0" />
                               </node>
@@ -3956,7 +3956,7 @@
                             <node concept="2OqwBi" id="2iVdnDeSv3i" role="2Oq$k0">
                               <node concept="30H73N" id="2iVdnDeSv3j" role="2Oq$k0" />
                               <node concept="3TrEf2" id="2iVdnDeSv3k" role="2OqNvi">
-                                <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                               </node>
                             </node>
                             <node concept="3TrEf2" id="2iVdnDeSv3l" role="2OqNvi">
@@ -3985,7 +3985,7 @@
                             <node concept="2OqwBi" id="2iVdnDeSv3v" role="3clFbG">
                               <node concept="2OqwBi" id="2iVdnDeSv3w" role="2Oq$k0">
                                 <node concept="3TrEf2" id="2iVdnDeSv3x" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                                 <node concept="30H73N" id="2iVdnDeSv3y" role="2Oq$k0" />
                               </node>
@@ -4010,7 +4010,7 @@
                               <node concept="2OqwBi" id="2iVdnDeSv3E" role="2Oq$k0">
                                 <node concept="30H73N" id="2iVdnDeSv3F" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="2iVdnDeSv3G" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="2iVdnDeSv3H" role="2OqNvi">
@@ -4031,7 +4031,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="2vPZMAm$jBB" role="3acgRq">
-      <ref role="30HIoZ" to="zaxg:2vPZMAmvnIB" resolve="TextBox" />
+      <ref role="30HIoZ" to="zaxg:2vPZMAmvnIB" resolve="TextField" />
       <node concept="1Koe21" id="2vPZMAm$k04" role="1lVwrX">
         <node concept="gmrQT" id="2vPZMAm$k08" role="1Koe22">
           <ref role="3JBHV4" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -4053,7 +4053,7 @@
                             <node concept="2OqwBi" id="2vPZMAm$o8V" role="3clFbG">
                               <node concept="2OqwBi" id="2vPZMAm$nMQ" role="2Oq$k0">
                                 <node concept="3TrEf2" id="2vPZMAm$nMT" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                                 <node concept="30H73N" id="2vPZMAm$nMU" role="2Oq$k0" />
                               </node>
@@ -4076,7 +4076,7 @@
                             <node concept="2OqwBi" id="2vPZMAm$lFF" role="2Oq$k0">
                               <node concept="30H73N" id="2vPZMAm$lrf" role="2Oq$k0" />
                               <node concept="3TrEf2" id="2vPZMAm$mvK" role="2OqNvi">
-                                <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                               </node>
                             </node>
                             <node concept="3TrEf2" id="2vPZMAm$nJ2" role="2OqNvi">
@@ -4105,7 +4105,7 @@
                             <node concept="2OqwBi" id="2vPZMAm$pvN" role="3clFbG">
                               <node concept="2OqwBi" id="2vPZMAm$pbp" role="2Oq$k0">
                                 <node concept="3TrEf2" id="2vPZMAm$pbs" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                                 <node concept="30H73N" id="2vPZMAm$pbt" role="2Oq$k0" />
                               </node>
@@ -4130,7 +4130,7 @@
                               <node concept="2OqwBi" id="2vPZMAm$sfh" role="2Oq$k0">
                                 <node concept="30H73N" id="2vPZMAm$sfi" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="2vPZMAm$sfj" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="context" />
+                                  <ref role="3Tt5mk" to="zaxg:2vPZMAmvsgs" resolve="data" />
                                 </node>
                               </node>
                               <node concept="3TrEf2" id="2vPZMAm$sfk" role="2OqNvi">
@@ -4533,7 +4533,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="2vPZMAmF0VF" role="3acgRq">
-      <ref role="30HIoZ" to="zaxg:2vPZMAmEVPF" resolve="HorizontalLayout" />
+      <ref role="30HIoZ" to="zaxg:2vPZMAmEVPF" resolve="LayoutHorizontal" />
       <node concept="1Koe21" id="2vPZMAmF0VG" role="1lVwrX">
         <node concept="gmrQT" id="2vPZMAmF0VH" role="1Koe22">
           <ref role="3JBHV4" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -4706,7 +4706,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="2vPZMAmGCt_" role="3acgRq">
-      <ref role="30HIoZ" to="zaxg:2vPZMAmGCtk" resolve="VerticalLayout" />
+      <ref role="30HIoZ" to="zaxg:2vPZMAmGCtk" resolve="LayoutVertical" />
       <node concept="1Koe21" id="2vPZMAmGCtA" role="1lVwrX">
         <node concept="gmrQT" id="2vPZMAmGCtB" role="1Koe22">
           <ref role="3JBHV4" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -5630,7 +5630,7 @@
                         <node concept="2OqwBi" id="2vPZMAmYMix" role="3clFbG">
                           <node concept="1PxgMI" id="2vPZMAmYM4N" role="2Oq$k0">
                             <node concept="chp4Y" id="2vPZMAmYM5F" role="3oSUPX">
-                              <ref role="cht4Q" to="zaxg:2vPZMAmYEOb" resolve="TextButtonLabel" />
+                              <ref role="cht4Q" to="zaxg:2vPZMAmYEOb" resolve="ButtonLabelText" />
                             </node>
                             <node concept="2OqwBi" id="2vPZMAmYKl8" role="1m5AlR">
                               <node concept="30H73N" id="2vPZMAmYJRj" role="2Oq$k0" />
@@ -5664,7 +5664,7 @@
               </node>
               <node concept="1mIQ4w" id="2vPZMAmYJxv" role="2OqNvi">
                 <node concept="chp4Y" id="2vPZMAmYJ$h" role="cj9EA">
-                  <ref role="cht4Q" to="zaxg:2vPZMAmYEOb" resolve="TextButtonLabel" />
+                  <ref role="cht4Q" to="zaxg:2vPZMAmYEOb" resolve="ButtonLabelText" />
                 </node>
               </node>
             </node>
@@ -5751,7 +5751,7 @@
               </node>
               <node concept="1mIQ4w" id="2vPZMAn9K87" role="2OqNvi">
                 <node concept="chp4Y" id="2vPZMAn9K88" role="cj9EA">
-                  <ref role="cht4Q" to="zaxg:2vPZMAn8wb$" resolve="IconButtonLabel" />
+                  <ref role="cht4Q" to="zaxg:2vPZMAn8wb$" resolve="ButtonLabelIcon" />
                 </node>
               </node>
             </node>
@@ -6092,7 +6092,7 @@
                         <node concept="2OqwBi" id="G39ofCgTe7" role="2Oq$k0">
                           <node concept="30H73N" id="G39ofCgS$x" role="2Oq$k0" />
                           <node concept="3TrEf2" id="G39ofCgUeR" role="2OqNvi">
-                            <ref role="3Tt5mk" to="zaxg:G39ofCeJi6" resolve="typo" />
+                            <ref role="3Tt5mk" to="zaxg:G39ofCeJi6" resolve="typography" />
                           </node>
                         </node>
                         <node concept="3x8VRR" id="G39ofCgWaK" role="2OqNvi" />
@@ -6200,7 +6200,7 @@
       </node>
     </node>
     <node concept="1puMqW" id="1Lliyam7_2i" role="1puA0r">
-      <ref role="1puQsG" node="1Lliyam7nYN" resolve="materialiseType" />
+      <ref role="1puQsG" node="1Lliyam7nYN" resolve="preprocess" />
     </node>
   </node>
   <node concept="1pmfR0" id="1Lliyam7nYN">
@@ -6324,7 +6324,7 @@
                     <ref role="3cqZAo" node="7HYB$0nu3BD" resolve="wrapper" />
                   </node>
                   <node concept="3TrcHB" id="7HYB$0nugsp" role="2OqNvi">
-                    <ref role="3TsBF5" to="zaxg:2xzaHpg1aM4" resolve="onlyNonFeatureSpecific" />
+                    <ref role="3TsBF5" to="zaxg:2xzaHpg1aM4" resolve="onlyGlobalErrors" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="7HYB$0nugsq" role="37vLTx">
@@ -6344,7 +6344,7 @@
                 </node>
                 <node concept="1P9Npp" id="2xzaHpfVzvW" role="2OqNvi">
                   <node concept="37vLTw" id="7HYB$0nu3BJ" role="1P9ThW">
-                    <ref role="3cqZAo" node="7HYB$0nu3BD" resolve="node" />
+                    <ref role="3cqZAo" node="7HYB$0nu3BD" resolve="wrapper" />
                   </node>
                 </node>
               </node>
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.behavior.mps b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.behavior.mps
index 76c52d84..b4bccf6c 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.behavior.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.behavior.mps
@@ -1597,7 +1597,7 @@
                     <property role="Xl_RC" value="reports only errors for feature '" />
                   </node>
                   <node concept="BsUDl" id="7HYB$0ntChI" role="3uHU7w">
-                    <ref role="37wK5l" node="7HYB$0ntsoi" resolve="onlyForFeature" />
+                    <ref role="37wK5l" node="7HYB$0ntsoi" resolve="restrictToFeature" />
                   </node>
                 </node>
               </node>
@@ -1606,7 +1606,7 @@
           <node concept="3y3z36" id="7HYB$0nt$Ry" role="3clFbw">
             <node concept="10Nm6u" id="7HYB$0nt_bm" role="3uHU7w" />
             <node concept="BsUDl" id="7HYB$0ntzkS" role="3uHU7B">
-              <ref role="37wK5l" node="7HYB$0ntsoi" resolve="onlyForFeature" />
+              <ref role="37wK5l" node="7HYB$0ntsoi" resolve="restrictToFeature" />
             </node>
           </node>
         </node>
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps
index 422abb68..b483dcff 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps
@@ -556,7 +556,7 @@
     <property role="3GE5qa" value="util" />
     <ref role="1XX52x" to="zaxg:2vPZMAneuaB" resolve="Command" />
     <node concept="3EZMnI" id="2vPZMAnhbMR" role="2wV5jI">
-      <ref role="1k5W1q" to="vpip:2vPZMAn1cgK" resolve="RCode" />
+      <ref role="1k5W1q" to="vpip:2vPZMAn1cgK" resolve="RBehaviorCode" />
       <node concept="2iRfu4" id="2vPZMAnhbMS" role="2iSdaV" />
       <node concept="3EZMnI" id="2vPZMAneuaI" role="3EZMnx">
         <node concept="l2Vlx" id="2vPZMAngqbn" role="2iSdaV" />
@@ -927,7 +927,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofC7ZUP" role="3EZMnx">
         <property role="3F0ifm" value="color:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F1sOY" id="G39ofC7ZUO" role="3EZMnx">
         <property role="1$x2rV" value="&lt;none&gt;" />
@@ -935,7 +935,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofC7ZUU" role="3EZMnx">
         <property role="3F0ifm" value="style:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F0A7n" id="G39ofC7ZUR" role="3EZMnx">
         <ref role="1NtTu8" to="zaxg:G39ofC6yKY" resolve="style" />
@@ -943,7 +943,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofC7ZUX" role="3EZMnx">
         <property role="3F0ifm" value="size:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F0A7n" id="G39ofC7ZV0" role="3EZMnx">
         <property role="1$x2rV" value="&lt;default&gt;" />
@@ -1152,7 +1152,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofD9T9u" role="3EZMnx">
         <property role="3F0ifm" value="padding:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F0A7n" id="G39ofD9U1d" role="3EZMnx">
         <property role="1O74Pk" value="true" />
@@ -1162,7 +1162,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofDh5AL" role="3EZMnx">
         <property role="3F0ifm" value="margin:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F0A7n" id="G39ofDh5AK" role="3EZMnx">
         <property role="1O74Pk" value="true" />
@@ -1172,7 +1172,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofD9T9y" role="3EZMnx">
         <property role="3F0ifm" value="border width:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F0A7n" id="G39ofD9T9z" role="3EZMnx">
         <property role="1$x2rV" value="&lt;default&gt;" />
@@ -1182,7 +1182,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofD9Vbq" role="3EZMnx">
         <property role="3F0ifm" value="border color:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F1sOY" id="G39ofD9UAj" role="3EZMnx">
         <property role="1$x2rV" value="&lt;none&gt;" />
@@ -1190,7 +1190,7 @@
       </node>
       <node concept="3F0ifn" id="G39ofDaohz" role="3EZMnx">
         <property role="3F0ifm" value="shade color:" />
-        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+        <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
       </node>
       <node concept="3F1sOY" id="G39ofDaohy" role="3EZMnx">
         <property role="1$x2rV" value="&lt;none&gt;" />
@@ -1352,7 +1352,7 @@
             <node concept="2iRfu4" id="1LliyakH7sF" role="2iSdaV" />
             <node concept="3F0ifn" id="1LliyakH7a6" role="3EZMnx">
               <property role="3F0ifm" value="model type:" />
-              <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RSubKeyword" />
+              <ref role="1k5W1q" to="vpip:2vPZMAnFe33" resolve="RKeywordSub" />
             </node>
             <node concept="3F1sOY" id="1LliyakH7Jf" role="3EZMnx">
               <ref role="1NtTu8" to="zaxg:1Lliyak$Nuo" resolve="modelType" />
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.intentions.mps b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.intentions.mps
index 9fff2dec..9f2001df 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.intentions.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.intentions.mps
@@ -424,7 +424,7 @@
         <node concept="3clFbF" id="2vPZMAnt2i1" role="3cqZAp">
           <node concept="3cpWs3" id="2vPZMAnt5xq" role="3clFbG">
             <node concept="37vLTw" id="af0_0D4cM0" role="3uHU7w">
-              <ref role="3cqZAo" node="af0_0D4cLW" resolve="string" />
+              <ref role="3cqZAo" node="af0_0D4cLW" resolve="l" />
             </node>
             <node concept="Xl_RD" id="2vPZMAnt2i0" role="3uHU7B">
               <property role="Xl_RC" value="Wrap with " />
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.structure.mps b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.structure.mps
index 9f4928c3..2fcefa9b 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.structure.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.structure.mps
@@ -74,7 +74,7 @@
     <property role="TrG5h" value="TextField" />
     <property role="34LRSv" value="textfield" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAolc6p" role="PzmwI">
       <ref role="PrY4T" node="5KtU3pY9cIT" resolve="IPropertyWidget" />
     </node>
@@ -89,7 +89,7 @@
     <property role="EcuMT" value="2879488090856866837" />
     <property role="TrG5h" value="NodePropRef" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2vPZMAmvsgm" role="1TKVEi">
       <property role="IQ2ns" value="2879488090856866838" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -109,7 +109,7 @@
     <property role="TrG5h" value="Label" />
     <property role="34LRSv" value="label" />
     <property role="3GE5qa" value="output" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="G39ofC8uZm" role="1TKVEi">
       <property role="IQ2ns" value="793519207812820950" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -133,7 +133,7 @@
     <property role="TrG5h" value="LayoutHorizontal" />
     <property role="34LRSv" value="horizontal" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="cqTc8J2sSJ" role="1TKVEl">
       <property role="IQ2nx" value="223742654172220975" />
       <property role="TrG5h" value="gap" />
@@ -171,7 +171,7 @@
     <property role="TrG5h" value="LayoutVertical" />
     <property role="34LRSv" value="vertical" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAmGCtl" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAmEVPI" resolve="IMUILayoutComponent" />
     </node>
@@ -193,7 +193,7 @@
     <property role="TrG5h" value="Header" />
     <property role="34LRSv" value="header" />
     <property role="3GE5qa" value="output" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAmJaEI" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAmEVPG" resolve="IMUIComponent" />
     </node>
@@ -221,7 +221,7 @@
     <property role="TrG5h" value="Space" />
     <property role="34LRSv" value="space" />
     <property role="3GE5qa" value="output" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAmMlUn" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAmEVPG" resolve="IMUIComponent" />
     </node>
@@ -239,7 +239,7 @@
     <property role="TrG5h" value="ButtonLabel" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="2vPZMAmYEOb">
     <property role="EcuMT" value="2879488090865052939" />
@@ -258,7 +258,7 @@
     <property role="TrG5h" value="Button" />
     <property role="34LRSv" value="button" />
     <property role="3GE5qa" value="action" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAmYEOA" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAmYEO7" resolve="IMUIAction" />
     </node>
@@ -296,7 +296,7 @@
     <property role="TrG5h" value="Command" />
     <property role="34LRSv" value="do" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2vPZMAneuaC" role="1TKVEi">
       <property role="IQ2ns" value="2879488090869195432" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -347,7 +347,7 @@
     <property role="TrG5h" value="Accordion" />
     <property role="34LRSv" value="accordion" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAnBVdO" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnsysd" resolve="IContainerMultiComponent" />
     </node>
@@ -371,7 +371,7 @@
     <property role="TrG5h" value="Icon" />
     <property role="34LRSv" value="icon" />
     <property role="3GE5qa" value="output" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2vPZMAnBVdV" role="1TKVEl">
       <property role="IQ2nx" value="2879488090875868027" />
       <property role="TrG5h" value="name" />
@@ -383,7 +383,7 @@
     <property role="TrG5h" value="Box" />
     <property role="34LRSv" value="box" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAnIc9c" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnIaRU" resolve="IContainerSingleComponent" />
     </node>
@@ -417,7 +417,7 @@
     <property role="TrG5h" value="State" />
     <property role="34LRSv" value="state" />
     <property role="3GE5qa" value="action" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAnZ0cn" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnZ0cm" resolve="IInvisible" />
     </node>
@@ -465,7 +465,7 @@
     <property role="TrG5h" value="ShowAndEdit" />
     <property role="34LRSv" value="show-and-edit" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAolrZe" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnIaRU" resolve="IContainerSingleComponent" />
     </node>
@@ -475,7 +475,7 @@
     <property role="TrG5h" value="PlainDiv" />
     <property role="34LRSv" value="seq" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAonvgz" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnsysd" resolve="IContainerMultiComponent" />
     </node>
@@ -485,7 +485,7 @@
     <property role="TrG5h" value="LabelWidgetPair" />
     <property role="34LRSv" value="lwp" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAoGIbp" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAmEVPG" resolve="IMUIComponent" />
     </node>
@@ -539,16 +539,16 @@
     <property role="EcuMT" value="223742654172176291" />
     <property role="TrG5h" value="Alignment" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="cqTc8J2hY$" role="1TKVEl">
       <property role="IQ2nx" value="223742654172176292" />
       <property role="TrG5h" value="vertical" />
-      <ref role="AX2Wp" node="cqTc8J1POl" resolve="DirectionVertical" />
+      <ref role="AX2Wp" node="cqTc8J1POl" resolve="AlignmentVertical" />
     </node>
     <node concept="1TJgyi" id="cqTc8J2hY_" role="1TKVEl">
       <property role="IQ2nx" value="223742654172176293" />
       <property role="TrG5h" value="horizontal" />
-      <ref role="AX2Wp" node="cqTc8J2hI7" resolve="DirectionHorizontal" />
+      <ref role="AX2Wp" node="cqTc8J2hI7" resolve="HorizontalAligment" />
     </node>
   </node>
   <node concept="1TIwiD" id="cqTc8Jo1wo">
@@ -556,7 +556,7 @@
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="Typography" />
     <property role="34LRSv" value="typography" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="cqTc8Jo1wr" role="1TKVEi">
       <property role="IQ2ns" value="223742654177875995" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -585,7 +585,7 @@
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="Color" />
     <property role="34LRSv" value="#" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="cqTc8Jo1wq" role="1TKVEl">
       <property role="IQ2nx" value="223742654177875994" />
       <property role="TrG5h" value="value" />
@@ -596,7 +596,7 @@
     <property role="EcuMT" value="793519207813113972" />
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="TypographyRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="G39ofC9AxP" role="1TKVEi">
       <property role="IQ2ns" value="793519207813113973" />
       <property role="20kJfa" value="typography" />
@@ -609,7 +609,7 @@
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="BorderAndShade" />
     <property role="34LRSv" value="borderAndShade" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="G39ofD9Po3" role="1TKVEl">
       <property role="IQ2nx" value="793519207829952003" />
       <property role="TrG5h" value="borderWidth" />
@@ -648,7 +648,7 @@
     <property role="EcuMT" value="793519207830189068" />
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="BorderAndShadeRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="G39ofDaJPh" role="1TKVEi">
       <property role="IQ2ns" value="793519207830191441" />
       <property role="20kJfa" value="borderAndShade" />
@@ -661,7 +661,7 @@
     <property role="TrG5h" value="TreeNode" />
     <property role="34LRSv" value="tree node" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NkZbYeZXbY" role="PzmwI">
       <ref role="PrY4T" to="8xo1:7GLg2tFqfT1" resolve="IReactComponent" />
     </node>
@@ -699,7 +699,7 @@
     <property role="TrG5h" value="TreeView" />
     <property role="34LRSv" value="tree view" />
     <property role="3GE5qa" value="layout" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NkZbYfaxHc" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnsysd" resolve="IContainerMultiComponent" />
     </node>
@@ -716,7 +716,7 @@
     <property role="TrG5h" value="Checkbox" />
     <property role="34LRSv" value="checkbox" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2iVdnDeRYGe" role="PzmwI">
       <ref role="PrY4T" node="5KtU3pY9cIT" resolve="IPropertyWidget" />
     </node>
@@ -726,7 +726,7 @@
     <property role="TrG5h" value="ValueConverter" />
     <property role="34LRSv" value="value converter" />
     <property role="3GE5qa" value="values" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1LliyakH2wL" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -770,7 +770,7 @@
     <property role="TrG5h" value="ItFunction" />
     <property role="3GE5qa" value="values" />
     <property role="34LRSv" value="fun" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1Lliyam7lF8" role="1TKVEi">
       <property role="IQ2ns" value="2041619518490237640" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -801,7 +801,7 @@
     <property role="EcuMT" value="2041619518470133481" />
     <property role="3GE5qa" value="values" />
     <property role="TrG5h" value="ValueConverterRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1LliyakUE14" role="1TKVEi">
       <property role="IQ2ns" value="2041619518470135876" />
       <property role="20kJfa" value="valueConverter" />
@@ -814,7 +814,7 @@
     <property role="TrG5h" value="Dropdown" />
     <property role="34LRSv" value="dropdown" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2D6UMN6104X" role="PzmwI">
       <ref role="PrY4T" node="5KtU3pY9cIT" resolve="IPropertyWidget" />
     </node>
@@ -831,7 +831,7 @@
     <property role="TrG5h" value="ChoiceSpecifier" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="2D6UMN62NpD">
     <property role="EcuMT" value="3046380775496431209" />
@@ -851,7 +851,7 @@
     <property role="EcuMT" value="3046380775496462357" />
     <property role="TrG5h" value="ChoiceEntry" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2D6UMN62VAa" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -875,7 +875,7 @@
     <property role="TrG5h" value="ReferenceTargetChooser" />
     <property role="34LRSv" value="targetchooser" />
     <property role="3GE5qa" value="widgets" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="5KtU3pY8yh2" role="PzmwI">
       <ref role="PrY4T" node="5KtU3pYaMW3" resolve="IReferenceWidget" />
     </node>
@@ -907,7 +907,7 @@
     <property role="EcuMT" value="6637716746556371464" />
     <property role="TrG5h" value="NodeReferenceRef" />
     <property role="3GE5qa" value="util" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5KtU3pY9R89" role="1TKVEi">
       <property role="IQ2ns" value="6637716746556371465" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -953,7 +953,7 @@
     <property role="3GE5qa" value="layout" />
     <property role="TrG5h" value="Grid" />
     <property role="34LRSv" value="grid" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5KtU3pZ8Kft" role="1TKVEi">
       <property role="IQ2ns" value="6637716746572858333" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -975,7 +975,7 @@
     <property role="3GE5qa" value="layout" />
     <property role="TrG5h" value="GridItem" />
     <property role="34LRSv" value="item" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="5KtU3pZ8F1s" role="1TKVEl">
       <property role="IQ2nx" value="6637716746572836956" />
       <property role="TrG5h" value="cols" />
@@ -990,7 +990,7 @@
     <property role="3GE5qa" value="output" />
     <property role="TrG5h" value="ErrorLabel" />
     <property role="34LRSv" value="errorlabel" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1u3TjKPQ0qR" role="1TKVEi">
       <property role="IQ2ns" value="1694449931585586871" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -1007,7 +1007,7 @@
     <property role="3GE5qa" value="output" />
     <property role="TrG5h" value="ErrorReporting" />
     <property role="34LRSv" value="errorreporting" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="7$1mkeArAPS" role="PzmwI">
       <ref role="PrY4T" node="2vPZMAnIaRU" resolve="IContainerSingleComponent" />
     </node>
@@ -1052,7 +1052,7 @@
     <property role="EcuMT" value="6743690039082362463" />
     <property role="TrG5h" value="NodeFactory" />
     <property role="34LRSv" value="factory" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="5Qmp_LAY5BS" role="PzmwI">
       <ref role="PrY4T" to="8xo1:7GLg2tFqfT1" resolve="IReactComponent" />
     </node>
@@ -1085,7 +1085,7 @@
     <property role="EcuMT" value="6743690039083635727" />
     <property role="3GE5qa" value="util" />
     <property role="TrG5h" value="NodeChildRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5Qmp_LAUU8d" role="1TKVEi">
       <property role="IQ2ns" value="6743690039083639309" />
       <property role="20kJfa" value="child" />
@@ -1116,7 +1116,7 @@
     <property role="EcuMT" value="184368653051773198" />
     <property role="TrG5h" value="CreateDeleteRenderChild" />
     <property role="34LRSv" value="create-delete-render" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="af0_0CSvbY" role="PzmwI">
       <ref role="PrY4T" node="af0_0CSxPf" resolve="IChildWidget" />
     </node>
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.typesystem.mps b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.typesystem.mps
index 195371b6..51f0e4ee 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.typesystem.mps
+++ b/mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.typesystem.mps
@@ -532,7 +532,7 @@
       <node concept="3clFbJ" id="1LliyakXGga" role="3cqZAp">
         <node concept="2OqwBi" id="1LliyakXJcO" role="3clFbw">
           <node concept="37vLTw" id="1LliyakY5Kc" role="2Oq$k0">
-            <ref role="3cqZAo" node="1LliyakY5K8" resolve="valueConverter" />
+            <ref role="3cqZAo" node="1LliyakY5K8" resolve="vcr" />
           </node>
           <node concept="3w_OXm" id="1LliyakXJG7" role="2OqNvi" />
         </node>
@@ -590,7 +590,7 @@
               <node concept="mw_s8" id="1LliyakXY6P" role="1ZfhK$">
                 <node concept="2OqwBi" id="1LliyakXUYT" role="mwGJk">
                   <node concept="37vLTw" id="1LliyakY6oP" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1LliyakY6oL" resolve="valueConverter" />
+                    <ref role="3cqZAo" node="1LliyakY6oL" resolve="vc" />
                   </node>
                   <node concept="3TrEf2" id="1LliyakXVyA" role="2OqNvi">
                     <ref role="3Tt5mk" to="zaxg:1Lliyak$O3t" resolve="widgetType" />
@@ -603,7 +603,7 @@
               <node concept="mw_s8" id="1LliyakY1BP" role="1ZfhKB">
                 <node concept="2OqwBi" id="1LliyakY4x5" role="mwGJk">
                   <node concept="37vLTw" id="1LliyakY6oQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1LliyakY6oL" resolve="valueConverter" />
+                    <ref role="3cqZAo" node="1LliyakY6oL" resolve="vc" />
                   </node>
                   <node concept="3TrEf2" id="1LliyakY575" role="2OqNvi">
                     <ref role="3Tt5mk" to="zaxg:1Lliyak$Nuo" resolve="modelType" />
@@ -663,8 +663,8 @@
       <node concept="3clFbF" id="1LliyalaVzX" role="3cqZAp">
         <node concept="2OqwBi" id="1LliyalaVzU" role="3clFbG">
           <node concept="10M0yZ" id="1LliyalaVzV" role="2Oq$k0">
-            <ref role="1PxDUh" to="wyt6:~System" />
-            <ref role="3cqZAo" to="wyt6:~System.err" />
+            <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+            <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
           </node>
           <node concept="liA8E" id="1LliyalaVzW" role="2OqNvi">
             <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
diff --git a/mps/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl b/mps/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl
index 66c1d265..c528d858 100644
--- a/mps/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl
+++ b/mps/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/mps/modules/org.modelix.mps.react.stdlib/org.modelix.mps.react.stdlib.msd b/mps/modules/org.modelix.mps.react.stdlib/org.modelix.mps.react.stdlib.msd
index 285752ee..99b1130e 100644
--- a/mps/modules/org.modelix.mps.react.stdlib/org.modelix.mps.react.stdlib.msd
+++ b/mps/modules/org.modelix.mps.react.stdlib/org.modelix.mps.react.stdlib.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/mps/modules/org.modelix.mps.react/generator/templates/org.modelix.mps.react.generator.templates@generator.mps b/mps/modules/org.modelix.mps.react/generator/templates/org.modelix.mps.react.generator.templates@generator.mps
index d7c28503..a16bffb4 100644
--- a/mps/modules/org.modelix.mps.react/generator/templates/org.modelix.mps.react.generator.templates@generator.mps
+++ b/mps/modules/org.modelix.mps.react/generator/templates/org.modelix.mps.react.generator.templates@generator.mps
@@ -367,10 +367,6 @@
         <child id="1199569916463" name="body" index="1bW5cT" />
         <child id="3329300704499081622" name="returnType" index="3s52Nf" />
       </concept>
-      <concept id="1176743162354" name="jetbrains.mps.baseLanguageInternal.structure.InternalVariableReference" flags="nn" index="3VmV3z">
-        <property id="1176743296073" name="name" index="3VnrPo" />
-        <child id="1176743202636" name="type" index="3Vn4Tt" />
-      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1204851882688" name="jetbrains.mps.lang.smodel.structure.LinkRefQualifier" flags="ng" index="26LbJo">
@@ -1249,15 +1245,20 @@
                                       <node concept="1iwH7S" id="39MS3mR2mx$" role="2Oq$k0" />
                                       <node concept="1iwH70" id="39MS3mR2mx_" role="2OqNvi">
                                         <ref role="1iwH77" node="39MS3mQZj$7" resolve="componentBuilder" />
-                                        <node concept="2OqwBi" id="39MS3mR2mxA" role="1iwH7V">
-                                          <node concept="30H73N" id="39MS3mR2mxB" role="2Oq$k0" />
-                                          <node concept="2Xjw5R" id="39MS3mR2mxC" role="2OqNvi">
-                                            <node concept="1xMEDy" id="39MS3mR2mxD" role="1xVPHs">
-                                              <node concept="chp4Y" id="39MS3mR2mxE" role="ri$Ld">
-                                                <ref role="cht4Q" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
+                                        <node concept="2OqwBi" id="fDKzOGEP42" role="1iwH7V">
+                                          <node concept="2OqwBi" id="39MS3mR2mxA" role="2Oq$k0">
+                                            <node concept="30H73N" id="39MS3mR2mxB" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="39MS3mR2mxC" role="2OqNvi">
+                                              <node concept="1xMEDy" id="39MS3mR2mxD" role="1xVPHs">
+                                                <node concept="chp4Y" id="39MS3mR2mxE" role="ri$Ld">
+                                                  <ref role="cht4Q" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="2qgKlT" id="fDKzOGEPss" role="2OqNvi">
+                                            <ref role="37wK5l" to="zdk4:fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -1689,15 +1690,20 @@
                                       <node concept="1iwH7S" id="39MS3mR2npo" role="2Oq$k0" />
                                       <node concept="1iwH70" id="39MS3mR2npp" role="2OqNvi">
                                         <ref role="1iwH77" node="39MS3mQZj$7" resolve="componentBuilder" />
-                                        <node concept="2OqwBi" id="39MS3mR2npq" role="1iwH7V">
-                                          <node concept="30H73N" id="39MS3mR2npr" role="2Oq$k0" />
-                                          <node concept="2Xjw5R" id="39MS3mR2nps" role="2OqNvi">
-                                            <node concept="1xMEDy" id="39MS3mR2npt" role="1xVPHs">
-                                              <node concept="chp4Y" id="39MS3mR2npu" role="ri$Ld">
-                                                <ref role="cht4Q" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
+                                        <node concept="2OqwBi" id="fDKzOGEPK$" role="1iwH7V">
+                                          <node concept="2OqwBi" id="39MS3mR2npq" role="2Oq$k0">
+                                            <node concept="30H73N" id="39MS3mR2npr" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="39MS3mR2nps" role="2OqNvi">
+                                              <node concept="1xMEDy" id="39MS3mR2npt" role="1xVPHs">
+                                                <node concept="chp4Y" id="39MS3mR2npu" role="ri$Ld">
+                                                  <ref role="cht4Q" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="2qgKlT" id="fDKzOGEQ8X" role="2OqNvi">
+                                            <ref role="37wK5l" to="zdk4:fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -2090,15 +2096,20 @@
                                       <node concept="1iwH7S" id="39MS3mR2pjv" role="2Oq$k0" />
                                       <node concept="1iwH70" id="39MS3mR2pjw" role="2OqNvi">
                                         <ref role="1iwH77" node="39MS3mQZj$7" resolve="componentBuilder" />
-                                        <node concept="2OqwBi" id="39MS3mR2pjx" role="1iwH7V">
-                                          <node concept="30H73N" id="39MS3mR2pjy" role="2Oq$k0" />
-                                          <node concept="2Xjw5R" id="39MS3mR2pjz" role="2OqNvi">
-                                            <node concept="1xMEDy" id="39MS3mR2pj$" role="1xVPHs">
-                                              <node concept="chp4Y" id="39MS3mR2pj_" role="ri$Ld">
-                                                <ref role="cht4Q" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
+                                        <node concept="2OqwBi" id="fDKzOGEQrT" role="1iwH7V">
+                                          <node concept="2OqwBi" id="39MS3mR2pjx" role="2Oq$k0">
+                                            <node concept="30H73N" id="39MS3mR2pjy" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="39MS3mR2pjz" role="2OqNvi">
+                                              <node concept="1xMEDy" id="39MS3mR2pj$" role="1xVPHs">
+                                                <node concept="chp4Y" id="39MS3mR2pj_" role="ri$Ld">
+                                                  <ref role="cht4Q" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="2qgKlT" id="fDKzOGEQOi" role="2OqNvi">
+                                            <ref role="37wK5l" to="zdk4:fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -3303,15 +3314,20 @@
                               <node concept="1iwH7S" id="39MS3mReKQB" role="2Oq$k0" />
                               <node concept="1iwH70" id="39MS3mReLkG" role="2OqNvi">
                                 <ref role="1iwH77" node="39MS3mQZj$7" resolve="componentBuilder" />
-                                <node concept="2OqwBi" id="39MS3mReLSq" role="1iwH7V">
-                                  <node concept="30H73N" id="39MS3mReLD9" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="39MS3mReMaJ" role="2OqNvi">
-                                    <node concept="1xMEDy" id="39MS3mReMaL" role="1xVPHs">
-                                      <node concept="chp4Y" id="39MS3mReMie" role="ri$Ld">
-                                        <ref role="cht4Q" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
+                                <node concept="2OqwBi" id="fDKzOGER6E" role="1iwH7V">
+                                  <node concept="2OqwBi" id="39MS3mReLSq" role="2Oq$k0">
+                                    <node concept="30H73N" id="39MS3mReLD9" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="39MS3mReMaJ" role="2OqNvi">
+                                      <node concept="1xMEDy" id="39MS3mReMaL" role="1xVPHs">
+                                        <node concept="chp4Y" id="39MS3mReMie" role="ri$Ld">
+                                          <ref role="cht4Q" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="2qgKlT" id="fDKzOGERl3" role="2OqNvi">
+                                    <ref role="37wK5l" to="zdk4:fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -3493,37 +3509,49 @@
     </node>
     <node concept="3aamgX" id="425sFRq4Z7c" role="3acgRq">
       <ref role="30HIoZ" to="8xo1:425sFRq4c48" resolve="CustomAction" />
-      <node concept="gft3U" id="425sFRq58J2" role="1lVwrX">
-        <node concept="2YIFZM" id="425sFRq5jr2" role="gfFT$">
-          <ref role="37wK5l" to="r9la:~ComponentBuilderKt.buildJsonObject(kotlin.jvm.functions.Function1)" resolve="buildJsonObject" />
-          <ref role="1Pybhc" to="r9la:~ComponentBuilderKt" resolve="ComponentBuilderKt" />
-          <node concept="1bVj0M" id="425sFRpJIrx" role="37wK5m">
-            <node concept="gl6BB" id="425sFRpJIry" role="1bW2Oz">
-              <property role="TrG5h" value="actionObjectBuilder" />
-              <property role="3TUv4t" value="true" />
-              <node concept="2jxLKc" id="425sFRpJIrz" role="1tU5fm" />
+      <node concept="1Koe21" id="fDKzOGMSZU" role="1lVwrX">
+        <node concept="3clFbS" id="fDKzOGMSZY" role="1Koe22">
+          <node concept="3cpWs8" id="fDKzOGMZ6r" role="3cqZAp">
+            <node concept="3cpWsn" id="fDKzOGMZ6s" role="3cpWs9">
+              <property role="TrG5h" value="customHandlerBuilder" />
+              <node concept="3uibUv" id="fDKzOGMZ6t" role="1tU5fm">
+                <ref role="3uigEE" to="r9la:~ICustomHandlerBuilder" resolve="ICustomHandlerBuilder" />
+              </node>
             </node>
-            <node concept="3clFbS" id="425sFRpJIr$" role="1bW5cS">
-              <node concept="3clFbF" id="425sFRpJIr_" role="3cqZAp">
-                <node concept="2OqwBi" id="425sFRpJIrA" role="3clFbG">
-                  <node concept="37vLTw" id="425sFRpJIrB" role="2Oq$k0">
-                    <ref role="3cqZAo" node="425sFRpJIry" resolve="actionObjectBuilder" />
-                  </node>
-                  <node concept="liA8E" id="425sFRpJIrC" role="2OqNvi">
-                    <ref role="37wK5l" to="r9la:~JsonObjectBuilder.property(java.lang.String,java.lang.String)" resolve="property" />
-                    <node concept="Xl_RD" id="425sFRpJIrD" role="37wK5m">
-                      <property role="Xl_RC" value="label" />
-                    </node>
-                    <node concept="Xl_RD" id="425sFRpJIrE" role="37wK5m">
-                      <node concept="29HgVG" id="425sFRq5ouH" role="lGtFl">
-                        <node concept="3NFfHV" id="425sFRq5ouI" role="3NFExx">
-                          <node concept="3clFbS" id="425sFRq5ouJ" role="2VODD2">
-                            <node concept="3clFbF" id="425sFRq5ouP" role="3cqZAp">
-                              <node concept="2OqwBi" id="425sFRq5ouK" role="3clFbG">
-                                <node concept="3TrEf2" id="425sFRq5ouN" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="8xo1:425sFRq4c49" resolve="label" />
+          </node>
+          <node concept="3clFbF" id="fDKzOGMT01" role="3cqZAp">
+            <node concept="2YIFZM" id="425sFRq5jr2" role="3clFbG">
+              <ref role="37wK5l" to="r9la:~ComponentBuilderKt.buildJsonObject(kotlin.jvm.functions.Function1)" resolve="buildJsonObject" />
+              <ref role="1Pybhc" to="r9la:~ComponentBuilderKt" resolve="ComponentBuilderKt" />
+              <node concept="1bVj0M" id="425sFRpJIrx" role="37wK5m">
+                <node concept="gl6BB" id="425sFRpJIry" role="1bW2Oz">
+                  <property role="TrG5h" value="actionObjectBuilder" />
+                  <property role="3TUv4t" value="true" />
+                  <node concept="2jxLKc" id="425sFRpJIrz" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="425sFRpJIr$" role="1bW5cS">
+                  <node concept="3clFbF" id="425sFRpJIr_" role="3cqZAp">
+                    <node concept="2OqwBi" id="425sFRpJIrA" role="3clFbG">
+                      <node concept="37vLTw" id="425sFRpJIrB" role="2Oq$k0">
+                        <ref role="3cqZAo" node="425sFRpJIry" resolve="actionObjectBuilder" />
+                      </node>
+                      <node concept="liA8E" id="425sFRpJIrC" role="2OqNvi">
+                        <ref role="37wK5l" to="r9la:~JsonObjectBuilder.property(java.lang.String,java.lang.String)" resolve="property" />
+                        <node concept="Xl_RD" id="425sFRpJIrD" role="37wK5m">
+                          <property role="Xl_RC" value="label" />
+                        </node>
+                        <node concept="Xl_RD" id="425sFRpJIrE" role="37wK5m">
+                          <node concept="29HgVG" id="425sFRq5ouH" role="lGtFl">
+                            <node concept="3NFfHV" id="425sFRq5ouI" role="3NFExx">
+                              <node concept="3clFbS" id="425sFRq5ouJ" role="2VODD2">
+                                <node concept="3clFbF" id="425sFRq5ouP" role="3cqZAp">
+                                  <node concept="2OqwBi" id="425sFRq5ouK" role="3clFbG">
+                                    <node concept="3TrEf2" id="425sFRq5ouN" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="8xo1:425sFRq4c49" resolve="label" />
+                                    </node>
+                                    <node concept="30H73N" id="425sFRq5ouO" role="2Oq$k0" />
+                                  </node>
                                 </node>
-                                <node concept="30H73N" id="425sFRq5ouO" role="2Oq$k0" />
                               </node>
                             </node>
                           </node>
@@ -3531,118 +3559,146 @@
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="425sFRpJIrG" role="3cqZAp">
-                <node concept="3cpWsn" id="425sFRpJIrH" role="3cpWs9">
-                  <property role="TrG5h" value="handler" />
-                  <node concept="3uibUv" id="425sFRpJIrI" role="1tU5fm">
-                    <ref role="3uigEE" to="r9la:~JsCode" resolve="JsCode" />
-                  </node>
-                  <node concept="2OqwBi" id="425sFRpJIrJ" role="33vP2m">
-                    <node concept="1eOMI4" id="425sFRpJIrK" role="2Oq$k0">
-                      <node concept="3VmV3z" id="425sFRpNG72" role="1eOMHV">
-                        <property role="3VnrPo" value="customHandlerBuilder" />
-                        <node concept="3uibUv" id="425sFRpNG73" role="3Vn4Tt">
-                          <ref role="3uigEE" to="r9la:~ICustomHandlerBuilder" resolve="ICustomHandlerBuilder" />
-                        </node>
+                  <node concept="3cpWs8" id="425sFRpJIrG" role="3cqZAp">
+                    <node concept="3cpWsn" id="425sFRpJIrH" role="3cpWs9">
+                      <property role="TrG5h" value="handler" />
+                      <node concept="3uibUv" id="425sFRpJIrI" role="1tU5fm">
+                        <ref role="3uigEE" to="r9la:~JsCode" resolve="JsCode" />
                       </node>
-                    </node>
-                    <node concept="liA8E" id="425sFRpJIrN" role="2OqNvi">
-                      <ref role="37wK5l" to="r9la:~ICustomHandlerBuilder.buildCustomHandler(kotlin.jvm.functions.Function1,org.modelix.react.ssr.server.ICustomMessageHandler)" resolve="buildCustomHandler" />
-                      <node concept="1bVj0M" id="425sFRpJIrO" role="37wK5m">
-                        <node concept="gl6BB" id="425sFRpJIrP" role="1bW2Oz">
-                          <property role="TrG5h" value="_this5" />
-                          <node concept="2jxLKc" id="425sFRpJIrQ" role="1tU5fm" />
-                        </node>
-                        <node concept="3clFbS" id="425sFRpJIrR" role="1bW5cS">
-                          <node concept="3cpWs6" id="425sFRpJIrS" role="3cqZAp">
-                            <node concept="10M0yZ" id="425sFRpJIrT" role="3cqZAk">
-                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
-                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                      <node concept="2OqwBi" id="425sFRpJIrJ" role="33vP2m">
+                        <node concept="37vLTw" id="fDKzOGN9ZU" role="2Oq$k0">
+                          <ref role="3cqZAo" node="fDKzOGMZ6s" resolve="customHandlerBuilder" />
+                          <node concept="1ZhdrF" id="fDKzOGNby$" role="lGtFl">
+                            <property role="2qtEX8" value="variableDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                            <node concept="3$xsQk" id="fDKzOGNby_" role="3$ytzL">
+                              <node concept="3clFbS" id="fDKzOGNbyA" role="2VODD2">
+                                <node concept="3clFbF" id="fDKzOGNbKr" role="3cqZAp">
+                                  <node concept="2OqwBi" id="fDKzOGNcdp" role="3clFbG">
+                                    <node concept="1iwH7S" id="fDKzOGNbKq" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="fDKzOGNcyo" role="2OqNvi">
+                                      <ref role="1iwH77" node="39MS3mQZj$7" resolve="componentBuilder" />
+                                      <node concept="2OqwBi" id="fDKzOGNgkw" role="1iwH7V">
+                                        <node concept="2OqwBi" id="fDKzOGNdD1" role="2Oq$k0">
+                                          <node concept="30H73N" id="fDKzOGNd6g" role="2Oq$k0" />
+                                          <node concept="2Xjw5R" id="fDKzOGNfzS" role="2OqNvi">
+                                            <node concept="1xMEDy" id="fDKzOGNfzU" role="1xVPHs">
+                                              <node concept="chp4Y" id="fDKzOGNfOr" role="ri$Ld">
+                                                <ref role="cht4Q" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="2qgKlT" id="fDKzOGNibA" role="2OqNvi">
+                                          <ref role="37wK5l" to="zdk4:fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="2ShNRf" id="425sFRpJIrU" role="37wK5m">
-                        <node concept="YeOm9" id="425sFRpJIrV" role="2ShVmc">
-                          <node concept="1Y3b0j" id="425sFRpJIrW" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <property role="373rjd" value="true" />
-                            <ref role="1Y3XeK" to="r9la:~ICustomMessageHandler" resolve="ICustomMessageHandler" />
-                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                            <node concept="3Tm1VV" id="425sFRpJIrX" role="1B3o_S" />
-                            <node concept="3clFb_" id="425sFRpJIrY" role="jymVt">
-                              <property role="TrG5h" value="handle" />
-                              <node concept="3Tm1VV" id="425sFRpJIrZ" role="1B3o_S" />
-                              <node concept="3cqZAl" id="425sFRpJIs0" role="3clF45" />
-                              <node concept="37vLTG" id="425sFRpJIs1" role="3clF46">
-                                <property role="TrG5h" value="params" />
-                                <node concept="3uibUv" id="425sFRpJIs2" role="1tU5fm">
-                                  <ref role="3uigEE" to="r9la:~ICustomMessageHandlerParameters" resolve="ICustomMessageHandlerParameters" />
-                                </node>
-                                <node concept="2AHcQZ" id="425sFRpJIs3" role="2AJF6D">
-                                  <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                        <node concept="liA8E" id="425sFRpJIrN" role="2OqNvi">
+                          <ref role="37wK5l" to="r9la:~ICustomHandlerBuilder.buildCustomHandler(kotlin.jvm.functions.Function1,org.modelix.react.ssr.server.ICustomMessageHandler)" resolve="buildCustomHandler" />
+                          <node concept="1bVj0M" id="425sFRpJIrO" role="37wK5m">
+                            <node concept="gl6BB" id="425sFRpJIrP" role="1bW2Oz">
+                              <property role="TrG5h" value="_this5" />
+                              <node concept="2jxLKc" id="425sFRpJIrQ" role="1tU5fm" />
+                            </node>
+                            <node concept="3clFbS" id="425sFRpJIrR" role="1bW5cS">
+                              <node concept="3cpWs6" id="425sFRpJIrS" role="3cqZAp">
+                                <node concept="10M0yZ" id="425sFRpJIrT" role="3cqZAk">
+                                  <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                                  <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                                 </node>
                               </node>
-                              <node concept="3clFbS" id="425sFRpJIs4" role="3clF47">
-                                <node concept="3clFbH" id="425sFRq5qoi" role="3cqZAp">
-                                  <node concept="2b32R4" id="425sFRq5qxo" role="lGtFl">
-                                    <node concept="3JmXsc" id="425sFRq5qxr" role="2P8S$">
-                                      <node concept="3clFbS" id="425sFRq5qxs" role="2VODD2">
-                                        <node concept="3clFbF" id="425sFRq5qUK" role="3cqZAp">
-                                          <node concept="2OqwBi" id="425sFRq5ssV" role="3clFbG">
-                                            <node concept="2OqwBi" id="425sFRq5rot" role="2Oq$k0">
-                                              <node concept="30H73N" id="425sFRq5qUJ" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="425sFRq5rYC" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="8xo1:425sFRq4c4b" resolve="body" />
+                            </node>
+                          </node>
+                          <node concept="2ShNRf" id="425sFRpJIrU" role="37wK5m">
+                            <node concept="YeOm9" id="425sFRpJIrV" role="2ShVmc">
+                              <node concept="1Y3b0j" id="425sFRpJIrW" role="YeSDq">
+                                <property role="2bfB8j" value="true" />
+                                <property role="373rjd" value="true" />
+                                <ref role="1Y3XeK" to="r9la:~ICustomMessageHandler" resolve="ICustomMessageHandler" />
+                                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                                <node concept="3Tm1VV" id="425sFRpJIrX" role="1B3o_S" />
+                                <node concept="3clFb_" id="425sFRpJIrY" role="jymVt">
+                                  <property role="TrG5h" value="handle" />
+                                  <node concept="3Tm1VV" id="425sFRpJIrZ" role="1B3o_S" />
+                                  <node concept="3cqZAl" id="425sFRpJIs0" role="3clF45" />
+                                  <node concept="37vLTG" id="425sFRpJIs1" role="3clF46">
+                                    <property role="TrG5h" value="params" />
+                                    <node concept="3uibUv" id="425sFRpJIs2" role="1tU5fm">
+                                      <ref role="3uigEE" to="r9la:~ICustomMessageHandlerParameters" resolve="ICustomMessageHandlerParameters" />
+                                    </node>
+                                    <node concept="2AHcQZ" id="425sFRpJIs3" role="2AJF6D">
+                                      <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbS" id="425sFRpJIs4" role="3clF47">
+                                    <node concept="3clFbH" id="425sFRq5qoi" role="3cqZAp">
+                                      <node concept="2b32R4" id="425sFRq5qxo" role="lGtFl">
+                                        <node concept="3JmXsc" id="425sFRq5qxr" role="2P8S$">
+                                          <node concept="3clFbS" id="425sFRq5qxs" role="2VODD2">
+                                            <node concept="3clFbF" id="425sFRq5qUK" role="3cqZAp">
+                                              <node concept="2OqwBi" id="425sFRq5ssV" role="3clFbG">
+                                                <node concept="2OqwBi" id="425sFRq5rot" role="2Oq$k0">
+                                                  <node concept="30H73N" id="425sFRq5qUJ" role="2Oq$k0" />
+                                                  <node concept="3TrEf2" id="425sFRq5rYC" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="8xo1:425sFRq4c4b" resolve="body" />
+                                                  </node>
+                                                </node>
+                                                <node concept="3Tsc0h" id="425sFRq5t3w" role="2OqNvi">
+                                                  <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                                </node>
                                               </node>
                                             </node>
-                                            <node concept="3Tsc0h" id="425sFRq5t3w" role="2OqNvi">
-                                              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                            </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="2AHcQZ" id="425sFRpJIs9" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="2AHcQZ" id="425sFRpJIs9" role="2AJF6D">
-                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="425sFRpJIsa" role="3cqZAp">
-                <node concept="2OqwBi" id="425sFRpJIsb" role="3clFbG">
-                  <node concept="37vLTw" id="425sFRpJIsc" role="2Oq$k0">
-                    <ref role="3cqZAo" node="425sFRpJIry" resolve="actionObjectBuilder" />
-                  </node>
-                  <node concept="liA8E" id="425sFRpJIsd" role="2OqNvi">
-                    <ref role="37wK5l" to="r9la:~JsonObjectBuilder.property(java.lang.String,org.modelix.react.ssr.server.JsCode)" resolve="property" />
-                    <node concept="Xl_RD" id="425sFRpJIse" role="37wK5m">
-                      <property role="Xl_RC" value="action" />
+                  <node concept="3clFbF" id="425sFRpJIsa" role="3cqZAp">
+                    <node concept="2OqwBi" id="425sFRpJIsb" role="3clFbG">
+                      <node concept="37vLTw" id="425sFRpJIsc" role="2Oq$k0">
+                        <ref role="3cqZAo" node="425sFRpJIry" resolve="actionObjectBuilder" />
+                      </node>
+                      <node concept="liA8E" id="425sFRpJIsd" role="2OqNvi">
+                        <ref role="37wK5l" to="r9la:~JsonObjectBuilder.property(java.lang.String,org.modelix.react.ssr.server.JsCode)" resolve="property" />
+                        <node concept="Xl_RD" id="425sFRpJIse" role="37wK5m">
+                          <property role="Xl_RC" value="action" />
+                        </node>
+                        <node concept="37vLTw" id="425sFRpJIsf" role="37wK5m">
+                          <ref role="3cqZAo" node="425sFRpJIrH" resolve="handler" />
+                        </node>
+                      </node>
                     </node>
-                    <node concept="37vLTw" id="425sFRpJIsf" role="37wK5m">
-                      <ref role="3cqZAo" node="425sFRpJIrH" resolve="handler" />
+                  </node>
+                  <node concept="3cpWs6" id="425sFRpJIsi" role="3cqZAp">
+                    <node concept="10M0yZ" id="425sFRpJIsj" role="3cqZAk">
+                      <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                      <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs6" id="425sFRpJIsi" role="3cqZAp">
-                <node concept="10M0yZ" id="425sFRpJIsj" role="3cqZAk">
-                  <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
-                  <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
-                </node>
-              </node>
+              <node concept="raruj" id="fDKzOGN_ea" role="lGtFl" />
             </node>
           </node>
+          <node concept="3clFbH" id="fDKzOGMT00" role="3cqZAp" />
         </node>
       </node>
     </node>
@@ -3715,7 +3771,7 @@
     </node>
     <node concept="2rT7sh" id="39MS3mQZj$7" role="2rTMjI">
       <property role="TrG5h" value="componentBuilder" />
-      <ref role="2rTdP9" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
+      <ref role="2rTdP9" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
       <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
     </node>
     <node concept="3lhOvk" id="39MS3mQn5PW" role="3lj3bC">
@@ -4304,6 +4360,9 @@
                           <property role="TrG5h" value="customHandlerBuilder" />
                           <property role="3TUv4t" value="true" />
                           <node concept="2jxLKc" id="2B4$FFbE$yr" role="1tU5fm" />
+                          <node concept="2ZBi8u" id="fDKzOGBf4j" role="lGtFl">
+                            <ref role="2rW$FS" node="39MS3mQZj$7" resolve="componentBuilder" />
+                          </node>
                         </node>
                         <node concept="3clFbS" id="2B4$FFbE$ys" role="1bW5cS">
                           <node concept="3clFbJ" id="2B4$FFbE$yu" role="3cqZAp">
diff --git a/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.behavior.mps b/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.behavior.mps
index 0e2d96f3..18ef76e9 100644
--- a/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.behavior.mps
+++ b/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.behavior.mps
@@ -140,6 +140,7 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
@@ -618,5 +619,54 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="fDKzOGEzgd">
+    <ref role="13h7C2" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+    <node concept="13i0hz" id="fDKzOGEzgw" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getActualCustomHandlerBuilder" />
+      <node concept="3Tm1VV" id="fDKzOGEzgx" role="1B3o_S" />
+      <node concept="3Tqbb2" id="fDKzOGEzgO" role="3clF45">
+        <ref role="ehGHo" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+      </node>
+      <node concept="3clFbS" id="fDKzOGEzgz" role="3clF47">
+        <node concept="3cpWs6" id="fDKzOGEzjM" role="3cqZAp">
+          <node concept="13iPFW" id="fDKzOGEzjO" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="fDKzOGEzge" role="13h7CW">
+      <node concept="3clFbS" id="fDKzOGEzgf" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="fDKzOGEzkg">
+    <property role="3GE5qa" value="incrementalFunction" />
+    <ref role="13h7C2" to="8xo1:1hCkroLrV87" resolve="IncrementalPolymorhpicFunctionOverload" />
+    <node concept="13hLZK" id="fDKzOGEzkh" role="13h7CW">
+      <node concept="3clFbS" id="fDKzOGEzki" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="fDKzOGEzk_" role="13h7CS">
+      <property role="TrG5h" value="getActualCustomHandlerBuilder" />
+      <ref role="13i0hy" node="fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+      <node concept="3Tm1VV" id="fDKzOGEzkA" role="1B3o_S" />
+      <node concept="3clFbS" id="fDKzOGEzkF" role="3clF47">
+        <node concept="3cpWs6" id="fDKzOGEzvF" role="3cqZAp">
+          <node concept="2OqwBi" id="fDKzOGEAad" role="3cqZAk">
+            <node concept="2OqwBi" id="fDKzOGEzJC" role="2Oq$k0">
+              <node concept="13iPFW" id="fDKzOGEzw6" role="2Oq$k0" />
+              <node concept="3TrEf2" id="fDKzOGE_CA" role="2OqNvi">
+                <ref role="3Tt5mk" to="8xo1:1hCkroLrV8C" resolve="overloaded" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="fDKzOGEAPA" role="2OqNvi">
+              <ref role="37wK5l" node="fDKzOGEzgw" resolve="getActualCustomHandlerBuilder" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="fDKzOGEzkG" role="3clF45">
+        <ref role="ehGHo" to="8xo1:fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.structure.mps b/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.structure.mps
index 023ec571..91763593 100644
--- a/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.structure.mps
+++ b/mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.structure.mps
@@ -134,6 +134,9 @@
     <node concept="PrWs8" id="6Ddb4_fOXV5" role="PzmwI">
       <ref role="PrY4T" to="tpck:3fifI_xCcJN" resolve="ScopeProvider" />
     </node>
+    <node concept="PrWs8" id="fDKzOGAxnW" role="PzmwI">
+      <ref role="PrY4T" node="fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+    </node>
   </node>
   <node concept="1TIwiD" id="7GLg2tFrlnd">
     <property role="EcuMT" value="8876946878574187981" />
@@ -737,6 +740,9 @@
     <node concept="PrWs8" id="1hCkroLrV8e" role="PzmwI">
       <ref role="PrY4T" node="7GLg2tFqfQG" resolve="IReactModuleContent" />
     </node>
+    <node concept="PrWs8" id="fDKzOGAvlL" role="PzmwI">
+      <ref role="PrY4T" node="fDKzOGAvlK" resolve="IGeneratesCustomHandlerBuilder" />
+    </node>
   </node>
   <node concept="1TIwiD" id="1hCkroLrV8u">
     <property role="EcuMT" value="1470515121291768350" />
@@ -842,5 +848,9 @@
       <ref role="PrY4T" node="7GLg2tFqfQG" resolve="IReactModuleContent" />
     </node>
   </node>
+  <node concept="PlHQZ" id="fDKzOGAvlK">
+    <property role="EcuMT" value="281970019684447600" />
+    <property role="TrG5h" value="IGeneratesCustomHandlerBuilder" />
+  </node>
 </model>
 
diff --git a/mps/modules/org.modelix.mps.react/org.modelix.mps.react.mpl b/mps/modules/org.modelix.mps.react/org.modelix.mps.react.mpl
index e554a315..545712be 100644
--- a/mps/modules/org.modelix.mps.react/org.modelix.mps.react.mpl
+++ b/mps/modules/org.modelix.mps.react/org.modelix.mps.react.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
diff --git a/mps/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd b/mps/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd
index 706bd1a8..3f6e258d 100644
--- a/mps/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd
+++ b/mps/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/mps/modules/org.modelix.mps.spreadsheets/models/org.modelix.mps.spreadsheets.modelix.mps b/mps/modules/org.modelix.mps.spreadsheets/models/org.modelix.mps.spreadsheets.modelix.mps
index c327348f..74d1da54 100644
--- a/mps/modules/org.modelix.mps.spreadsheets/models/org.modelix.mps.spreadsheets.modelix.mps
+++ b/mps/modules/org.modelix.mps.spreadsheets/models/org.modelix.mps.spreadsheets.modelix.mps
@@ -60,7 +60,7 @@
       </concept>
       <concept id="8876946878573903262" name="org.modelix.mps.react.structure.ConceptRenderer" flags="ng" index="gmrQT">
         <reference id="8310867745953086698" name="concept" index="3JBHV4" />
-        <child id="8876946878573903455" name="component" index="gmrTS" />
+        <child id="8876946878573903455" name="components" index="gmrTS" />
       </concept>
       <concept id="8876946878573903439" name="org.modelix.mps.react.structure.GenericReactComponent" flags="ng" index="gmrTC">
         <property id="8876946878573977569" name="componentType" index="gmPZ6" />
diff --git a/mps/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl b/mps/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl
index b6ed9aaf..30a2cf1e 100644
--- a/mps/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl
+++ b/mps/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
@@ -77,7 +77,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l: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:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="13" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
diff --git a/mps/modules/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
index 43489030..fcbe5d08 100644
--- a/mps/modules/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
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/mps/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd b/mps/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd
index e0e83d26..20b58d3c 100644
--- a/mps/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd
+++ b/mps/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/projectional-editor-ssr-mps-languages/build.gradle.kts b/projectional-editor-ssr-mps-languages/build.gradle.kts
index b2b47a4f..6acf5f05 100644
--- a/projectional-editor-ssr-mps-languages/build.gradle.kts
+++ b/projectional-editor-ssr-mps-languages/build.gradle.kts
@@ -82,7 +82,7 @@ intellij {
 tasks {
     patchPluginXml {
         sinceBuild.set("232")
-        untilBuild.set("233.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {
diff --git a/projectional-editor-ssr-mps/build.gradle.kts b/projectional-editor-ssr-mps/build.gradle.kts
index 53a60e06..82d22f34 100644
--- a/projectional-editor-ssr-mps/build.gradle.kts
+++ b/projectional-editor-ssr-mps/build.gradle.kts
@@ -51,7 +51,7 @@ intellij {
 tasks {
     patchPluginXml {
         sinceBuild.set("232")
-        untilBuild.set("233.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {
diff --git a/react-ssr-mps/build.gradle.kts b/react-ssr-mps/build.gradle.kts
index 3d98e156..e3dda7b4 100644
--- a/react-ssr-mps/build.gradle.kts
+++ b/react-ssr-mps/build.gradle.kts
@@ -43,7 +43,7 @@ kotlin {
 tasks {
     patchPluginXml {
         sinceBuild.set("232")
-        untilBuild.set("233.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {