From 4fc5df304029179df2b71782f3897dd5eb059e97 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sascha.lisson@itemis.de>
Date: Wed, 23 Oct 2024 09:01:15 +0200
Subject: [PATCH] fix: generate to java instead of kotlin

It's simpler and more stable.
We have to reduce the complexity of the project and will focus on the
server side version of the editor first.
---
 editor-common-mps/build.gradle.kts            |   13 +-
 mps/.mps/modules.xml                          |    2 -
 mps/build.gradle.kts                          |    4 -
 ...e2kotlin.generator.templates@generator.mps | 1184 ------
 ...delix.mps.baseLanguage2kotlin.behavior.mps |   12 -
 ...ix.mps.baseLanguage2kotlin.constraints.mps |   19 -
 ...modelix.mps.baseLanguage2kotlin.editor.mps |  114 -
 ...elix.mps.baseLanguage2kotlin.structure.mps |   99 -
 ...odelix.mps.baseLanguage2kotlin.textGen.mps |   68 -
 ...lix.mps.baseLanguage2kotlin.typesystem.mps |   11 -
 .../org.modelix.mps.baseLanguage2kotlin.mpl   |  157 -
 ...deKotlin.generator.templates@generator.mps |  380 --
 ....mps.baseLanguageInsideKotlin.behavior.mps |   12 -
 ...s.baseLanguageInsideKotlin.constraints.mps |   19 -
 ...ix.mps.baseLanguageInsideKotlin.editor.mps |  109 -
 ...mps.baseLanguageInsideKotlin.structure.mps |   78 -
 ...ps.baseLanguageInsideKotlin.typesystem.mps |   11 -
 ...g.modelix.mps.baseLanguageInsideKotlin.mpl |  129 -
 ...mps.notation.impl.baseLanguage.modelix.mps |   77 +-
 ...modelix.mps.notation.impl.baseLanguage.msd |    3 +-
 ...notation.generator.templates@generator.mps | 3414 ++++++++++-------
 .../org.modelix.mps.notation.structure.mps    |   10 +-
 .../org.modelix.mps.notation.mpl              |   18 +-
 ...rg.modelix.mps.react.impl.baseLanguage.msd |    3 -
 .../org.modelix.mps.react.mpl                 |    6 -
 .../org.modelix.mps.spreadsheets.notation.msd |    2 -
 ...x.mps.spreadsheets.sandbox.permissions.mps |   39 +-
 .../org.modelix.mps.spreadsheets.modelix.mps  |   17 +-
 .../org.modelix.mps.spreadsheets.mpl          |    4 -
 .../org.modelix.mps.webaspect.devkit.devkit   |    5 +-
 .../org.modelix.mps.webaspect.genplan.mps     |   42 +-
 .../build.gradle.kts                          |    2 +-
 .../editor/ssr/mps/BaseLanguageTests.kt       |    4 +-
 projectional-editor-ssr-mps/build.gradle.kts  |    9 +-
 .../org/modelix/editor/CellTemplateBuilder.kt |    2 +-
 react-ssr-mps/build.gradle.kts                |    8 +-
 36 files changed, 2096 insertions(+), 3990 deletions(-)
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/generator/templates/org.modelix.mps.baseLanguageInsideKotlin.generator.templates@generator.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.behavior.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.constraints.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.editor.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.structure.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.typesystem.mps
 delete mode 100644 mps/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl

diff --git a/editor-common-mps/build.gradle.kts b/editor-common-mps/build.gradle.kts
index 618370fd..2e9d283e 100644
--- a/editor-common-mps/build.gradle.kts
+++ b/editor-common-mps/build.gradle.kts
@@ -91,18 +91,19 @@ tasks {
                 outputFolder(defaultDestinationDir.get().resolve(project.name).resolve("languages"))
                 runtimeJars.forEach {
                     javaJar(it.name)
-                    kotlinJar(it.name)
+//                    kotlinJar(it.name)
                 }
-                kotlinJarFromMPS("util-8.jar")
+//                kotlinJarFromMPS("util-8.jar")
                 javaJarFromMPS("util-8.jar")
-                kotlinJarFromMPS("annotations.jar")
+//                kotlinJarFromMPS("annotations.jar")
                 moduleDependency(KnownModuleIds.Annotations)
                 moduleDependency(KnownModuleIds.JDK)
                 moduleDependency(KnownModuleIds.MPS_OpenAPI)
+                moduleDependency(KnownModuleIds.MPS_Core)
                 moduleDependency(KnownModuleIds.MPS_IDEA)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
             }
         }
     }
diff --git a/mps/.mps/modules.xml b/mps/.mps/modules.xml
index b7eeb653..7efe609e 100644
--- a/mps/.mps/modules.xml
+++ b/mps/.mps/modules.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl" folder="text" />
-      <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl" folder="text" />
       <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="text" />
       <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="text" />
       <modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd" folder="react" />
diff --git a/mps/build.gradle.kts b/mps/build.gradle.kts
index 2d0f8f34..c84e7425 100644
--- a/mps/build.gradle.kts
+++ b/mps/build.gradle.kts
@@ -21,15 +21,11 @@ mpsBuild {
     publication("editor-languages") {
         module("org.modelix.mps.webaspect.devkit")
         module("org.modelix.mps.webaspect.genplan")
-        module("org.modelix.mps.baseLanguage2kotlin")
         module("org.modelix.mps.notation")
     }
     publication("baseLanguage-notation") {
         module("org.modelix.mps.notation.impl.baseLanguage")
     }
-    publication("baseLanguageInsideKotlin") {
-        module("org.modelix.mps.baseLanguageInsideKotlin")
-    }
     publication("react") {
         module("org.modelix.mps.react")
     }
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
deleted file mode 100644
index bad5e878..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/generator/templates/org.modelix.mps.baseLanguage2kotlin.generator.templates@generator.mps
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3b27528f-eecf-4c0d-9a30-81f919d10a0e(org.modelix.mps.baseLanguage2kotlin.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
-    <use id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin" version="11" />
-    <use id="b17a9ec8-44a5-40a1-9216-058d277424eb" name="jetbrains.mps.kotlin.internal" version="0" />
-    <use id="eb56ebf4-df56-438e-af06-fc1cd08b495a" name="jetbrains.mps.kotlin.smodel" version="0" />
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="ya4x" ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
-    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
-    <import index="b15i" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/kotlinJvm:org.modelix.model.api(org.modelix.mps.editor.common.stubs/)" />
-    <import index="1g18" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/kotlinJvm:org.modelix.model.mpsadapters(org.modelix.mps.editor.common.stubs/)" />
-    <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
-    <import index="2k9e" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure(MPS.Core/)" />
-    <import index="e8bb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.ids(MPS.Core/)" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
-    <import index="dbfy" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/kotlinJvm:org.modelix.editor(org.modelix.mps.editor.ssr.stubs/)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
-    </language>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-      </concept>
-      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
-        <child id="1177093586806" name="templateNode" index="gfFT$" />
-      </concept>
-      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
-      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
-      </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
-        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
-      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
-      <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
-        <child id="1194989344771" name="alternativeConsequence" index="UU_$l" />
-        <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
-      </concept>
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
-        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
-      </concept>
-    </language>
-    <language id="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0" name="jetbrains.mps.kotlin.javaRefs">
-      <concept id="2420378304458348492" name="jetbrains.mps.kotlin.javaRefs.structure.JavaMethodCall" flags="ng" index="2yQVVM">
-        <reference id="2420378304458348798" name="method" index="2yQV70" />
-      </concept>
-      <concept id="7565185111013327093" name="jetbrains.mps.kotlin.javaRefs.structure.JavaClassType" flags="ng" index="2EYIWN">
-        <reference id="7565185111013327225" name="javaClass" index="2EYIUZ" />
-      </concept>
-    </language>
-    <language id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin">
-      <concept id="1243006380186881759" name="jetbrains.mps.kotlin.structure.BinaryExpression" flags="ng" index="21PklC">
-        <child id="1243006380186881762" name="right" index="21Pkll" />
-        <child id="1243006380186881760" name="left" index="21Pkln" />
-      </concept>
-      <concept id="1243006380186890016" name="jetbrains.mps.kotlin.structure.UnaryExpression" flags="ng" index="21Pmin">
-        <child id="1243006380186890019" name="operand" index="21Pmik" />
-      </concept>
-      <concept id="1243006380186886597" name="jetbrains.mps.kotlin.structure.ElvisOperator" flags="ng" index="21PmDM" />
-      <concept id="1243006380188575965" name="jetbrains.mps.kotlin.structure.StringLiteralRaw" flags="ng" index="21VMdE">
-        <property id="1243006380188575966" name="content" index="21VMdD" />
-      </concept>
-      <concept id="6389031306614148912" name="jetbrains.mps.kotlin.structure.StringLiteralLine" flags="ng" index="Df6$J">
-        <child id="6389031306614152501" name="parts" index="Df7GE" />
-      </concept>
-      <concept id="6565639133219057675" name="jetbrains.mps.kotlin.structure.IArguments" flags="ngI" index="TWioa">
-        <child id="6565639133219057676" name="arguments" index="TWiod" />
-      </concept>
-      <concept id="5533310174484620657" name="jetbrains.mps.kotlin.structure.VariableRefExpression" flags="ng" index="UZU4S">
-        <reference id="5533310174484620658" name="target" index="UZU4V" />
-      </concept>
-      <concept id="4662566628538082515" name="jetbrains.mps.kotlin.structure.FunctionCallTarget" flags="ng" index="1NbEtQ" />
-      <concept id="4662566628538083705" name="jetbrains.mps.kotlin.structure.FunctionCallExpression" flags="ng" index="1NbEFs" />
-      <concept id="6664176324866782072" name="jetbrains.mps.kotlin.structure.IClassReference" flags="ngI" index="1SePDR">
-        <reference id="6664176324866782075" name="class" index="1SePDO" />
-      </concept>
-      <concept id="2936055411798373584" name="jetbrains.mps.kotlin.structure.IExpression" flags="ngI" index="1XD087" />
-      <concept id="2936055411798373599" name="jetbrains.mps.kotlin.structure.ClassType" flags="ng" index="1XD088" />
-      <concept id="2936055411798373627" name="jetbrains.mps.kotlin.structure.StringLiteral" flags="ng" index="1XD08G">
-        <child id="6389031306614148417" name="lines" index="Df6Hu" />
-      </concept>
-      <concept id="2936055411798373456" name="jetbrains.mps.kotlin.structure.NavigationOperation" flags="ng" index="1XD0a7">
-        <property id="1243006380187810091" name="nullSafe" index="21SRas" />
-        <child id="2936055411798374203" name="target" index="1XD07G" />
-      </concept>
-      <concept id="2936055411798373439" name="jetbrains.mps.kotlin.structure.AbstractFunctionCall" flags="ng" index="1XD0bC">
-        <reference id="1991556721072067817" name="function" index="AarEw" />
-      </concept>
-      <concept id="2936055411798373784" name="jetbrains.mps.kotlin.structure.ThisExpression" flags="ng" index="1XD0df" />
-      <concept id="2936055411798373697" name="jetbrains.mps.kotlin.structure.ReceiverType" flags="ng" index="1XD0em">
-        <child id="2936055411798374592" name="type" index="1XD0Sn" />
-      </concept>
-      <concept id="2936055411798373753" name="jetbrains.mps.kotlin.structure.ValueArgument" flags="ng" index="1XD0eI">
-        <child id="2936055411798374692" name="expression" index="1XD0ZN" />
-      </concept>
-      <concept id="2936055411798373333" name="jetbrains.mps.kotlin.structure.NullLiteral" flags="ng" index="1XD0k2" />
-      <concept id="2936055411798373328" name="jetbrains.mps.kotlin.structure.IntegerLiteral" flags="ng" index="1XD0k7">
-        <property id="2936055411798374019" name="value" index="1XD01k" />
-      </concept>
-      <concept id="2936055411798373327" name="jetbrains.mps.kotlin.structure.BooleanLiteral" flags="ng" index="1XD0ko">
-        <property id="2936055411798374017" name="value" index="1XD01m" />
-      </concept>
-      <concept id="2936055411798373302" name="jetbrains.mps.kotlin.structure.INavigationTarget" flags="ngI" index="1XD0lx" />
-    </language>
-    <language id="b17a9ec8-44a5-40a1-9216-058d277424eb" name="jetbrains.mps.kotlin.internal">
-      <concept id="3181756179483562337" name="jetbrains.mps.kotlin.internal.structure.GenericLeftExpression" flags="ng" index="k8$W2">
-        <child id="3181756179483582218" name="setter" index="k8w5D" />
-        <child id="3181756179483581149" name="getter" index="k8wiY" />
-        <child id="3181756179489935705" name="type" index="kggWU" />
-      </concept>
-      <concept id="6573432175633983226" name="jetbrains.mps.kotlin.internal.structure.TextReference" flags="ng" index="GWed6" />
-    </language>
-    <language id="eb56ebf4-df56-438e-af06-fc1cd08b495a" name="jetbrains.mps.kotlin.smodel">
-      <concept id="3181756179490075795" name="jetbrains.mps.kotlin.smodel.structure.PropertyReference" flags="ng" index="kjMFK">
-        <reference id="3181756179490075797" name="link" index="kjMFQ" />
-        <reference id="3181756179490075796" name="concept" index="kjMFR" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <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="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
-        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
-      </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
-        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
-        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
-      </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
-      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
-    </language>
-  </registry>
-  <node concept="bUwia" id="22f9nDgO5g_">
-    <property role="TrG5h" value="main" />
-    <node concept="3aamgX" id="22f9nDgPsz1" role="3acgRq">
-      <ref role="30HIoZ" to="tp25:gzTrcDJ" resolve="SPropertyAccess" />
-      <node concept="30G5F_" id="22f9nDgPsz2" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgPsz3" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgPsz4" role="3cqZAp">
-            <node concept="1Wc70l" id="58hR5f$iUDJ" role="3clFbG">
-              <node concept="2OqwBi" id="58hR5f$iY5$" role="3uHU7w">
-                <node concept="2OqwBi" id="58hR5f$iXtZ" role="2Oq$k0">
-                  <node concept="2OqwBi" id="58hR5f$iVmF" role="2Oq$k0">
-                    <node concept="30H73N" id="58hR5f$iUYe" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="58hR5f$iXbt" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="58hR5f$iXNh" role="2OqNvi">
-                    <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="58hR5f$iY_2" role="2OqNvi">
-                  <ref role="37wK5l" to="tpcn:hKtGpIQ" resolve="isSimpleBoolean" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="22f9nDgPsz5" role="3uHU7B">
-                <node concept="2OqwBi" id="22f9nDgPsz6" role="2Oq$k0">
-                  <node concept="30H73N" id="22f9nDgPsz7" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="22f9nDgPsz8" role="2OqNvi">
-                    <node concept="1xMEDy" id="22f9nDgPsz9" role="1xVPHs">
-                      <node concept="chp4Y" id="22f9nDgPsza" role="ri$Ld">
-                        <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="22f9nDgPszb" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgPszc" role="1lVwrX">
-        <node concept="k8$W2" id="22f9nDgPtZE" role="gfFT$">
-          <node concept="1XD088" id="22f9nDgPuT_" role="kggWU">
-            <ref role="1SePDO" to="b15i:~org/modelix/model/api/INode" resolve="INode" />
-          </node>
-          <node concept="21PmDM" id="58hR5f$jtnM" role="k8wiY">
-            <node concept="1XD0ko" id="58hR5f$jtB$" role="21Pkll" />
-            <node concept="1XD0a7" id="22f9nDgTWgN" role="21Pkln">
-              <property role="21SRas" value="true" />
-              <node concept="1XD0df" id="22f9nDgPBo_" role="21Pmik" />
-              <node concept="1NbEtQ" id="22f9nDgPxRz" role="1XD07G">
-                <ref role="AarEw" to="dbfy:~#org/modelix/model/api/INode.getBooleanPropertyValue(org/modelix/model/api/IProperty)" resolve="getBooleanPropertyValue" />
-                <node concept="1XD0eI" id="22f9nDgPAeg" role="TWiod">
-                  <node concept="1NbEFs" id="4dQjfTHZOAp" role="1XD0ZN">
-                    <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                    <node concept="1XD0eI" id="4dQjfTHZOAq" role="TWiod">
-                      <node concept="kjMFK" id="4dQjfTHZOAr" role="1XD0ZN">
-                        <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                        <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                        <node concept="1ZhdrF" id="4dQjfTHZOAs" role="lGtFl">
-                          <property role="2qtEX8" value="concept" />
-                          <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                          <node concept="3$xsQk" id="4dQjfTHZOAt" role="3$ytzL">
-                            <node concept="3clFbS" id="4dQjfTHZOAu" role="2VODD2">
-                              <node concept="3clFbF" id="4dQjfTHZOAv" role="3cqZAp">
-                                <node concept="2OqwBi" id="4dQjfTHZOAw" role="3clFbG">
-                                  <node concept="2OqwBi" id="4dQjfTHZOAx" role="2Oq$k0">
-                                    <node concept="30H73N" id="4dQjfTHZOAy" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="4dQjfTHZOAz" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                    </node>
-                                  </node>
-                                  <node concept="2qgKlT" id="4dQjfTHZOA$" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1ZhdrF" id="4dQjfTHZOA_" role="lGtFl">
-                          <property role="2qtEX8" value="link" />
-                          <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                          <node concept="3$xsQk" id="4dQjfTHZOAA" role="3$ytzL">
-                            <node concept="3clFbS" id="4dQjfTHZOAB" role="2VODD2">
-                              <node concept="3clFbF" id="4dQjfTHZOAC" role="3cqZAp">
-                                <node concept="2OqwBi" id="4dQjfTHZOAD" role="3clFbG">
-                                  <node concept="30H73N" id="4dQjfTHZOAE" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="4dQjfTHZOAF" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1XD0a7" id="22f9nDgTWCP" role="k8w5D">
-            <property role="21SRas" value="true" />
-            <node concept="1XD0df" id="22f9nDgPB_z" role="21Pmik" />
-            <node concept="1NbEtQ" id="22f9nDgPB_e" role="1XD07G">
-              <ref role="AarEw" to="dbfy:~#org/modelix/model/api/INode.setBooleanPropertyValue(org/modelix/model/api/IProperty,kotlin/Boolean?)" resolve="setBooleanPropertyValue" />
-              <node concept="1XD0eI" id="22f9nDgPB_f" role="TWiod">
-                <node concept="1NbEFs" id="22f9nDgPB_g" role="1XD0ZN">
-                  <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                  <node concept="1XD0eI" id="22f9nDgPB_h" role="TWiod">
-                    <node concept="kjMFK" id="22f9nDgPB_i" role="1XD0ZN">
-                      <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                      <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                      <node concept="1ZhdrF" id="22f9nDgPB_j" role="lGtFl">
-                        <property role="2qtEX8" value="concept" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                        <node concept="3$xsQk" id="22f9nDgPB_k" role="3$ytzL">
-                          <node concept="3clFbS" id="22f9nDgPB_l" role="2VODD2">
-                            <node concept="3clFbF" id="22f9nDgPB_m" role="3cqZAp">
-                              <node concept="2OqwBi" id="22f9nDgPB_n" role="3clFbG">
-                                <node concept="2OqwBi" id="22f9nDgPB_o" role="2Oq$k0">
-                                  <node concept="30H73N" id="22f9nDgPB_p" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="22f9nDgPB_q" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="22f9nDgPB_r" role="2OqNvi">
-                                  <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1ZhdrF" id="22f9nDgPB_s" role="lGtFl">
-                        <property role="2qtEX8" value="link" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                        <node concept="3$xsQk" id="22f9nDgPB_t" role="3$ytzL">
-                          <node concept="3clFbS" id="22f9nDgPB_u" role="2VODD2">
-                            <node concept="3clFbF" id="22f9nDgPB_v" role="3cqZAp">
-                              <node concept="2OqwBi" id="22f9nDgPB_w" role="3clFbG">
-                                <node concept="30H73N" id="22f9nDgPB_x" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="22f9nDgPB_y" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1XD0eI" id="22f9nDgPBK2" role="TWiod">
-                <node concept="UZU4S" id="22f9nDgPBN7" role="1XD0ZN">
-                  <ref role="UZU4V" node="22f9nDgPtZE" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="58hR5f$j0fV" role="3acgRq">
-      <ref role="30HIoZ" to="tp25:gzTrcDJ" resolve="SPropertyAccess" />
-      <node concept="30G5F_" id="58hR5f$j0fW" role="30HLyM">
-        <node concept="3clFbS" id="58hR5f$j0fX" role="2VODD2">
-          <node concept="3clFbF" id="58hR5f$j0fY" role="3cqZAp">
-            <node concept="1Wc70l" id="58hR5f$j0fZ" role="3clFbG">
-              <node concept="2OqwBi" id="58hR5f$j0g0" role="3uHU7w">
-                <node concept="2OqwBi" id="58hR5f$j0g1" role="2Oq$k0">
-                  <node concept="2OqwBi" id="58hR5f$j0g2" role="2Oq$k0">
-                    <node concept="30H73N" id="58hR5f$j0g3" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="58hR5f$j0g4" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="58hR5f$j0g5" role="2OqNvi">
-                    <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="58hR5f$j0g6" role="2OqNvi">
-                  <ref role="37wK5l" to="tpcn:hKtGkcn" resolve="isSimpleInteger" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="58hR5f$j0g7" role="3uHU7B">
-                <node concept="2OqwBi" id="58hR5f$j0g8" role="2Oq$k0">
-                  <node concept="30H73N" id="58hR5f$j0g9" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="58hR5f$j0ga" role="2OqNvi">
-                    <node concept="1xMEDy" id="58hR5f$j0gb" role="1xVPHs">
-                      <node concept="chp4Y" id="58hR5f$j0gc" role="ri$Ld">
-                        <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="58hR5f$j0gd" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="58hR5f$j0ge" role="1lVwrX">
-        <node concept="k8$W2" id="58hR5f$j0gf" role="gfFT$">
-          <node concept="1XD088" id="58hR5f$j0gg" role="kggWU">
-            <ref role="1SePDO" to="b15i:~org/modelix/model/api/INode" resolve="INode" />
-          </node>
-          <node concept="21PmDM" id="58hR5f$jtFt" role="k8wiY">
-            <node concept="1XD0k7" id="58hR5f$jtNg" role="21Pkll">
-              <property role="1XD01k" value="0" />
-            </node>
-            <node concept="1XD0a7" id="58hR5f$j0gh" role="21Pkln">
-              <property role="21SRas" value="true" />
-              <node concept="1XD0df" id="58hR5f$j0gi" role="21Pmik" />
-              <node concept="1NbEtQ" id="58hR5f$j0gj" role="1XD07G">
-                <ref role="AarEw" to="dbfy:~#org/modelix/model/api/INode.getIntPropertyValue(org/modelix/model/api/IProperty)" resolve="getIntPropertyValue" />
-                <node concept="1XD0eI" id="58hR5f$j0gk" role="TWiod">
-                  <node concept="1NbEFs" id="58hR5f$j0gl" role="1XD0ZN">
-                    <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                    <node concept="1XD0eI" id="58hR5f$j0gm" role="TWiod">
-                      <node concept="kjMFK" id="58hR5f$j0gn" role="1XD0ZN">
-                        <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                        <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                        <node concept="1ZhdrF" id="58hR5f$j0go" role="lGtFl">
-                          <property role="2qtEX8" value="concept" />
-                          <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                          <node concept="3$xsQk" id="58hR5f$j0gp" role="3$ytzL">
-                            <node concept="3clFbS" id="58hR5f$j0gq" role="2VODD2">
-                              <node concept="3clFbF" id="58hR5f$j0gr" role="3cqZAp">
-                                <node concept="2OqwBi" id="58hR5f$j0gs" role="3clFbG">
-                                  <node concept="2OqwBi" id="58hR5f$j0gt" role="2Oq$k0">
-                                    <node concept="30H73N" id="58hR5f$j0gu" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="58hR5f$j0gv" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                    </node>
-                                  </node>
-                                  <node concept="2qgKlT" id="58hR5f$j0gw" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1ZhdrF" id="58hR5f$j0gx" role="lGtFl">
-                          <property role="2qtEX8" value="link" />
-                          <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                          <node concept="3$xsQk" id="58hR5f$j0gy" role="3$ytzL">
-                            <node concept="3clFbS" id="58hR5f$j0gz" role="2VODD2">
-                              <node concept="3clFbF" id="58hR5f$j0g$" role="3cqZAp">
-                                <node concept="2OqwBi" id="58hR5f$j0g_" role="3clFbG">
-                                  <node concept="30H73N" id="58hR5f$j0gA" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="58hR5f$j0gB" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1XD0a7" id="58hR5f$j0gC" role="k8w5D">
-            <property role="21SRas" value="true" />
-            <node concept="1XD0df" id="58hR5f$j0gD" role="21Pmik" />
-            <node concept="1NbEtQ" id="58hR5f$j0gE" role="1XD07G">
-              <ref role="AarEw" to="dbfy:~#org/modelix/model/api/INode.setIntPropertyValue(org/modelix/model/api/IProperty,kotlin/Int?)" resolve="setIntPropertyValue" />
-              <node concept="1XD0eI" id="58hR5f$j0gF" role="TWiod">
-                <node concept="1NbEFs" id="58hR5f$j0gG" role="1XD0ZN">
-                  <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                  <node concept="1XD0eI" id="58hR5f$j0gH" role="TWiod">
-                    <node concept="kjMFK" id="58hR5f$j0gI" role="1XD0ZN">
-                      <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                      <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                      <node concept="1ZhdrF" id="58hR5f$j0gJ" role="lGtFl">
-                        <property role="2qtEX8" value="concept" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                        <node concept="3$xsQk" id="58hR5f$j0gK" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j0gL" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j0gM" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j0gN" role="3clFbG">
-                                <node concept="2OqwBi" id="58hR5f$j0gO" role="2Oq$k0">
-                                  <node concept="30H73N" id="58hR5f$j0gP" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="58hR5f$j0gQ" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="58hR5f$j0gR" role="2OqNvi">
-                                  <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1ZhdrF" id="58hR5f$j0gS" role="lGtFl">
-                        <property role="2qtEX8" value="link" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                        <node concept="3$xsQk" id="58hR5f$j0gT" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j0gU" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j0gV" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j0gW" role="3clFbG">
-                                <node concept="30H73N" id="58hR5f$j0gX" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="58hR5f$j0gY" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1XD0eI" id="58hR5f$j0gZ" role="TWiod">
-                <node concept="UZU4S" id="58hR5f$j0h0" role="1XD0ZN">
-                  <ref role="UZU4V" node="58hR5f$j0gf" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="58hR5f$j1v1" role="3acgRq">
-      <ref role="30HIoZ" to="tp25:gzTrcDJ" resolve="SPropertyAccess" />
-      <node concept="30G5F_" id="58hR5f$j1v2" role="30HLyM">
-        <node concept="3clFbS" id="58hR5f$j1v3" role="2VODD2">
-          <node concept="3clFbF" id="58hR5f$j1v4" role="3cqZAp">
-            <node concept="2OqwBi" id="58hR5f$j1vd" role="3clFbG">
-              <node concept="2OqwBi" id="58hR5f$j1ve" role="2Oq$k0">
-                <node concept="30H73N" id="58hR5f$j1vf" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="58hR5f$j1vg" role="2OqNvi">
-                  <node concept="1xMEDy" id="58hR5f$j1vh" role="1xVPHs">
-                    <node concept="chp4Y" id="58hR5f$j1vi" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="58hR5f$j1vj" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="58hR5f$j1vk" role="1lVwrX">
-        <node concept="k8$W2" id="58hR5f$j1vl" role="gfFT$">
-          <node concept="1XD088" id="58hR5f$j1vm" role="kggWU">
-            <ref role="1SePDO" to="b15i:~org/modelix/model/api/INode" resolve="INode" />
-          </node>
-          <node concept="1XD0a7" id="58hR5f$j1vn" role="k8wiY">
-            <property role="21SRas" value="true" />
-            <node concept="1XD0df" id="58hR5f$j1vo" role="21Pmik" />
-            <node concept="1NbEtQ" id="58hR5f$j1vp" role="1XD07G">
-              <ref role="AarEw" to="b15i:~INode.getPropertyValue(IProperty)" resolve="getPropertyValue" />
-              <node concept="1XD0eI" id="58hR5f$j1vq" role="TWiod">
-                <node concept="1NbEFs" id="58hR5f$j1vr" role="1XD0ZN">
-                  <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                  <node concept="1XD0eI" id="58hR5f$j1vs" role="TWiod">
-                    <node concept="kjMFK" id="58hR5f$j1vt" role="1XD0ZN">
-                      <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                      <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                      <node concept="1ZhdrF" id="58hR5f$j1vu" role="lGtFl">
-                        <property role="2qtEX8" value="concept" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                        <node concept="3$xsQk" id="58hR5f$j1vv" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j1vw" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j1vx" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j1vy" role="3clFbG">
-                                <node concept="2OqwBi" id="58hR5f$j1vz" role="2Oq$k0">
-                                  <node concept="30H73N" id="58hR5f$j1v$" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="58hR5f$j1v_" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="58hR5f$j1vA" role="2OqNvi">
-                                  <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1ZhdrF" id="58hR5f$j1vB" role="lGtFl">
-                        <property role="2qtEX8" value="link" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                        <node concept="3$xsQk" id="58hR5f$j1vC" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j1vD" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j1vE" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j1vF" role="3clFbG">
-                                <node concept="30H73N" id="58hR5f$j1vG" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="58hR5f$j1vH" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1XD0a7" id="58hR5f$j1vI" role="k8w5D">
-            <property role="21SRas" value="true" />
-            <node concept="1XD0df" id="58hR5f$j1vJ" role="21Pmik" />
-            <node concept="1NbEtQ" id="58hR5f$j1vK" role="1XD07G">
-              <ref role="AarEw" to="b15i:~INode.setPropertyValue(IProperty,kotlin/String?)" resolve="setPropertyValue" />
-              <node concept="1XD0eI" id="58hR5f$j1vL" role="TWiod">
-                <node concept="1NbEFs" id="58hR5f$j1vM" role="1XD0ZN">
-                  <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                  <node concept="1XD0eI" id="58hR5f$j1vN" role="TWiod">
-                    <node concept="kjMFK" id="58hR5f$j1vO" role="1XD0ZN">
-                      <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                      <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                      <node concept="1ZhdrF" id="58hR5f$j1vP" role="lGtFl">
-                        <property role="2qtEX8" value="concept" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                        <node concept="3$xsQk" id="58hR5f$j1vQ" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j1vR" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j1vS" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j1vT" role="3clFbG">
-                                <node concept="2OqwBi" id="58hR5f$j1vU" role="2Oq$k0">
-                                  <node concept="30H73N" id="58hR5f$j1vV" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="58hR5f$j1vW" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="58hR5f$j1vX" role="2OqNvi">
-                                  <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1ZhdrF" id="58hR5f$j1vY" role="lGtFl">
-                        <property role="2qtEX8" value="link" />
-                        <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                        <node concept="3$xsQk" id="58hR5f$j1vZ" role="3$ytzL">
-                          <node concept="3clFbS" id="58hR5f$j1w0" role="2VODD2">
-                            <node concept="3clFbF" id="58hR5f$j1w1" role="3cqZAp">
-                              <node concept="2OqwBi" id="58hR5f$j1w2" role="3clFbG">
-                                <node concept="30H73N" id="58hR5f$j1w3" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="58hR5f$j1w4" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:gzTsBJd" resolve="property" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1XD0eI" id="58hR5f$j1w5" role="TWiod">
-                <node concept="UZU4S" id="58hR5f$j1w6" role="1XD0ZN">
-                  <ref role="UZU4V" node="58hR5f$j1vl" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="22f9nDgSbgB" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="30G5F_" id="22f9nDgSbgC" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgSbgD" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgTqpz" role="3cqZAp">
-            <node concept="1Wc70l" id="22f9nDgTw$r" role="3clFbG">
-              <node concept="1Wc70l" id="22f9nDgTww6" role="3uHU7B">
-                <node concept="2OqwBi" id="22f9nDgTssR" role="3uHU7B">
-                  <node concept="2OqwBi" id="22f9nDgTqPJ" role="2Oq$k0">
-                    <node concept="30H73N" id="22f9nDgTqpy" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="22f9nDgTrKe" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                    </node>
-                  </node>
-                  <node concept="1mIQ4w" id="22f9nDgTsDR" role="2OqNvi">
-                    <node concept="chp4Y" id="22f9nDgTsJ1" role="cj9EA">
-                      <ref role="cht4Q" to="tp25:h2Xjw1B" resolve="Node_GetAncestorOperation" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="22f9nDgTw$s" role="3uHU7w">
-                  <node concept="2OqwBi" id="22f9nDgTw$t" role="2Oq$k0">
-                    <node concept="30H73N" id="22f9nDgTw$u" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="22f9nDgTw$v" role="2OqNvi">
-                      <node concept="1xMEDy" id="22f9nDgTw$w" role="1xVPHs">
-                        <node concept="chp4Y" id="22f9nDgTw$x" role="ri$Ld">
-                          <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="22f9nDgTw$y" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="22f9nDgTw$z" role="3uHU7w">
-                <node concept="2OqwBi" id="22f9nDgTw$$" role="2Oq$k0">
-                  <node concept="1PxgMI" id="22f9nDgTw$_" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="chp4Y" id="22f9nDgTw$A" role="3oSUPX">
-                      <ref role="cht4Q" to="tp25:h8chp0G" resolve="RefConcept_Reference" />
-                    </node>
-                    <node concept="2OqwBi" id="22f9nDgTw$B" role="1m5AlR">
-                      <node concept="2OqwBi" id="22f9nDgTw$C" role="2Oq$k0">
-                        <node concept="2OqwBi" id="22f9nDgTw$D" role="2Oq$k0">
-                          <node concept="2OqwBi" id="22f9nDgTw$E" role="2Oq$k0">
-                            <node concept="1PxgMI" id="22f9nDgTz_l" role="2Oq$k0">
-                              <node concept="chp4Y" id="22f9nDgTzEC" role="3oSUPX">
-                                <ref role="cht4Q" to="tp25:h2Xjw1B" resolve="Node_GetAncestorOperation" />
-                              </node>
-                              <node concept="2OqwBi" id="22f9nDgTyse" role="1m5AlR">
-                                <node concept="30H73N" id="22f9nDgTw$F" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="22f9nDgTyxt" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3Tsc0h" id="22f9nDgTw$G" role="2OqNvi">
-                              <ref role="3TtcxE" to="tp25:gDxVPDm" resolve="parameter" />
-                            </node>
-                          </node>
-                          <node concept="v3k3i" id="22f9nDgTw$H" role="2OqNvi">
-                            <node concept="chp4Y" id="22f9nDgTw$I" role="v3oSu">
-                              <ref role="cht4Q" to="tp25:gDxMEHC" resolve="OperationParm_Concept" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1uHKPH" id="22f9nDgTw$J" role="2OqNvi" />
-                      </node>
-                      <node concept="3TrEf2" id="22f9nDgTw$K" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tp25:h$ri$Pk" resolve="conceptArgument" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="22f9nDgTw$L" role="2OqNvi">
-                    <ref role="3Tt5mk" to="tp25:h8cht0$" resolve="conceptDeclaration" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="22f9nDgTw$M" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgSbgM" role="1lVwrX">
-        <node concept="1XD0a7" id="22f9nDgSbgP" role="gfFT$">
-          <node concept="1NbEtQ" id="22f9nDgSbgQ" role="1XD07G">
-            <ref role="AarEw" to="b15i:~#INode?.getAncestor(IConcept?,kotlin/Boolean)" resolve="getAncestor" />
-            <node concept="1XD0eI" id="22f9nDgSbgR" role="TWiod">
-              <node concept="1NbEFs" id="1ixZ$UHlXAB" role="1XD0ZN">
-                <ref role="AarEw" to="1g18:~MPSConcept.new(org/jetbrains/mps/openapi/language/SAbstractConcept)" resolve="MPSConcept" />
-                <node concept="1XD0eI" id="1ixZ$UHlXAC" role="TWiod">
-                  <node concept="1XD0a7" id="1ixZ$UHlXAD" role="1XD0ZN">
-                    <node concept="2yQVVM" id="1ixZ$UHlXAE" role="1XD07G">
-                      <ref role="2yQV70" to="2k9e:~MetaAdapterFactory.getConcept(jetbrains.mps.smodel.adapter.ids.SConceptId,java.lang.String)" resolve="getConcept" />
-                      <node concept="1XD0eI" id="1ixZ$UHlXAF" role="TWiod">
-                        <node concept="1XD0a7" id="1ixZ$UHlXAG" role="1XD0ZN">
-                          <node concept="2yQVVM" id="1ixZ$UHlXAH" role="1XD07G">
-                            <ref role="2yQV70" to="e8bb:~SConceptId.deserialize(java.lang.String)" resolve="deserialize" />
-                            <node concept="1XD0eI" id="1ixZ$UHlXAI" role="TWiod">
-                              <node concept="1XD08G" id="1ixZ$UHlXAJ" role="1XD0ZN">
-                                <node concept="Df6$J" id="1ixZ$UHlXAK" role="Df6Hu">
-                                  <node concept="21VMdE" id="1ixZ$UHlXAL" role="Df7GE">
-                                    <property role="21VMdD" value="serializedConceptId" />
-                                    <node concept="17Uvod" id="1ixZ$UHlXAM" role="lGtFl">
-                                      <property role="2qtEX9" value="content" />
-                                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                                      <node concept="3zFVjK" id="1ixZ$UHlXAN" role="3zH0cK">
-                                        <node concept="3clFbS" id="1ixZ$UHlXAO" role="2VODD2">
-                                          <node concept="3clFbF" id="1ixZ$UHlXAP" role="3cqZAp">
-                                            <node concept="2OqwBi" id="1ixZ$UHlXAQ" role="3clFbG">
-                                              <node concept="2YIFZM" id="1ixZ$UHlXAR" role="2Oq$k0">
-                                                <ref role="37wK5l" to="e8bb:~MetaIdByDeclaration.getConceptId(org.jetbrains.mps.openapi.model.SNode)" resolve="getConceptId" />
-                                                <ref role="1Pybhc" to="e8bb:~MetaIdByDeclaration" resolve="MetaIdByDeclaration" />
-                                                <node concept="2OqwBi" id="22f9nDgSEN2" role="37wK5m">
-                                                  <node concept="1PxgMI" id="22f9nDgSDSP" role="2Oq$k0">
-                                                    <node concept="chp4Y" id="22f9nDgSEi5" role="3oSUPX">
-                                                      <ref role="cht4Q" to="tp25:h8chp0G" resolve="RefConcept_Reference" />
-                                                    </node>
-                                                    <node concept="2OqwBi" id="22f9nDgSzG6" role="1m5AlR">
-                                                      <node concept="2OqwBi" id="22f9nDgSy$e" role="2Oq$k0">
-                                                        <node concept="2OqwBi" id="22f9nDgSvOL" role="2Oq$k0">
-                                                          <node concept="2OqwBi" id="1ixZ$UHlXAS" role="2Oq$k0">
-                                                            <node concept="3Tsc0h" id="22f9nDgStxd" role="2OqNvi">
-                                                              <ref role="3TtcxE" to="tp25:gDxVPDm" resolve="parameter" />
-                                                            </node>
-                                                            <node concept="1PxgMI" id="22f9nDgT_xv" role="2Oq$k0">
-                                                              <node concept="chp4Y" id="22f9nDgT_xw" role="3oSUPX">
-                                                                <ref role="cht4Q" to="tp25:h2Xjw1B" resolve="Node_GetAncestorOperation" />
-                                                              </node>
-                                                              <node concept="2OqwBi" id="22f9nDgT_xx" role="1m5AlR">
-                                                                <node concept="30H73N" id="22f9nDgT_xy" role="2Oq$k0" />
-                                                                <node concept="3TrEf2" id="22f9nDgT_xz" role="2OqNvi">
-                                                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                                                </node>
-                                                              </node>
-                                                            </node>
-                                                          </node>
-                                                          <node concept="v3k3i" id="22f9nDgSxQ5" role="2OqNvi">
-                                                            <node concept="chp4Y" id="22f9nDgSxT9" role="v3oSu">
-                                                              <ref role="cht4Q" to="tp25:gDxMEHC" resolve="OperationParm_Concept" />
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                        <node concept="1uHKPH" id="22f9nDgSzaf" role="2OqNvi" />
-                                                      </node>
-                                                      <node concept="3TrEf2" id="22f9nDgS$0w" role="2OqNvi">
-                                                        <ref role="3Tt5mk" to="tp25:h$ri$Pk" resolve="conceptArgument" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3TrEf2" id="22f9nDgSF0z" role="2OqNvi">
-                                                    <ref role="3Tt5mk" to="tp25:h8cht0$" resolve="conceptDeclaration" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="1ixZ$UHlXAV" role="2OqNvi">
-                                                <ref role="37wK5l" to="e8bb:~SConceptId.serialize()" resolve="serialize" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="1XD0em" id="1ixZ$UHlXAW" role="21Pmik">
-                            <node concept="2EYIWN" id="1ixZ$UHlXAX" role="1XD0Sn">
-                              <ref role="2EYIUZ" to="e8bb:~SConceptId" resolve="SConceptId" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1XD0eI" id="1ixZ$UHlXAY" role="TWiod">
-                        <node concept="1XD08G" id="1ixZ$UHlXAZ" role="1XD0ZN">
-                          <node concept="Df6$J" id="1ixZ$UHlXB0" role="Df6Hu">
-                            <node concept="21VMdE" id="1ixZ$UHlXB1" role="Df7GE">
-                              <property role="21VMdD" value="conceptName" />
-                              <node concept="17Uvod" id="1ixZ$UHlXB2" role="lGtFl">
-                                <property role="2qtEX9" value="content" />
-                                <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                                <node concept="3zFVjK" id="1ixZ$UHlXB3" role="3zH0cK">
-                                  <node concept="3clFbS" id="1ixZ$UHlXB4" role="2VODD2">
-                                    <node concept="3clFbF" id="22f9nDgS$o5" role="3cqZAp">
-                                      <node concept="2OqwBi" id="22f9nDgSFSO" role="3clFbG">
-                                        <node concept="2OqwBi" id="22f9nDgSF61" role="2Oq$k0">
-                                          <node concept="1PxgMI" id="22f9nDgSF62" role="2Oq$k0">
-                                            <node concept="chp4Y" id="22f9nDgSF63" role="3oSUPX">
-                                              <ref role="cht4Q" to="tp25:h8chp0G" resolve="RefConcept_Reference" />
-                                            </node>
-                                            <node concept="2OqwBi" id="22f9nDgSF64" role="1m5AlR">
-                                              <node concept="2OqwBi" id="22f9nDgSF65" role="2Oq$k0">
-                                                <node concept="2OqwBi" id="22f9nDgSF66" role="2Oq$k0">
-                                                  <node concept="2OqwBi" id="22f9nDgSF67" role="2Oq$k0">
-                                                    <node concept="30H73N" id="22f9nDgSF68" role="2Oq$k0" />
-                                                    <node concept="3Tsc0h" id="22f9nDgSF69" role="2OqNvi">
-                                                      <ref role="3TtcxE" to="tp25:gDxVPDm" resolve="parameter" />
-                                                    </node>
-                                                  </node>
-                                                  <node concept="v3k3i" id="22f9nDgSF6a" role="2OqNvi">
-                                                    <node concept="chp4Y" id="22f9nDgSF6b" role="v3oSu">
-                                                      <ref role="cht4Q" to="tp25:gDxMEHC" resolve="OperationParm_Concept" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                                <node concept="1uHKPH" id="22f9nDgSF6c" role="2OqNvi" />
-                                              </node>
-                                              <node concept="3TrEf2" id="22f9nDgSF6d" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="tp25:h$ri$Pk" resolve="conceptArgument" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="3TrEf2" id="22f9nDgSF6e" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tp25:h8cht0$" resolve="conceptDeclaration" />
-                                          </node>
-                                        </node>
-                                        <node concept="2qgKlT" id="22f9nDgSGfx" role="2OqNvi">
-                                          <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="1XD0em" id="1ixZ$UHlXBb" role="21Pmik">
-                      <node concept="2EYIWN" id="1ixZ$UHlXBc" role="1XD0Sn">
-                        <ref role="2EYIUZ" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1XD0eI" id="22f9nDgSJWP" role="TWiod">
-              <node concept="1XD0ko" id="22f9nDgSK7l" role="1XD0ZN">
-                <property role="1XD01m" value="true" />
-                <node concept="1W57fq" id="22f9nDgSK7p" role="lGtFl">
-                  <node concept="3IZrLx" id="22f9nDgSK7q" role="3IZSJc">
-                    <node concept="3clFbS" id="22f9nDgSK7r" role="2VODD2">
-                      <node concept="3clFbF" id="22f9nDgSK84" role="3cqZAp">
-                        <node concept="2OqwBi" id="22f9nDgSR0u" role="3clFbG">
-                          <node concept="2OqwBi" id="22f9nDgSNL9" role="2Oq$k0">
-                            <node concept="2OqwBi" id="22f9nDgSKyl" role="2Oq$k0">
-                              <node concept="3Tsc0h" id="22f9nDgSKUr" role="2OqNvi">
-                                <ref role="3TtcxE" to="tp25:gDxVPDm" resolve="parameter" />
-                              </node>
-                              <node concept="1PxgMI" id="22f9nDgT_Dp" role="2Oq$k0">
-                                <node concept="chp4Y" id="22f9nDgT_Dq" role="3oSUPX">
-                                  <ref role="cht4Q" to="tp25:h2Xjw1B" resolve="Node_GetAncestorOperation" />
-                                </node>
-                                <node concept="2OqwBi" id="22f9nDgT_Dr" role="1m5AlR">
-                                  <node concept="30H73N" id="22f9nDgT_Ds" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="22f9nDgT_Dt" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="v3k3i" id="22f9nDgSPMj" role="2OqNvi">
-                              <node concept="chp4Y" id="22f9nDgSQ3J" role="v3oSu">
-                                <ref role="cht4Q" to="tp25:gDxIGKj" resolve="OperationParm_Inclusion" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3GX2aA" id="22f9nDgSRB8" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gft3U" id="22f9nDgSK7U" role="UU_$l">
-                    <node concept="1XD0ko" id="22f9nDgSK80" role="gfFT$" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1XD0df" id="22f9nDgSbhb" role="21Pmik">
-            <node concept="29HgVG" id="22f9nDgT_tM" role="lGtFl">
-              <node concept="3NFfHV" id="22f9nDgT_tN" role="3NFExx">
-                <node concept="3clFbS" id="22f9nDgT_tO" role="2VODD2">
-                  <node concept="3clFbF" id="22f9nDgT_tU" role="3cqZAp">
-                    <node concept="2OqwBi" id="22f9nDgT_tP" role="3clFbG">
-                      <node concept="3TrEf2" id="22f9nDgT_tS" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                      </node>
-                      <node concept="30H73N" id="22f9nDgT_tT" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="22f9nDgPnde" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="30G5F_" id="22f9nDgPndi" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgPndj" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgPnqQ" role="3cqZAp">
-            <node concept="2OqwBi" id="22f9nDgPop8" role="3clFbG">
-              <node concept="2OqwBi" id="22f9nDgPnQ1" role="2Oq$k0">
-                <node concept="30H73N" id="22f9nDgPnqP" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="22f9nDgPo3a" role="2OqNvi">
-                  <node concept="1xMEDy" id="22f9nDgPo3c" role="1xVPHs">
-                    <node concept="chp4Y" id="22f9nDgPo62" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="22f9nDgPoH2" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgPrAO" role="1lVwrX">
-        <node concept="1XD0a7" id="22f9nDgPsqR" role="gfFT$">
-          <node concept="1XD0lx" id="22f9nDgPsqS" role="1XD07G">
-            <node concept="29HgVG" id="22f9nDgPsx6" role="lGtFl">
-              <node concept="3NFfHV" id="22f9nDgPsx7" role="3NFExx">
-                <node concept="3clFbS" id="22f9nDgPsx8" role="2VODD2">
-                  <node concept="3clFbF" id="22f9nDgPsxe" role="3cqZAp">
-                    <node concept="2OqwBi" id="22f9nDgPsx9" role="3clFbG">
-                      <node concept="3TrEf2" id="22f9nDgPsxc" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                      </node>
-                      <node concept="30H73N" id="22f9nDgPsxd" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1XD087" id="22f9nDgPsqT" role="21Pmik">
-            <node concept="29HgVG" id="22f9nDgPsqY" role="lGtFl">
-              <node concept="3NFfHV" id="22f9nDgPsqZ" role="3NFExx">
-                <node concept="3clFbS" id="22f9nDgPsr0" role="2VODD2">
-                  <node concept="3clFbF" id="22f9nDgPsr6" role="3cqZAp">
-                    <node concept="2OqwBi" id="22f9nDgPsr1" role="3clFbG">
-                      <node concept="3TrEf2" id="22f9nDgPsr4" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                      </node>
-                      <node concept="30H73N" id="22f9nDgPsr5" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="22f9nDgT4zm" role="3acgRq">
-      <ref role="30HIoZ" to="tp68:h7VmV7M" resolve="InternalVariableReference" />
-      <node concept="30G5F_" id="22f9nDgT4zn" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgT4zo" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgT4zp" role="3cqZAp">
-            <node concept="2OqwBi" id="22f9nDgT4zq" role="3clFbG">
-              <node concept="2OqwBi" id="22f9nDgT4zr" role="2Oq$k0">
-                <node concept="30H73N" id="22f9nDgT4zs" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="22f9nDgT4zt" role="2OqNvi">
-                  <node concept="1xMEDy" id="22f9nDgT4zu" role="1xVPHs">
-                    <node concept="chp4Y" id="22f9nDgT4zv" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="22f9nDgT4zw" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgT9jD" role="1lVwrX">
-        <node concept="GWed6" id="22f9nDgT9kv" role="gfFT$">
-          <node concept="17Uvod" id="22f9nDgT9k$" role="lGtFl">
-            <property role="2qtEX9" value="name" />
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <node concept="3zFVjK" id="22f9nDgT9k_" role="3zH0cK">
-              <node concept="3clFbS" id="22f9nDgT9kA" role="2VODD2">
-                <node concept="3clFbF" id="22f9nDgT9$L" role="3cqZAp">
-                  <node concept="2OqwBi" id="22f9nDgTa0L" role="3clFbG">
-                    <node concept="30H73N" id="22f9nDgT9$K" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="22f9nDgTaaj" role="2OqNvi">
-                      <ref role="3TsBF5" to="tp68:h7VnrL9" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="22f9nDgPKQd" role="3acgRq">
-      <ref role="30HIoZ" to="ya4x:22f9nDgNaE5" resolve="KotlinExpressionWrapper" />
-      <node concept="30G5F_" id="22f9nDgPKQe" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgPKQf" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgPKQg" role="3cqZAp">
-            <node concept="2OqwBi" id="22f9nDgPKQh" role="3clFbG">
-              <node concept="2OqwBi" id="22f9nDgPKQi" role="2Oq$k0">
-                <node concept="30H73N" id="22f9nDgPKQj" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="22f9nDgPKQk" role="2OqNvi">
-                  <node concept="1xMEDy" id="22f9nDgPKQl" role="1xVPHs">
-                    <node concept="chp4Y" id="22f9nDgPKQm" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="22f9nDgPKQn" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgPLlz" role="1lVwrX">
-        <node concept="1XD0k2" id="22f9nDgPLmp" role="gfFT$">
-          <node concept="29HgVG" id="22f9nDgPLms" role="lGtFl">
-            <node concept="3NFfHV" id="22f9nDgPLmt" role="3NFExx">
-              <node concept="3clFbS" id="22f9nDgPLmu" role="2VODD2">
-                <node concept="3clFbF" id="22f9nDgPLm$" role="3cqZAp">
-                  <node concept="2OqwBi" id="22f9nDgPLmv" role="3clFbG">
-                    <node concept="3TrEf2" id="22f9nDgPLmy" role="2OqNvi">
-                      <ref role="3Tt5mk" to="ya4x:22f9nDgNaE8" resolve="expression" />
-                    </node>
-                    <node concept="30H73N" id="22f9nDgPLmz" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="22f9nDgPL_1" role="3acgRq">
-      <ref role="30HIoZ" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
-      <node concept="30G5F_" id="22f9nDgPL_2" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgPL_3" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgPL_4" role="3cqZAp">
-            <node concept="2OqwBi" id="22f9nDgPL_5" role="3clFbG">
-              <node concept="2OqwBi" id="22f9nDgPL_6" role="2Oq$k0">
-                <node concept="30H73N" id="22f9nDgPL_7" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="22f9nDgPL_8" role="2OqNvi">
-                  <node concept="1xMEDy" id="22f9nDgPL_9" role="1xVPHs">
-                    <node concept="chp4Y" id="22f9nDgPL_a" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3x8VRR" id="22f9nDgPL_b" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="22f9nDgPL_c" role="1lVwrX">
-        <node concept="1XD0k2" id="22f9nDgPL_d" role="gfFT$">
-          <node concept="29HgVG" id="22f9nDgPL_e" role="lGtFl">
-            <node concept="3NFfHV" id="22f9nDgPL_f" role="3NFExx">
-              <node concept="3clFbS" id="22f9nDgPL_g" role="2VODD2">
-                <node concept="3clFbF" id="22f9nDgPL_h" role="3cqZAp">
-                  <node concept="2OqwBi" id="22f9nDgPL_i" role="3clFbG">
-                    <node concept="3TrEf2" id="22f9nDgPL_j" role="2OqNvi">
-                      <ref role="3Tt5mk" to="ya4x:22f9nDgNaE3" resolve="expression" />
-                    </node>
-                    <node concept="30H73N" id="22f9nDgPL_k" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
deleted file mode 100644
index 3cb979bf..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.behavior.mps
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1014eabd-e16d-489b-91ae-6e2c350879f4(org.modelix.mps.baseLanguage2kotlin.behavior)">
-  <persistence version="9" />
-  <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
deleted file mode 100644
index b7ffa56c..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.constraints.mps
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:0cc6e817-27d4-4a8f-9ea9-cfcb7f45f842(org.modelix.mps.baseLanguage2kotlin.constraints)">
-  <persistence version="9" />
-  <languages>
-    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
-    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
-    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
-    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
-    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
-    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
-    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
deleted file mode 100644
index a9de1dfc..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.editor.mps
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3c6900e1-3563-489d-a542-86dadfd9e6db(org.modelix.mps.baseLanguage2kotlin.editor)">
-  <persistence version="9" />
-  <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="f8gn" ref="r:37580d55-803b-40f6-8108-d95a9fce8d6e(org.modelix.mps.notation.structure)" />
-    <import index="ya4x" ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
-      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
-        <child id="1080736633877" name="cellModel" index="2wV5jI" />
-      </concept>
-      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
-        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
-      </concept>
-      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
-        <property id="1186414551515" name="flag" index="VOm3f" />
-      </concept>
-      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
-        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
-      </concept>
-      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
-        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
-        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
-      </concept>
-      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
-        <property id="1073389577007" name="text" index="3F0ifm" />
-      </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
-        <child id="1219418656006" name="styleItem" index="3F10Kt" />
-      </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
-        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="24kQdi" id="22f9nDgO5gA">
-    <property role="3GE5qa" value="expressions" />
-    <ref role="1XX52x" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
-    <node concept="3EZMnI" id="22f9nDgNaEr" role="2wV5jI">
-      <node concept="PMmxH" id="22f9nDgNaEy" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="22f9nDgNaEB" role="3EZMnx">
-        <property role="3F0ifm" value="/" />
-        <node concept="11L4FC" id="22f9nDgNaEQ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="11LMrY" id="22f9nDgNaEV" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="22f9nDgNaEu" role="2iSdaV" />
-      <node concept="3F1sOY" id="22f9nDgNaF5" role="3EZMnx">
-        <ref role="1NtTu8" to="ya4x:22f9nDgNaE3" resolve="expression" />
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="22f9nDgO5gM">
-    <property role="3GE5qa" value="expressions" />
-    <ref role="1XX52x" to="ya4x:22f9nDgNaE5" resolve="KotlinExpressionWrapper" />
-    <node concept="3EZMnI" id="22f9nDgO5gO" role="2wV5jI">
-      <node concept="PMmxH" id="22f9nDgO5gP" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="22f9nDgO5gQ" role="3EZMnx">
-        <property role="3F0ifm" value="/" />
-        <node concept="11L4FC" id="22f9nDgO5gR" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="11LMrY" id="22f9nDgO5gS" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="22f9nDgO5gT" role="2iSdaV" />
-      <node concept="3F1sOY" id="22f9nDgO5gU" role="3EZMnx">
-        <ref role="1NtTu8" to="ya4x:22f9nDgNaE8" resolve="expression" />
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="22f9nDgPjTF">
-    <property role="3GE5qa" value="expressions" />
-    <ref role="1XX52x" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-    <node concept="3EZMnI" id="22f9nDgPjTK" role="2wV5jI">
-      <node concept="3F0ifn" id="22f9nDgPjTM" role="3EZMnx">
-        <property role="3F0ifm" value="covertToKotlin(" />
-      </node>
-      <node concept="3F1sOY" id="22f9nDgPjU2" role="3EZMnx">
-        <ref role="1NtTu8" to="ya4x:22f9nDgPjTD" resolve="expression" />
-      </node>
-      <node concept="3F0ifn" id="22f9nDgPjTU" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-      </node>
-      <node concept="l2Vlx" id="22f9nDgPjTN" role="2iSdaV" />
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
deleted file mode 100644
index 450a553b..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.structure.mps
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
-  </languages>
-  <imports>
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
-        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
-        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-      </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
-      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
-        <reference id="1169127628841" name="intfc" index="PrY4T" />
-      </concept>
-      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
-        <reference id="1071489389519" name="extends" index="1TJDcQ" />
-        <child id="1169129564478" name="implements" index="PzmwI" />
-      </concept>
-      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
-        <property id="1071599776563" name="role" index="20kJfa" />
-        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
-        <property id="1071599937831" name="metaClass" index="20lmBu" />
-        <property id="241647608299431140" name="linkId" index="IQ2ns" />
-        <reference id="1071599976176" name="target" index="20lvS9" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1TIwiD" id="22f9nDgNaE0">
-    <property role="EcuMT" value="2346135138155145856" />
-    <property role="3GE5qa" value="expressions" />
-    <property role="TrG5h" value="BaseLanguageExpressionWrapper" />
-    <property role="34LRSv" value="java" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="22f9nDgNaE3" role="1TKVEi">
-      <property role="IQ2ns" value="2346135138155145859" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="PrWs8" id="22f9nDgNaE1" role="PzmwI">
-      <ref role="PrY4T" node="22f9nDgNaDZ" resolve="IBaseLanguageOrKotlinExpression" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="22f9nDgNaDZ">
-    <property role="TrG5h" value="IBaseLanguageOrKotlinExpression" />
-    <property role="EcuMT" value="2346135138155145855" />
-    <property role="3GE5qa" value="expressions" />
-  </node>
-  <node concept="1TIwiD" id="22f9nDgNaE5">
-    <property role="EcuMT" value="2346135138155145861" />
-    <property role="3GE5qa" value="expressions" />
-    <property role="TrG5h" value="KotlinExpressionWrapper" />
-    <property role="34LRSv" value="kotlin" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="22f9nDgNaE8" role="1TKVEi">
-      <property role="IQ2ns" value="2346135138155145864" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
-    </node>
-    <node concept="PrWs8" id="22f9nDgNaE6" role="PzmwI">
-      <ref role="PrY4T" node="22f9nDgNaDZ" resolve="IBaseLanguageOrKotlinExpression" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="22f9nDgPjTA">
-    <property role="EcuMT" value="2346135138155708006" />
-    <property role="3GE5qa" value="expressions" />
-    <property role="TrG5h" value="ConvertToKotlin" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="22f9nDgPjTD" role="1TKVEi">
-      <property role="IQ2ns" value="2346135138155708009" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="expression" />
-      <ref role="20lvS9" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    </node>
-    <node concept="PrWs8" id="22f9nDgPjTB" role="PzmwI">
-      <ref role="PrY4T" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
deleted file mode 100644
index a40b554d..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.textGen.mps
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a735d1c8-66db-4547-946c-70e18e6babc9(org.modelix.mps.baseLanguage2kotlin.textGen)">
-  <persistence version="9" />
-  <languages>
-    <use id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" name="jetbrains.mps.lang.textGen" version="1" />
-    <devkit ref="fa73d85a-ac7f-447b-846c-fcdc41caa600(jetbrains.mps.devkit.aspect.textgen)" />
-  </languages>
-  <imports>
-    <import index="ya4x" ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-    </language>
-    <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" name="jetbrains.mps.lang.textGen">
-      <concept id="1237305334312" name="jetbrains.mps.lang.textGen.structure.NodeAppendPart" flags="ng" index="l9hG8">
-        <child id="1237305790512" name="value" index="lb14g" />
-      </concept>
-      <concept id="1237306079178" name="jetbrains.mps.lang.textGen.structure.AppendOperation" flags="nn" index="lc7rE">
-        <child id="1237306115446" name="part" index="lcghm" />
-      </concept>
-      <concept id="1233670071145" name="jetbrains.mps.lang.textGen.structure.ConceptTextGenDeclaration" flags="ig" index="WtQ9Q">
-        <reference id="1233670257997" name="conceptDeclaration" index="WuzLi" />
-        <child id="1233749296504" name="textGenBlock" index="11c4hB" />
-      </concept>
-      <concept id="1233748055915" name="jetbrains.mps.lang.textGen.structure.NodeParameter" flags="nn" index="117lpO" />
-      <concept id="1233749247888" name="jetbrains.mps.lang.textGen.structure.GenerateTextDeclaration" flags="in" index="11bSqf" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="WtQ9Q" id="22f9nDgQt2N">
-    <property role="3GE5qa" value="expressions" />
-    <ref role="WuzLi" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-    <node concept="11bSqf" id="22f9nDgQt2O" role="11c4hB">
-      <node concept="3clFbS" id="22f9nDgQt2P" role="2VODD2">
-        <node concept="lc7rE" id="22f9nDgQt3s" role="3cqZAp">
-          <node concept="l9hG8" id="22f9nDgQt3S" role="lcghm">
-            <node concept="2OqwBi" id="22f9nDgQtjt" role="lb14g">
-              <node concept="117lpO" id="22f9nDgQt4r" role="2Oq$k0" />
-              <node concept="3TrEf2" id="22f9nDgQt_b" role="2OqNvi">
-                <ref role="3Tt5mk" to="ya4x:22f9nDgPjTD" resolve="expression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps b/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
deleted file mode 100644
index 3cc51718..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/models/org.modelix.mps.baseLanguage2kotlin.typesystem.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:edcbc2a2-4fce-499d-bc54-51f601c35f63(org.modelix.mps.baseLanguage2kotlin.typesystem)">
-  <persistence version="9" />
-  <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl b/mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
deleted file mode 100644
index 249593fd..00000000
--- a/mps/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language namespace="org.modelix.mps.baseLanguage2kotlin" uuid="8f2def56-7502-4f14-994f-472d404e528c" languageVersion="0" moduleVersion="0">
-  <models>
-    <modelRoot type="default" contentPath="${module}">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.modelix.mps.baseLanguage2kotlin.generator" uuid="1ac577a6-1fc6-4b54-8568-99c4c7aaba3b">
-      <models>
-        <modelRoot type="default" contentPath="${module}/generator">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <dependencies>
-        <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-        <dependency reexport="false">6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</dependency>
-        <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
-        <dependency reexport="false">771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)</dependency>
-        <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
-        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-        <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-        <dependency reexport="false">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
-      </dependencies>
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l: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: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" />
-        <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" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
-        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
-        <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
-        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
-        <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-        <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-        <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
-        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-        <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
-        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)" version="0" />
-        <module reference="1ac577a6-1fc6-4b54-8568-99c4c7aaba3b(org.modelix.mps.baseLanguage2kotlin.generator)" version="0" />
-        <module reference="208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)" version="0" />
-        <module reference="771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <dependencies>
-    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">c7b55726-1795-47bd-aa21-714ac1e30f21(org.modelix.mps.notation)</dependency>
-    <dependency reexport="false" scope="generate-into">eb56ebf4-df56-438e-af06-fc1cd08b495a(jetbrains.mps.kotlin.smodel)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
-    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
-    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
-    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
-    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
-    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
-    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
-    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
-    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
-    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
-    <module reference="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)" version="1" />
-    <module reference="eb56ebf4-df56-438e-af06-fc1cd08b495a(jetbrains.mps.kotlin.smodel)" version="0" />
-    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)" version="0" />
-    <module reference="c7b55726-1795-47bd-aa21-714ac1e30f21(org.modelix.mps.notation)" version="0" />
-  </dependencyVersions>
-  <extendedLanguages>
-    <extendedLanguage>6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</extendedLanguage>
-  </extendedLanguages>
-</language>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/generator/templates/org.modelix.mps.baseLanguageInsideKotlin.generator.templates@generator.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/generator/templates/org.modelix.mps.baseLanguageInsideKotlin.generator.templates@generator.mps
deleted file mode 100644
index 8482d6ea..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/generator/templates/org.modelix.mps.baseLanguageInsideKotlin.generator.templates@generator.mps
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2cab633f-129d-4418-816f-f4df33c28737(org.modelix.mps.baseLanguageInsideKotlin.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin" version="11" />
-    <use id="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0" name="jetbrains.mps.kotlin.javaRefs" version="0" />
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="j33e" ref="r:4b957436-4ade-4da9-bdbc-7588a2d8af7d(org.modelix.mps.baseLanguageInsideKotlin.structure)" />
-    <import index="0" ref="b50d89c0-0fb9-4105-b652-222148c26a9b/kotlin:kotlin(jetbrains.mps.kotlin.stdlib/)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
-        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1167088157977" name="createRootRule" index="2VS0gm" />
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-      </concept>
-      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4" />
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
-        <reference id="1167087469901" name="templateNode" index="2VPoh2" />
-      </concept>
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
-      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-      </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
-        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
-      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
-      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
-        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
-      </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
-        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
-      </concept>
-    </language>
-    <language id="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0" name="jetbrains.mps.kotlin.javaRefs">
-      <concept id="2420378304458348492" name="jetbrains.mps.kotlin.javaRefs.structure.JavaMethodCall" flags="ng" index="2yQVVM">
-        <reference id="2420378304458348798" name="method" index="2yQV70" />
-      </concept>
-      <concept id="7565185111013327093" name="jetbrains.mps.kotlin.javaRefs.structure.JavaClassType" flags="ng" index="2EYIWN">
-        <reference id="7565185111013327225" name="javaClass" index="2EYIUZ" />
-      </concept>
-    </language>
-    <language id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin">
-      <concept id="1243006380186890016" name="jetbrains.mps.kotlin.structure.UnaryExpression" flags="ng" index="21Pmin">
-        <child id="1243006380186890019" name="operand" index="21Pmik" />
-      </concept>
-      <concept id="5401033615058672984" name="jetbrains.mps.kotlin.structure.ComponentDeclaration" flags="ng" index="2Rs4SG" />
-      <concept id="1314219036499415210" name="jetbrains.mps.kotlin.structure.AbstractPropertyDeclaration" flags="ng" index="TDTJE">
-        <property id="2936055411806090009" name="isReadonly" index="1Xb$ne" />
-      </concept>
-      <concept id="1314219036499415225" name="jetbrains.mps.kotlin.structure.LocalPropertyDeclaration" flags="ng" index="TDTJT" />
-      <concept id="1314219036498225646" name="jetbrains.mps.kotlin.structure.IStatementHolder" flags="ngI" index="THmaI">
-        <child id="1314219036498225649" name="statements" index="THmaL" />
-      </concept>
-      <concept id="6565639133219057675" name="jetbrains.mps.kotlin.structure.IArguments" flags="ngI" index="TWioa">
-        <child id="6565639133219057676" name="arguments" index="TWiod" />
-      </concept>
-      <concept id="5533310174484620657" name="jetbrains.mps.kotlin.structure.VariableRefExpression" flags="ng" index="UZU4S">
-        <reference id="5533310174484620658" name="target" index="UZU4V" />
-      </concept>
-      <concept id="409518875564192849" name="jetbrains.mps.kotlin.structure.IDeconstructingDeclarations" flags="ngI" index="1BvddI">
-        <child id="5401033615058696817" name="variables" index="2Rs2$5" />
-      </concept>
-      <concept id="6664176324866782072" name="jetbrains.mps.kotlin.structure.IClassReference" flags="ngI" index="1SePDR">
-        <reference id="6664176324866782075" name="class" index="1SePDO" />
-      </concept>
-      <concept id="2936055411798373599" name="jetbrains.mps.kotlin.structure.ClassType" flags="ng" index="1XD088" />
-      <concept id="2936055411798373456" name="jetbrains.mps.kotlin.structure.NavigationOperation" flags="ng" index="1XD0a7">
-        <child id="2936055411798374203" name="target" index="1XD07G" />
-      </concept>
-      <concept id="2936055411798373428" name="jetbrains.mps.kotlin.structure.FunctionDeclaration" flags="ng" index="1XD0bz" />
-      <concept id="2936055411798373697" name="jetbrains.mps.kotlin.structure.ReceiverType" flags="ng" index="1XD0em">
-        <child id="2936055411798374592" name="type" index="1XD0Sn" />
-      </concept>
-      <concept id="2936055411798373745" name="jetbrains.mps.kotlin.structure.VariableDeclaration" flags="ng" index="1XD0eA">
-        <child id="2936055411798374679" name="type" index="1XD0Z0" />
-      </concept>
-      <concept id="2936055411798373753" name="jetbrains.mps.kotlin.structure.ValueArgument" flags="ng" index="1XD0eI">
-        <child id="2936055411798374692" name="expression" index="1XD0ZN" />
-      </concept>
-    </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1187483539462121947" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_CreateIndexedName" flags="nn" index="32eq0B">
-        <child id="1187483539462121948" name="baseName" index="32eq0w" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
-      <concept id="1217004708011" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetInputModel" flags="nn" index="1r8y6K" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
-        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
-        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="1edLqv8Ou4o">
-    <property role="TrG5h" value="main" />
-    <node concept="2VPoh5" id="1edLqv8OPB3" role="2VS0gm">
-      <ref role="2VPoh2" node="1edLqv8OuQ7" resolve="JavaExpressions" />
-    </node>
-    <node concept="3aamgX" id="1edLqv8OLkh" role="3acgRq">
-      <ref role="30HIoZ" to="j33e:1edLqv8Ou4p" resolve="BaseLanguageFunctionInKotlin" />
-      <node concept="1Koe21" id="1edLqv8OLkl" role="1lVwrX">
-        <node concept="1XD0bz" id="1edLqv8OLkr" role="1Koe22">
-          <property role="TrG5h" value="f" />
-          <node concept="TDTJT" id="1edLqv8OLlR" role="THmaL">
-            <property role="1Xb$ne" value="true" />
-            <node concept="2Rs4SG" id="1edLqv8OLlS" role="2Rs2$5">
-              <property role="TrG5h" value="p1" />
-              <node concept="1XD088" id="1edLqv8OLm3" role="1XD0Z0">
-                <ref role="1SePDO" to="0:~kotlin/Int" resolve="Int" />
-              </node>
-            </node>
-          </node>
-          <node concept="1XD0a7" id="1edLqv8OLlh" role="THmaL">
-            <node concept="2yQVVM" id="1edLqv8OLls" role="1XD07G">
-              <ref role="2yQV70" node="1edLqv8OuRR" resolve="expression" />
-              <node concept="1XD0eI" id="1edLqv8ONCW" role="TWiod">
-                <node concept="UZU4S" id="1edLqv8ONDI" role="1XD0ZN">
-                  <ref role="UZU4V" node="1edLqv8OLlS" resolve="p1" />
-                </node>
-                <node concept="2b32R4" id="1edLqv8OOb4" role="lGtFl">
-                  <node concept="3JmXsc" id="1edLqv8OOb7" role="2P8S$">
-                    <node concept="3clFbS" id="1edLqv8OOb8" role="2VODD2">
-                      <node concept="3clFbF" id="1edLqv8OObe" role="3cqZAp">
-                        <node concept="2OqwBi" id="1edLqv8OOb9" role="3clFbG">
-                          <node concept="3Tsc0h" id="1edLqv8OObc" role="2OqNvi">
-                            <ref role="3TtcxE" to="j33e:1edLqv8Ou4_" resolve="parameterValues" />
-                          </node>
-                          <node concept="30H73N" id="1edLqv8OObd" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1XD0em" id="1edLqv8OLl5" role="21Pmik">
-              <node concept="2EYIWN" id="1edLqv8OLl3" role="1XD0Sn">
-                <ref role="2EYIUZ" node="1edLqv8OuQ7" resolve="JavaExpressions" />
-              </node>
-            </node>
-            <node concept="raruj" id="1edLqv8ON4e" role="lGtFl" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="1edLqv8OuQ7">
-    <property role="TrG5h" value="JavaExpressions" />
-    <node concept="2YIFZL" id="1edLqv8OuRR" role="jymVt">
-      <property role="TrG5h" value="expression" />
-      <node concept="37vLTG" id="1edLqv8OuTc" role="3clF46">
-        <property role="TrG5h" value="p1" />
-        <node concept="10Oyi0" id="1edLqv8OuTF" role="1tU5fm">
-          <node concept="29HgVG" id="1edLqv8OEkP" role="lGtFl">
-            <node concept="3NFfHV" id="1edLqv8OEkQ" role="3NFExx">
-              <node concept="3clFbS" id="1edLqv8OEkR" role="2VODD2">
-                <node concept="3clFbF" id="1edLqv8OEkX" role="3cqZAp">
-                  <node concept="2OqwBi" id="1edLqv8OEkS" role="3clFbG">
-                    <node concept="3TrEf2" id="1edLqv8OEkV" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
-                    </node>
-                    <node concept="30H73N" id="1edLqv8OEkW" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1WS0z7" id="1edLqv8ODja" role="lGtFl">
-          <node concept="3JmXsc" id="1edLqv8ODjd" role="3Jn$fo">
-            <node concept="3clFbS" id="1edLqv8ODje" role="2VODD2">
-              <node concept="3clFbF" id="1edLqv8ODjk" role="3cqZAp">
-                <node concept="2OqwBi" id="1edLqv8ODjf" role="3clFbG">
-                  <node concept="3Tsc0h" id="1edLqv8ODji" role="2OqNvi">
-                    <ref role="3TtcxE" to="j33e:1edLqv8Ou4y" resolve="parameterDeclarations" />
-                  </node>
-                  <node concept="30H73N" id="1edLqv8ODjj" role="2Oq$k0" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="17Uvod" id="1edLqv8OF8h" role="lGtFl">
-          <property role="2qtEX9" value="name" />
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <node concept="3zFVjK" id="1edLqv8OF8k" role="3zH0cK">
-            <node concept="3clFbS" id="1edLqv8OF8l" role="2VODD2">
-              <node concept="3clFbF" id="1edLqv8OF8r" role="3cqZAp">
-                <node concept="2OqwBi" id="1edLqv8OF8m" role="3clFbG">
-                  <node concept="3TrcHB" id="1edLqv8OF8p" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                  <node concept="30H73N" id="1edLqv8OF8q" role="2Oq$k0" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="1edLqv8OuRk" role="3clF47">
-        <node concept="3cpWs6" id="1edLqv8OuUu" role="3cqZAp">
-          <node concept="3cpWs3" id="1edLqv8OvWS" role="3cqZAk">
-            <node concept="37vLTw" id="1edLqv8OvX7" role="3uHU7w">
-              <ref role="3cqZAo" node="1edLqv8OuTc" resolve="p1" />
-            </node>
-            <node concept="Xl_RD" id="1edLqv8OuV_" role="3uHU7B" />
-          </node>
-          <node concept="2b32R4" id="1edLqv8Oy3B" role="lGtFl">
-            <node concept="3JmXsc" id="1edLqv8Oy3E" role="2P8S$">
-              <node concept="3clFbS" id="1edLqv8Oy3F" role="2VODD2">
-                <node concept="3clFbF" id="1edLqv8Oy3L" role="3cqZAp">
-                  <node concept="2OqwBi" id="1edLqv8O$Tu" role="3clFbG">
-                    <node concept="2OqwBi" id="1edLqv8Oy3G" role="2Oq$k0">
-                      <node concept="3TrEf2" id="1edLqv8OzFq" role="2OqNvi">
-                        <ref role="3Tt5mk" to="j33e:1edLqv8Ou4u" resolve="body" />
-                      </node>
-                      <node concept="30H73N" id="1edLqv8Oy3K" role="2Oq$k0" />
-                    </node>
-                    <node concept="3Tsc0h" id="1edLqv8O_pV" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="1edLqv8OuSK" role="3clF45">
-        <node concept="29HgVG" id="1edLqv8OJXu" role="lGtFl">
-          <node concept="3NFfHV" id="1edLqv8OJXv" role="3NFExx">
-            <node concept="3clFbS" id="1edLqv8OJXw" role="2VODD2">
-              <node concept="3clFbF" id="1edLqv8OJXA" role="3cqZAp">
-                <node concept="2OqwBi" id="1edLqv8OJXx" role="3clFbG">
-                  <node concept="3TrEf2" id="1edLqv8OJX$" role="2OqNvi">
-                    <ref role="3Tt5mk" to="j33e:1edLqv8Ou7U" resolve="baseLanguageReturnType" />
-                  </node>
-                  <node concept="30H73N" id="1edLqv8OJX_" role="2Oq$k0" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1edLqv8OuRj" role="1B3o_S" />
-      <node concept="1WS0z7" id="1edLqv8OwvC" role="lGtFl">
-        <node concept="3JmXsc" id="1edLqv8OwvD" role="3Jn$fo">
-          <node concept="3clFbS" id="1edLqv8OwvE" role="2VODD2">
-            <node concept="3clFbF" id="1edLqv8OwC8" role="3cqZAp">
-              <node concept="2OqwBi" id="1edLqv8OxeM" role="3clFbG">
-                <node concept="2OqwBi" id="1edLqv8OwVa" role="2Oq$k0">
-                  <node concept="1iwH7S" id="1edLqv8OwC7" role="2Oq$k0" />
-                  <node concept="1r8y6K" id="1edLqv8Ox1V" role="2OqNvi" />
-                </node>
-                <node concept="2SmgA7" id="1edLqv8Oxln" role="2OqNvi">
-                  <node concept="chp4Y" id="1edLqv8Oxwp" role="1dBWTz">
-                    <ref role="cht4Q" to="j33e:1edLqv8Ou4p" resolve="BaseLanguageFunctionInKotlin" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17Uvod" id="1edLqv8OHI1" role="lGtFl">
-        <property role="2qtEX9" value="name" />
-        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-        <node concept="3zFVjK" id="1edLqv8OHI2" role="3zH0cK">
-          <node concept="3clFbS" id="1edLqv8OHI3" role="2VODD2">
-            <node concept="3clFbF" id="1edLqv8OIv5" role="3cqZAp">
-              <node concept="2OqwBi" id="1edLqv8OITk" role="3clFbG">
-                <node concept="1iwH7S" id="1edLqv8OIv4" role="2Oq$k0" />
-                <node concept="32eq0B" id="1edLqv8OJ8E" role="2OqNvi">
-                  <node concept="Xl_RD" id="1edLqv8OJyg" role="32eq0w">
-                    <property role="Xl_RC" value="expression" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="1edLqv8OuQ8" role="1B3o_S" />
-    <node concept="n94m4" id="1edLqv8OuQ9" role="lGtFl" />
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.behavior.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.behavior.mps
deleted file mode 100644
index 2e39b411..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.behavior.mps
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6b4f4ca8-97ec-4d7d-80c3-86da3e870fc8(org.modelix.mps.baseLanguageInsideKotlin.behavior)">
-  <persistence version="9" />
-  <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.constraints.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.constraints.mps
deleted file mode 100644
index ba9c44fe..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.constraints.mps
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1f7e536c-3b3c-4f27-a241-03c0cb22232b(org.modelix.mps.baseLanguageInsideKotlin.constraints)">
-  <persistence version="9" />
-  <languages>
-    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
-    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
-    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
-    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
-    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
-    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
-    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
-    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.editor.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.editor.mps
deleted file mode 100644
index 0702701b..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.editor.mps
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:c7b3ed23-5210-481b-98bd-6694ae8b3516(org.modelix.mps.baseLanguageInsideKotlin.editor)">
-  <persistence version="9" />
-  <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="j33e" ref="r:4b957436-4ade-4da9-bdbc-7588a2d8af7d(org.modelix.mps.baseLanguageInsideKotlin.structure)" implicit="true" />
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
-      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
-        <property id="1140524450557" name="separatorText" index="2czwfO" />
-        <child id="1140524464360" name="cellLayout" index="2czzBx" />
-      </concept>
-      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
-      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
-      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
-      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
-        <child id="1080736633877" name="cellModel" index="2wV5jI" />
-      </concept>
-      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
-        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
-      </concept>
-      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
-        <property id="1186414551515" name="flag" index="VOm3f" />
-      </concept>
-      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
-        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
-      </concept>
-      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
-        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
-        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
-      </concept>
-      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
-        <property id="1073389577007" name="text" index="3F0ifm" />
-      </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
-        <child id="1219418656006" name="styleItem" index="3F10Kt" />
-      </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
-        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="24kQdi" id="1edLqv8Ou4D">
-    <ref role="1XX52x" to="j33e:1edLqv8Ou4p" resolve="BaseLanguageFunctionInKotlin" />
-    <node concept="3EZMnI" id="1edLqv8Ou4F" role="2wV5jI">
-      <node concept="PMmxH" id="1edLqv8Ou4P" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou4U" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-      </node>
-      <node concept="3F2HdR" id="1edLqv8Ou5c" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="j33e:1edLqv8Ou4y" resolve="parameterDeclarations" />
-        <node concept="l2Vlx" id="1edLqv8Ou5e" role="2czzBx" />
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou52" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou8g" role="3EZMnx">
-        <property role="3F0ifm" value=":" />
-      </node>
-      <node concept="3F1sOY" id="1edLqv8Ou8O" role="3EZMnx">
-        <ref role="1NtTu8" to="j33e:1edLqv8Ou7U" resolve="baseLanguageReturnType" />
-      </node>
-      <node concept="l2Vlx" id="1edLqv8Ou4I" role="2iSdaV" />
-      <node concept="3F0ifn" id="1edLqv8Ou5r" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-      </node>
-      <node concept="3F2HdR" id="1edLqv8Ou5X" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="j33e:1edLqv8Ou4_" resolve="parameterValues" />
-        <node concept="l2Vlx" id="1edLqv8Ou5Z" role="2czzBx" />
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou5F" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou6k" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <node concept="ljvvj" id="1edLqv8Ou7k" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="1edLqv8Ou6G" role="3EZMnx">
-        <ref role="1NtTu8" to="j33e:1edLqv8Ou4u" resolve="body" />
-        <node concept="lj46D" id="1edLqv8Ou7o" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1edLqv8Ou76" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <node concept="pVoyu" id="1edLqv8Ou7m" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.structure.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.structure.mps
deleted file mode 100644
index 96dba9f9..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.structure.mps
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4b957436-4ade-4da9-bdbc-7588a2d8af7d(org.modelix.mps.baseLanguageInsideKotlin.structure)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
-  </languages>
-  <imports>
-    <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
-        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
-        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-      </concept>
-      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
-        <reference id="1169127628841" name="intfc" index="PrY4T" />
-      </concept>
-      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
-        <reference id="1071489389519" name="extends" index="1TJDcQ" />
-        <child id="1169129564478" name="implements" index="PzmwI" />
-      </concept>
-      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
-        <property id="1071599776563" name="role" index="20kJfa" />
-        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
-        <property id="1071599937831" name="metaClass" index="20lmBu" />
-        <property id="241647608299431140" name="linkId" index="IQ2ns" />
-        <reference id="1071599976176" name="target" index="20lvS9" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1TIwiD" id="1edLqv8Ou4p">
-    <property role="EcuMT" value="1408999582856241433" />
-    <property role="TrG5h" value="BaseLanguageFunctionInKotlin" />
-    <property role="34LRSv" value="extractBaseLanguageFunction" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="1edLqv8Ou4u" role="1TKVEi">
-      <property role="IQ2ns" value="1408999582856241438" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-    <node concept="1TJgyj" id="1edLqv8Ou4y" role="1TKVEi">
-      <property role="IQ2ns" value="1408999582856241442" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameterDeclarations" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="1edLqv8Ou4_" role="1TKVEi">
-      <property role="IQ2ns" value="1408999582856241445" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameterValues" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
-    </node>
-    <node concept="1TJgyj" id="1edLqv8Ou7U" role="1TKVEi">
-      <property role="IQ2ns" value="1408999582856241658" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="baseLanguageReturnType" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
-    </node>
-    <node concept="PrWs8" id="1edLqv8Ou4s" role="PzmwI">
-      <ref role="PrY4T" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
-    </node>
-  </node>
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.typesystem.mps b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.typesystem.mps
deleted file mode 100644
index 99998c26..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/models/org.modelix.mps.baseLanguageInsideKotlin.typesystem.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:445cdf91-76c8-4de7-8f50-e379ca4e4aec(org.modelix.mps.baseLanguageInsideKotlin.typesystem)">
-  <persistence version="9" />
-  <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl b/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl
deleted file mode 100644
index 6efe282e..00000000
--- a/mps/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language namespace="org.modelix.mps.baseLanguageInsideKotlin" uuid="cc24a92d-c78e-4016-a5d4-902df7135727" languageVersion="0" moduleVersion="0">
-  <models>
-    <modelRoot type="default" contentPath="${module}">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.modelix.mps.baseLanguageInsideKotlin.generator" uuid="453b04fd-1a18-4a61-b83c-30b84413ef31">
-      <models>
-        <modelRoot type="default" contentPath="${module}/generator">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <dependencies>
-        <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-      </dependencies>
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:4caf0310-491e-41f5-8a9b-2006b3a94898:jetbrains.mps.execution.util" version="0" />
-        <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="11" />
-        <language slang="l:9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0:jetbrains.mps.kotlin.javaRefs" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l: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" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
-        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
-        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="cc24a92d-c78e-4016-a5d4-902df7135727(org.modelix.mps.baseLanguageInsideKotlin)" version="0" />
-        <module reference="453b04fd-1a18-4a61-b83c-30b84413ef31(org.modelix.mps.baseLanguageInsideKotlin.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <dependencies>
-    <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false" scope="generate-into">9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
-    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
-    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
-    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
-    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
-    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
-    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
-    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
-    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
-    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
-    <module reference="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)" version="1" />
-    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="cc24a92d-c78e-4016-a5d4-902df7135727(org.modelix.mps.baseLanguageInsideKotlin)" version="0" />
-  </dependencyVersions>
-  <extendedLanguages>
-    <extendedLanguage>6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</extendedLanguage>
-  </extendedLanguages>
-</language>
-
diff --git a/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps b/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
index 15ed8f0f..fec81555 100644
--- a/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
+++ b/mps/modules/org.modelix.mps.notation.impl.baseLanguage/models/org.modelix.mps.notation.impl.baseLanguage.modelix.mps
@@ -25,11 +25,6 @@
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
     </language>
-    <language id="8f2def56-7502-4f14-994f-472d404e528c" name="org.modelix.mps.baseLanguage2kotlin">
-      <concept id="2346135138155145856" name="org.modelix.mps.baseLanguage2kotlin.structure.BaseLanguageExpressionWrapper" flags="ng" index="1KgSZU">
-        <child id="2346135138155145859" name="expression" index="1KgSZT" />
-      </concept>
-    </language>
     <language id="c7b55726-1795-47bd-aa21-714ac1e30f21" name="org.modelix.mps.notation">
       <concept id="4861157503443502186" name="org.modelix.mps.notation.structure.NewLineCell" flags="ng" index="IzWyk" />
       <concept id="737165568293720756" name="org.modelix.mps.notation.structure.IndentCell" flags="ng" index="2OWiap" />
@@ -1351,12 +1346,10 @@
         </node>
         <node concept="1yiJt1" id="22f9nDgUKam" role="2OY0$2">
           <ref role="1yiJtc" to="tpee:fIYIWN3" resolve="staticMethodDeclaration" />
-          <node concept="1KgSZU" id="6xJrM0Np1Pw" role="1KhJq6">
-            <node concept="2OqwBi" id="6xJrM0Np2aX" role="1KgSZT">
-              <node concept="1KnsVF" id="6xJrM0Np1P$" role="2Oq$k0" />
-              <node concept="3TrcHB" id="6xJrM0Np4_r" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
+          <node concept="2OqwBi" id="6xJrM0Np2aX" role="1KhJq6">
+            <node concept="1KnsVF" id="6xJrM0Np1P$" role="2Oq$k0" />
+            <node concept="3TrcHB" id="6xJrM0Np4_r" role="2OqNvi">
+              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
             </node>
           </node>
         </node>
@@ -2475,12 +2468,10 @@
       <ref role="3JBHV4" to="tpee:huS8uEI" resolve="PropertyReference" />
       <node concept="1yiJt1" id="4cpiv6orBLX" role="3JBHQ1">
         <ref role="1yiJtc" to="tpee:huS8YPn" resolve="property" />
-        <node concept="1KgSZU" id="4cpiv6orDYX" role="1KhJq6">
-          <node concept="2OqwBi" id="4cpiv6orE9b" role="1KgSZT">
-            <node concept="1KnsVF" id="4cpiv6orDZ1" role="2Oq$k0" />
-            <node concept="3TrcHB" id="4cpiv6orEvh" role="2OqNvi">
-              <ref role="3TsBF5" to="tpee:huRkwj$" resolve="propertyName" />
-            </node>
+        <node concept="2OqwBi" id="4cpiv6orE9b" role="1KhJq6">
+          <node concept="1KnsVF" id="4cpiv6orDZ1" role="2Oq$k0" />
+          <node concept="3TrcHB" id="4cpiv6orEvh" role="2OqNvi">
+            <ref role="3TsBF5" to="tpee:huRkwj$" resolve="propertyName" />
           </node>
         </node>
       </node>
@@ -2704,12 +2695,10 @@
       <ref role="3JBHV4" to="tpee:55tuCQivDYN" resolve="LocalPropertyReference" />
       <node concept="1yiJt1" id="4cpiv6orHDt" role="3JBHQ1">
         <ref role="1yiJtc" to="tpee:55tuCQivDYO" resolve="property" />
-        <node concept="1KgSZU" id="4cpiv6orHDv" role="1KhJq6">
-          <node concept="2OqwBi" id="4cpiv6orHNH" role="1KgSZT">
-            <node concept="1KnsVF" id="4cpiv6orHDz" role="2Oq$k0" />
-            <node concept="3TrcHB" id="4cpiv6orIw2" role="2OqNvi">
-              <ref role="3TsBF5" to="tpee:huRkwj$" resolve="propertyName" />
-            </node>
+        <node concept="2OqwBi" id="4cpiv6orHNH" role="1KhJq6">
+          <node concept="1KnsVF" id="4cpiv6orHDz" role="2Oq$k0" />
+          <node concept="3TrcHB" id="4cpiv6orIw2" role="2OqNvi">
+            <ref role="3TsBF5" to="tpee:huRkwj$" resolve="propertyName" />
           </node>
         </node>
       </node>
@@ -3377,12 +3366,10 @@
       <ref role="3JBHV4" to="tp25:gzTsc4p" resolve="SLinkListAccess" />
       <node concept="1yiJt1" id="22f9nDgLubK" role="3JBHQ1">
         <ref role="1yiJtc" to="tp25:gzTtc_y" resolve="link" />
-        <node concept="1KgSZU" id="22f9nDgOFCc" role="1KhJq6">
-          <node concept="2OqwBi" id="22f9nDgP9fU" role="1KgSZT">
-            <node concept="1KnsVF" id="22f9nDgP96j" role="2Oq$k0" />
-            <node concept="3TrcHB" id="22f9nDgP9xg" role="2OqNvi">
-              <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
-            </node>
+        <node concept="2OqwBi" id="22f9nDgP9fU" role="1KhJq6">
+          <node concept="1KnsVF" id="22f9nDgP96j" role="2Oq$k0" />
+          <node concept="3TrcHB" id="22f9nDgP9xg" role="2OqNvi">
+            <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
           </node>
         </node>
       </node>
@@ -3391,12 +3378,10 @@
       <ref role="3JBHV4" to="tp25:gzTrEba" resolve="SLinkAccess" />
       <node concept="1yiJt1" id="22f9nDgLvL8" role="3JBHQ1">
         <ref role="1yiJtc" to="tp25:gzTt5is" resolve="link" />
-        <node concept="1KgSZU" id="22f9nDgUAYe" role="1KhJq6">
-          <node concept="2OqwBi" id="22f9nDgUB7P" role="1KgSZT">
-            <node concept="1KnsVF" id="22f9nDgUAYi" role="2Oq$k0" />
-            <node concept="3TrcHB" id="22f9nDgUBpb" role="2OqNvi">
-              <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
-            </node>
+        <node concept="2OqwBi" id="22f9nDgUB7P" role="1KhJq6">
+          <node concept="1KnsVF" id="22f9nDgUAYi" role="2Oq$k0" />
+          <node concept="3TrcHB" id="22f9nDgUBpb" role="2OqNvi">
+            <ref role="3TsBF5" to="tpce:fA0kJcN" resolve="role" />
           </node>
         </node>
       </node>
@@ -3445,12 +3430,10 @@
           <ref role="1yiDfm" to="tp25:3oQEojIPgjT" resolve="conceptArgument" />
         </node>
       </node>
-      <node concept="1KgSZU" id="6xJrM0NvG0k" role="3JBHR6">
-        <node concept="2OqwBi" id="6xJrM0NvG7N" role="1KgSZT">
-          <node concept="1KgDno" id="6xJrM0NvG0o" role="2Oq$k0" />
-          <node concept="3TrcHB" id="6xJrM0NvGjp" role="2OqNvi">
-            <ref role="3TsBF5" to="tp25:i1BlNJ7" resolve="asCast" />
-          </node>
+      <node concept="2OqwBi" id="6xJrM0NvG7N" role="3JBHR6">
+        <node concept="1KgDno" id="6xJrM0NvG0o" role="2Oq$k0" />
+        <node concept="3TrcHB" id="6xJrM0NvGjp" role="2OqNvi">
+          <ref role="3TsBF5" to="tp25:i1BlNJ7" resolve="asCast" />
         </node>
       </node>
     </node>
@@ -3469,13 +3452,11 @@
           <ref role="1yiDfm" to="tp25:3oQEojIPgjT" resolve="conceptArgument" />
         </node>
       </node>
-      <node concept="1KgSZU" id="6xJrM0NvGm4" role="3JBHR6">
-        <node concept="3fqX7Q" id="6xJrM0NvGqE" role="1KgSZT">
-          <node concept="2OqwBi" id="6xJrM0NvGqG" role="3fr31v">
-            <node concept="1KgDno" id="6xJrM0NvGqH" role="2Oq$k0" />
-            <node concept="3TrcHB" id="6xJrM0NvGqI" role="2OqNvi">
-              <ref role="3TsBF5" to="tp25:i1BlNJ7" resolve="asCast" />
-            </node>
+      <node concept="3fqX7Q" id="6xJrM0NvGqE" role="3JBHR6">
+        <node concept="2OqwBi" id="6xJrM0NvGqG" role="3fr31v">
+          <node concept="1KgDno" id="6xJrM0NvGqH" role="2Oq$k0" />
+          <node concept="3TrcHB" id="6xJrM0NvGqI" role="2OqNvi">
+            <ref role="3TsBF5" to="tp25:i1BlNJ7" resolve="asCast" />
           </node>
         </node>
       </node>
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 e09b5901..f943b704 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
@@ -21,6 +21,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l: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" />
@@ -32,8 +33,6 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:8f2def56-7502-4f14-994f-472d404e528c:org.modelix.mps.baseLanguage2kotlin" version="0" />
-    <language slang="l:cc24a92d-c78e-4016-a5d4-902df7135727:org.modelix.mps.baseLanguageInsideKotlin" version="0" />
     <language slang="l:c7b55726-1795-47bd-aa21-714ac1e30f21:org.modelix.mps.notation" version="0" />
     <language slang="l:67accce2-9676-4728-9e9c-8b15ea30d924:org.modelix.mps.react" version="0" />
   </languageVersions>
diff --git a/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps b/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
index 50580296..0f99dac2 100644
--- a/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
+++ b/mps/modules/org.modelix.mps.notation/generator/templates/org.modelix.mps.notation.generator.templates@generator.mps
@@ -2,97 +2,133 @@
 <model ref="r:2fe6cd77-4aa8-40a0-b3ed-e4eb6d6a496f(org.modelix.mps.notation.generator.templates@generator)">
   <persistence version="9" />
   <languages>
-    <use id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin" version="11" />
-    <use id="2405a196-e75d-462c-938b-ae8e3fac20aa" name="jetbrains.mps.baseLanguage.kotlinRefs" version="0" />
-    <use id="eb56ebf4-df56-438e-af06-fc1cd08b495a" name="jetbrains.mps.kotlin.smodel" version="0" />
-    <use id="b17a9ec8-44a5-40a1-9216-058d277424eb" name="jetbrains.mps.kotlin.internal" version="0" />
-    <use id="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0" name="jetbrains.mps.kotlin.javaRefs" version="0" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="c7b55726-1795-47bd-aa21-714ac1e30f21" name="org.modelix.mps.notation" version="0" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="cc24a92d-c78e-4016-a5d4-902df7135727" name="org.modelix.mps.baseLanguageInsideKotlin" version="0" />
+    <use id="515552c7-fcc0-4ab4-9789-2f3c49344e85" name="jetbrains.mps.baseLanguage.varVariable" version="0" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-    <devkit ref="3605c367-b661-48bf-8131-d9bd75494e4d(jetbrains.mps.devkit.kotlin)" />
   </languages>
   <imports>
     <import index="f8gn" ref="r:37580d55-803b-40f6-8108-d95a9fce8d6e(org.modelix.mps.notation.structure)" />
-    <import index="i6vs" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/kotlinJvm:org.modelix.aspects(org.modelix.mps.editor.ssr.stubs/)" />
-    <import index="dbfy" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/kotlinJvm:org.modelix.editor(org.modelix.mps.editor.ssr.stubs/)" />
-    <import index="1g18" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/kotlinJvm:org.modelix.model.mpsadapters(org.modelix.mps.editor.common.stubs/)" />
-    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="2k9e" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure(MPS.Core/)" />
     <import index="e8bb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.ids(MPS.Core/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="pjrh" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter(MPS.Core/)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="b15i" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/kotlinJvm:org.modelix.model.api(org.modelix.mps.editor.common.stubs/)" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
-    <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
-    <import index="8jio" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/kotlinJvm:org.modelix.editor.ssr.mps(org.modelix.mps.editor.ssr.stubs/)" />
-    <import index="ya4x" ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="j33e" ref="r:4b957436-4ade-4da9-bdbc-7588a2d8af7d(org.modelix.mps.baseLanguageInsideKotlin.structure)" />
-    <import index="qjbp" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/kotlinJvm:org.modelix.model.mpsadapters.tomps(org.modelix.mps.editor.common.stubs/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="ljn7" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/java:org.modelix.editor.ssr.mps(org.modelix.mps.editor.ssr.stubs/)" />
+    <import index="x83f" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/java:org.modelix.aspects(org.modelix.mps.editor.ssr.stubs/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="jej1" ref="771cf896-ab1b-409b-93b4-48c3bbb6b23f/java:org.modelix.editor(org.modelix.mps.editor.ssr.stubs/)" />
+    <import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
+    <import index="zxfz" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:org.modelix.model.mpsadapters(org.modelix.mps.editor.common.stubs/)" />
+    <import index="jks5" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:org.modelix.model.api(org.modelix.mps.editor.common.stubs/)" />
+    <import index="1ut2" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:org.modelix.model.mpsadapters.tomps(org.modelix.mps.editor.common.stubs/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="wsib" ref="r:d1d5cd51-6710-43f8-bd5b-f958da6e1ca2(org.modelix.mps.notation.behavior)" implicit="true" />
-    <import index="1xrd" ref="b50d89c0-0fb9-4105-b652-222148c26a9b/kotlin:kotlin.collections(jetbrains.mps.kotlin.stdlib/)" implicit="true" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -101,12 +137,8 @@
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
-    </language>
-    <language id="8f2def56-7502-4f14-994f-472d404e528c" name="org.modelix.mps.baseLanguage2kotlin">
-      <concept id="2346135138155708006" name="org.modelix.mps.baseLanguage2kotlin.structure.ConvertToKotlin" flags="ng" index="1KmxGs">
-        <child id="2346135138155708009" name="expression" index="1KmxGj" />
-      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="ln" index="5jKBG">
@@ -172,96 +204,12 @@
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
-    <language id="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0" name="jetbrains.mps.kotlin.javaRefs">
-      <concept id="2420378304458348492" name="jetbrains.mps.kotlin.javaRefs.structure.JavaMethodCall" flags="ng" index="2yQVVM">
-        <reference id="2420378304458348798" name="method" index="2yQV70" />
-      </concept>
-      <concept id="7565185111013327093" name="jetbrains.mps.kotlin.javaRefs.structure.JavaClassType" flags="ng" index="2EYIWN">
-        <reference id="7565185111013327225" name="javaClass" index="2EYIUZ" />
-      </concept>
-    </language>
-    <language id="6b3888c1-9802-44d8-8baf-f8e6c33ed689" name="jetbrains.mps.kotlin">
-      <concept id="1243006380186890016" name="jetbrains.mps.kotlin.structure.UnaryExpression" flags="ng" index="21Pmin">
-        <child id="1243006380186890019" name="operand" index="21Pmik" />
-      </concept>
-      <concept id="1243006380188575965" name="jetbrains.mps.kotlin.structure.StringLiteralRaw" flags="ng" index="21VMdE">
-        <property id="1243006380188575966" name="content" index="21VMdD" />
-      </concept>
-      <concept id="7996321249597408849" name="jetbrains.mps.kotlin.structure.IInheritExplicitly" flags="ngI" index="6Oumu">
-        <child id="1991556721067228837" name="superclasses" index="AST3G" />
-      </concept>
-      <concept id="5622728304609204267" name="jetbrains.mps.kotlin.structure.EmptyDeclaration" flags="ng" index="eKYAL" />
-      <concept id="1991556721070973461" name="jetbrains.mps.kotlin.structure.EmptyStatement" flags="ng" index="AQkLs" />
-      <concept id="6389031306614148912" name="jetbrains.mps.kotlin.structure.StringLiteralLine" flags="ng" index="Df6$J">
-        <child id="6389031306614152501" name="parts" index="Df7GE" />
-      </concept>
-      <concept id="2324909103759097704" name="jetbrains.mps.kotlin.structure.IWithClassBody" flags="ngI" index="KS$fF">
-        <child id="2324909103759097705" name="members" index="KS$fE" />
-      </concept>
-      <concept id="2324909103760650644" name="jetbrains.mps.kotlin.structure.SuperClassSpecifier" flags="ng" index="KYwOn">
-        <reference id="2324909103760650645" name="target" index="KYwOm" />
-      </concept>
-      <concept id="1314219036499415210" name="jetbrains.mps.kotlin.structure.AbstractPropertyDeclaration" flags="ng" index="TDTJE">
-        <property id="2936055411806090009" name="isReadonly" index="1Xb$ne" />
-        <child id="2936055411798374330" name="assignment" index="1XD05H" />
-      </concept>
-      <concept id="1314219036498225646" name="jetbrains.mps.kotlin.structure.IStatementHolder" flags="ngI" index="THmaI">
-        <child id="1314219036498225649" name="statements" index="THmaL" />
-      </concept>
-      <concept id="6565639133219057675" name="jetbrains.mps.kotlin.structure.IArguments" flags="ngI" index="TWioa">
-        <child id="6565639133219057676" name="arguments" index="TWiod" />
-      </concept>
-      <concept id="5533310174484620657" name="jetbrains.mps.kotlin.structure.VariableRefExpression" flags="ng" index="UZU4S">
-        <reference id="5533310174484620658" name="target" index="UZU4V" />
-      </concept>
-      <concept id="7027413324315184167" name="jetbrains.mps.kotlin.structure.ILambdaAsArgument" flags="ngI" index="3$8iW8">
-        <child id="2936055411798374269" name="lambda" index="1XD06E" />
-      </concept>
-      <concept id="4662566628538082515" name="jetbrains.mps.kotlin.structure.FunctionCallTarget" flags="ng" index="1NbEtQ" />
-      <concept id="4662566628538083705" name="jetbrains.mps.kotlin.structure.FunctionCallExpression" flags="ng" index="1NbEFs" />
-      <concept id="6664176324866782072" name="jetbrains.mps.kotlin.structure.IClassReference" flags="ngI" index="1SePDR">
-        <reference id="6664176324866782075" name="class" index="1SePDO" />
-      </concept>
-      <concept id="2936055411798373599" name="jetbrains.mps.kotlin.structure.ClassType" flags="ng" index="1XD088" />
-      <concept id="2936055411798373627" name="jetbrains.mps.kotlin.structure.StringLiteral" flags="ng" index="1XD08G">
-        <child id="6389031306614148417" name="lines" index="Df6Hu" />
-      </concept>
-      <concept id="2936055411798373537" name="jetbrains.mps.kotlin.structure.PropertyDeclaration" flags="ng" index="1XD09Q">
-        <child id="1314219036499436525" name="declaration" index="TDYyH" />
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
-      <concept id="2936055411798373456" name="jetbrains.mps.kotlin.structure.NavigationOperation" flags="ng" index="1XD0a7">
-        <child id="2936055411798374203" name="target" index="1XD07G" />
-      </concept>
-      <concept id="2936055411798373428" name="jetbrains.mps.kotlin.structure.FunctionDeclaration" flags="ng" index="1XD0bz">
-        <property id="4908873499999643325" name="isOverride" index="3qOnjd" />
-      </concept>
-      <concept id="2936055411798373439" name="jetbrains.mps.kotlin.structure.AbstractFunctionCall" flags="ng" index="1XD0bC">
-        <reference id="1991556721072067817" name="function" index="AarEw" />
-      </concept>
-      <concept id="2936055411798373784" name="jetbrains.mps.kotlin.structure.ThisExpression" flags="ng" index="1XD0df" />
-      <concept id="2936055411798373697" name="jetbrains.mps.kotlin.structure.ReceiverType" flags="ng" index="1XD0em">
-        <child id="2936055411798374592" name="type" index="1XD0Sn" />
-      </concept>
-      <concept id="2936055411798373745" name="jetbrains.mps.kotlin.structure.VariableDeclaration" flags="ng" index="1XD0eA">
-        <child id="2936055411798374679" name="type" index="1XD0Z0" />
-      </concept>
-      <concept id="2936055411798373753" name="jetbrains.mps.kotlin.structure.ValueArgument" flags="ng" index="1XD0eI">
-        <reference id="1243006380188956795" name="parameter" index="21Xffc" />
-        <child id="2936055411798374692" name="expression" index="1XD0ZN" />
-      </concept>
-      <concept id="2936055411798373655" name="jetbrains.mps.kotlin.structure.LambdaLiteral" flags="ng" index="1XD0f0">
-        <child id="1243006380186866155" name="parameters" index="21PhDs" />
-      </concept>
-      <concept id="2936055411798373641" name="jetbrains.mps.kotlin.structure.AnonymousInitializer" flags="ng" index="1XD0fu" />
-      <concept id="2936055411798373673" name="jetbrains.mps.kotlin.structure.KotlinFile" flags="ng" index="1XD0fY">
-        <child id="2936055411798374537" name="declarations" index="1XD0Tu" />
-      </concept>
-      <concept id="2936055411798373333" name="jetbrains.mps.kotlin.structure.NullLiteral" flags="ng" index="1XD0k2" />
-      <concept id="2936055411798373327" name="jetbrains.mps.kotlin.structure.BooleanLiteral" flags="ng" index="1XD0ko" />
-      <concept id="2936055411798373223" name="jetbrains.mps.kotlin.structure.PropertyDefaultAssignement" flags="ng" index="1XD0mK">
-        <child id="2936055411798373866" name="expression" index="1XD0cX" />
-      </concept>
-      <concept id="2936055411798373220" name="jetbrains.mps.kotlin.structure.ObjectDeclaration" flags="ng" index="1XD0mN" />
     </language>
     <language id="c7b55726-1795-47bd-aa21-714ac1e30f21" name="org.modelix.mps.notation">
       <concept id="737165568294088373" name="org.modelix.mps.notation.structure.WithIdentCell" flags="ng" index="2OUTUo">
@@ -273,43 +221,16 @@
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
       <concept id="1217004708011" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetInputModel" flags="nn" index="1r8y6K" />
     </language>
-    <language id="eb56ebf4-df56-438e-af06-fc1cd08b495a" name="jetbrains.mps.kotlin.smodel">
-      <concept id="3181756179490075795" name="jetbrains.mps.kotlin.smodel.structure.PropertyReference" flags="ng" index="kjMFK">
-        <reference id="3181756179490075797" name="link" index="kjMFQ" />
-        <reference id="3181756179490075796" name="concept" index="kjMFR" />
-      </concept>
-      <concept id="3181756179480673613" name="jetbrains.mps.kotlin.smodel.structure.LinkReference" flags="ng" index="rZEcI">
-        <reference id="3181756179480675986" name="concept" index="rZ_zL" />
-        <reference id="3181756179480675489" name="link" index="rZ_F2" />
-      </concept>
-    </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
         <reference id="7256306938026143658" name="target" index="2aWVGs" />
         <child id="7256306938026143676" name="child" index="2aWVGa" />
       </concept>
     </language>
-    <language id="cc24a92d-c78e-4016-a5d4-902df7135727" name="org.modelix.mps.baseLanguageInsideKotlin">
-      <concept id="1408999582856241433" name="org.modelix.mps.baseLanguageInsideKotlin.structure.BaseLanguageFunctionInKotlin" flags="ng" index="3rn2iY">
-        <child id="1408999582856241658" name="baseLanguageReturnType" index="3rn2ht" />
-        <child id="1408999582856241445" name="parameterValues" index="3rn2i2" />
-        <child id="1408999582856241442" name="parameterDeclarations" index="3rn2i5" />
-        <child id="1408999582856241438" name="body" index="3rn2iT" />
-      </concept>
-    </language>
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
-      <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="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
@@ -325,23 +246,27 @@
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
       </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
       </concept>
+      <concept id="2644386474302386080" name="jetbrains.mps.lang.smodel.structure.PropertyIdRefExpression" flags="nn" index="355D3s">
+        <reference id="2644386474302386081" name="conceptDeclaration" index="355D3t" />
+        <reference id="2644386474302386082" name="propertyDeclaration" index="355D3u" />
+      </concept>
+      <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
+        <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
+        <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
+      </concept>
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
@@ -376,10 +301,19 @@
         <child id="2535923850359271783" name="elements" index="1PaTwD" />
       </concept>
     </language>
+    <language id="515552c7-fcc0-4ab4-9789-2f3c49344e85" name="jetbrains.mps.baseLanguage.varVariable">
+      <concept id="1177714083117" name="jetbrains.mps.baseLanguage.varVariable.structure.VarType" flags="in" index="PeGgZ" />
+      <concept id="1236693300889" name="jetbrains.mps.baseLanguage.varVariable.structure.VarVariableDeclaration" flags="ng" index="3KEzu6" />
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
         <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
       </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
     </language>
   </registry>
@@ -389,38 +323,81 @@
       <ref role="aOQi4" to="f8gn:7dm8yUsM9Ro" resolve="NotationModule" />
     </node>
     <node concept="2VPoh5" id="22f9nDgLfkO" role="2VS0gm">
-      <ref role="2VPoh2" node="63DBII8pVW4" resolve="AspectsDescriptor" />
+      <ref role="2VPoh2" node="7HT$1xKu5Jt" resolve="AspectsDescriptor" />
     </node>
-    <node concept="3aamgX" id="1NttIwKSwMa" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZ9vfI" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:7dm8yUsMxrq" resolve="ConstantCell" />
-      <node concept="gft3U" id="1NttIwKSwOK" role="1lVwrX">
-        <node concept="1NbEFs" id="1NttIwKSwOQ" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.constant(kotlin/String,kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="constant" />
-          <node concept="1XD0eI" id="1NttIwKSwOR" role="TWiod">
-            <node concept="1XD08G" id="1NttIwKSwOS" role="1XD0ZN">
-              <node concept="Df6$J" id="1NttIwKSwOT" role="Df6Hu">
-                <node concept="21VMdE" id="1NttIwKSwOU" role="Df7GE">
-                  <property role="21VMdD" value="abc" />
-                  <node concept="17Uvod" id="1NttIwKSwOV" role="lGtFl">
-                    <property role="2qtEX9" value="content" />
-                    <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                    <node concept="3zFVjK" id="1NttIwKSwOW" role="3zH0cK">
-                      <node concept="3clFbS" id="1NttIwKSwOX" role="2VODD2">
-                        <node concept="3clFbF" id="4JzlXapj_Ln" role="3cqZAp">
-                          <node concept="2YIFZM" id="4JzlXapjAtU" role="3clFbG">
-                            <ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String)" resolve="escapeString" />
-                            <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
-                            <node concept="2OqwBi" id="1NttIwKSxAn" role="37wK5m">
-                              <node concept="30H73N" id="1NttIwKSx9s" role="2Oq$k0" />
-                              <node concept="3TrcHB" id="1NttIwKSxPc" role="2OqNvi">
-                                <ref role="3TsBF5" to="f8gn:7dm8yUsMxD1" resolve="text" />
+      <node concept="1Koe21" id="1vEPqpZ9zDC" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZ9_wL" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZ9$NW" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZ9_kw" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZ9_PL" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZ9_Qn" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZ9_RS" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZ9EDo" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZ9EDp" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZ9EDq" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZ9EDr" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZ9GiV" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZ9GEn" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZ9GiT" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZ9EDp" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZ9J9w" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.constant(java.lang.String,kotlin.jvm.functions.Function1)" resolve="constant" />
+                      <node concept="Xl_RD" id="1vEPqpZ9Jwv" role="37wK5m">
+                        <property role="Xl_RC" value="abc" />
+                        <node concept="17Uvod" id="1vEPqpZ9Tkj" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="1vEPqpZ9Tkk" role="3zH0cK">
+                            <node concept="3clFbS" id="1vEPqpZ9Tkl" role="2VODD2">
+                              <node concept="3clFbF" id="1vEPqpZ9Uda" role="3cqZAp">
+                                <node concept="2YIFZM" id="1vEPqpZ9Udb" role="3clFbG">
+                                  <ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String)" resolve="escapeString" />
+                                  <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
+                                  <node concept="2OqwBi" id="1vEPqpZ9Udc" role="37wK5m">
+                                    <node concept="30H73N" id="1vEPqpZ9Udd" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="1vEPqpZ9Ude" role="2OqNvi">
+                                      <ref role="3TsBF5" to="f8gn:7dm8yUsMxD1" resolve="text" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="1bVj0M" id="1vEPqpZ9Ms4" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZ9Msc" role="1bW2Oz">
+                          <property role="TrG5h" value="b" />
+                          <node concept="2jxLKc" id="1vEPqpZ9Msd" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="1vEPqpZ9Mse" role="1bW5cS">
+                          <node concept="3cpWs6" id="1vEPqpZ9QR2" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZ9QR3" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZ9VQj" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZ9EDY" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZ9EDZ" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -428,97 +405,238 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="ziPuhEDCPl" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZ9WWD" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhEA4oz" resolve="RemoveSpace" />
-      <node concept="gft3U" id="ziPuhEDCPm" role="1lVwrX">
-        <node concept="1NbEFs" id="ziPuhEDCPn" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.noSpace()" resolve="noSpace" />
+      <node concept="1Koe21" id="1vEPqpZ9WWE" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZ9WWF" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZ9WWG" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZ9WWH" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZ9WWI" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZ9WWJ" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZ9WWK" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZ9WWL" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZ9WWM" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZ9WWN" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZ9WWO" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZ9WWP" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZ9WWQ" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZ9WWR" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZ9WWM" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZ9WWS" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.noSpace()" resolve="noSpace" />
+                    </node>
+                  </node>
+                  <node concept="raruj" id="1vEPqpZ9WX8" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZ9WX9" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZ9WXa" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4dQjfTHYE8u" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZa9M8" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:4dQjfTHYohE" resolve="NewLineCell" />
-      <node concept="gft3U" id="4dQjfTHYE8v" role="1lVwrX">
-        <node concept="1NbEFs" id="4dQjfTHYE8w" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.newLine()" resolve="newLine" />
+      <node concept="1Koe21" id="1vEPqpZa9M9" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZa9Ma" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZa9Mb" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZa9Mc" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZa9Md" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZa9Me" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZa9Mf" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZa9Mg" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZa9Mh" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZa9Mi" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZa9Mj" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZa9Mk" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZa9Ml" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZa9Mm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZa9Mh" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZa9Mn" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.newLine()" resolve="newLine" />
+                    </node>
+                  </node>
+                  <node concept="raruj" id="1vEPqpZa9Mo" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZa9Mp" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZa9Mq" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="42C8o9n_Q$D" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZagBn" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhE_FoM" resolve="ConceptAliasCell" />
-      <node concept="gft3U" id="42C8o9n_Q$E" role="1lVwrX">
-        <node concept="1NbEFs" id="42C8o9n_Q$F" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.conceptAlias(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="conceptAlias" />
+      <node concept="1Koe21" id="1vEPqpZagBo" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZagBp" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZagBq" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZagBr" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZagBs" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZagBt" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZagBu" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZagBv" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZagBw" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZagBx" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZagBy" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZagBz" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZagB$" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZagB_" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZagBw" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZagBA" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.conceptAlias(kotlin.jvm.functions.Function1)" resolve="conceptAlias" />
+                      <node concept="1bVj0M" id="1vEPqpZapxO" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZapxP" role="1bW2Oz">
+                          <property role="TrG5h" value="b" />
+                          <node concept="2jxLKc" id="1vEPqpZapxQ" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="1vEPqpZapxR" role="1bW5cS">
+                          <node concept="3cpWs6" id="1vEPqpZapxS" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZapxT" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="1vEPqpZagBB" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZagBC" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZagBD" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="3CJpHJsa$LZ" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZaquo" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhEAsOy" resolve="SubstituteCell" />
-      <node concept="gft3U" id="3CJpHJsa$M0" role="1lVwrX">
-        <node concept="1NbEFs" id="3CJpHJsa$M1" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~NotationRootCellTemplateBuilder.completionText(kotlin/String)" resolve="completionText" />
-          <node concept="1XD0eI" id="3CJpHJsaFK3" role="TWiod">
-            <node concept="1XD08G" id="3CJpHJsaFK2" role="1XD0ZN">
-              <node concept="Df6$J" id="3CJpHJsaFK8" role="Df6Hu">
-                <node concept="21VMdE" id="3CJpHJsaFK7" role="Df7GE">
-                  <property role="21VMdD" value="text" />
-                  <node concept="17Uvod" id="3CJpHJsaFKb" role="lGtFl">
-                    <property role="2qtEX9" value="content" />
-                    <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                    <node concept="3zFVjK" id="3CJpHJsaFKc" role="3zH0cK">
-                      <node concept="3clFbS" id="3CJpHJsaFKd" role="2VODD2">
-                        <node concept="3SKdUt" id="3CJpHJsaPA6" role="3cqZAp">
-                          <node concept="1PaTwC" id="3CJpHJsaPA7" role="1aUNEU">
-                            <node concept="3oM_SD" id="3CJpHJsaPTH" role="1PaTwD">
-                              <property role="3oM_SC" value="empty" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaPTO" role="1PaTwD">
-                              <property role="3oM_SC" value="string" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaPTY" role="1PaTwD">
-                              <property role="3oM_SC" value="hides" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaPU8" role="1PaTwD">
-                              <property role="3oM_SC" value="the" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaPUh" role="1PaTwD">
-                              <property role="3oM_SC" value="entry." />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaQes" role="1PaTwD">
-                              <property role="3oM_SC" value="null" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaQfg" role="1PaTwD">
-                              <property role="3oM_SC" value="would" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaQgy" role="1PaTwD">
-                              <property role="3oM_SC" value="have" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaQgK" role="1PaTwD">
-                              <property role="3oM_SC" value="no" />
-                            </node>
-                            <node concept="3oM_SD" id="3CJpHJsaQgX" role="1PaTwD">
-                              <property role="3oM_SC" value="effect." />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="3CJpHJsaJVK" role="3cqZAp">
-                          <node concept="3K4zz7" id="3CJpHJsaO8f" role="3clFbG">
-                            <node concept="Xl_RD" id="3CJpHJsaOrx" role="3K4E3e">
-                              <property role="Xl_RC" value="" />
-                            </node>
-                            <node concept="3clFbC" id="3CJpHJsaLJ3" role="3K4Cdx">
-                              <node concept="10Nm6u" id="3CJpHJsaMY9" role="3uHU7w" />
-                              <node concept="2OqwBi" id="3CJpHJsaGu$" role="3uHU7B">
-                                <node concept="30H73N" id="3CJpHJsaG0p" role="2Oq$k0" />
-                                <node concept="3TrcHB" id="3CJpHJsaID4" role="2OqNvi">
-                                  <ref role="3TsBF5" to="f8gn:ziPuhEAsOB" resolve="text" />
+      <node concept="1Koe21" id="1vEPqpZaqup" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZaquq" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZaqur" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZaqus" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZaqut" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZaquu" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZaquv" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZaquw" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZaqux" role="1bW2Oz">
+                <property role="TrG5h" value="rootBuilder" />
+                <node concept="2jxLKc" id="1vEPqpZaquy" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZaquz" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZaqu$" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZaqu_" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZaquA" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZaqux" resolve="rootBuilder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZaquB" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~NotationRootCellTemplateBuilder.completionText(java.lang.String)" resolve="completionText" />
+                      <node concept="Xl_RD" id="1vEPqpZaz0T" role="37wK5m">
+                        <property role="Xl_RC" value="text" />
+                        <node concept="17Uvod" id="1vEPqpZa$It" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="1vEPqpZa$Iu" role="3zH0cK">
+                            <node concept="3clFbS" id="1vEPqpZa$Iv" role="2VODD2">
+                              <node concept="3SKdUt" id="1vEPqpZa_g2" role="3cqZAp">
+                                <node concept="1PaTwC" id="1vEPqpZa_g3" role="1aUNEU">
+                                  <node concept="3oM_SD" id="1vEPqpZa_g4" role="1PaTwD">
+                                    <property role="3oM_SC" value="empty" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_g5" role="1PaTwD">
+                                    <property role="3oM_SC" value="string" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_g6" role="1PaTwD">
+                                    <property role="3oM_SC" value="hides" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_g7" role="1PaTwD">
+                                    <property role="3oM_SC" value="the" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_g8" role="1PaTwD">
+                                    <property role="3oM_SC" value="entry." />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_g9" role="1PaTwD">
+                                    <property role="3oM_SC" value="null" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_ga" role="1PaTwD">
+                                    <property role="3oM_SC" value="would" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_gb" role="1PaTwD">
+                                    <property role="3oM_SC" value="have" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_gc" role="1PaTwD">
+                                    <property role="3oM_SC" value="no" />
+                                  </node>
+                                  <node concept="3oM_SD" id="1vEPqpZa_gd" role="1PaTwD">
+                                    <property role="3oM_SC" value="effect." />
+                                  </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="2OqwBi" id="3CJpHJsaOIz" role="3K4GZi">
-                              <node concept="30H73N" id="3CJpHJsaOI$" role="2Oq$k0" />
-                              <node concept="3TrcHB" id="3CJpHJsaOI_" role="2OqNvi">
-                                <ref role="3TsBF5" to="f8gn:ziPuhEAsOB" resolve="text" />
+                              <node concept="3clFbF" id="1vEPqpZa_ge" role="3cqZAp">
+                                <node concept="3K4zz7" id="1vEPqpZa_gf" role="3clFbG">
+                                  <node concept="Xl_RD" id="1vEPqpZa_gg" role="3K4E3e">
+                                    <property role="Xl_RC" value="" />
+                                  </node>
+                                  <node concept="3clFbC" id="1vEPqpZa_gh" role="3K4Cdx">
+                                    <node concept="10Nm6u" id="1vEPqpZa_gi" role="3uHU7w" />
+                                    <node concept="2OqwBi" id="1vEPqpZa_gj" role="3uHU7B">
+                                      <node concept="30H73N" id="1vEPqpZa_gk" role="2Oq$k0" />
+                                      <node concept="3TrcHB" id="1vEPqpZa_gl" role="2OqNvi">
+                                        <ref role="3TsBF5" to="f8gn:ziPuhEAsOB" resolve="text" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="2OqwBi" id="1vEPqpZa_gm" role="3K4GZi">
+                                    <node concept="30H73N" id="1vEPqpZa_gn" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="1vEPqpZa_go" role="2OqNvi">
+                                      <ref role="3TsBF5" to="f8gn:ziPuhEAsOB" resolve="text" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -526,6 +644,13 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZaquI" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZaquJ" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZaquK" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -533,264 +658,356 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="26N7cZTNAnB" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZaAri" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhE_VbT" resolve="OptionalCell" />
-      <node concept="gft3U" id="26N7cZTNAnC" role="1lVwrX">
-        <node concept="1NbEFs" id="26N7cZTNAnD" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.optional(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="optional" />
-          <node concept="1XD0f0" id="26N7cZTNFTB" role="1XD06E">
-            <node concept="AQkLs" id="26N7cZTNFTD" role="THmaL">
-              <node concept="29HgVG" id="26N7cZTNFTJ" role="lGtFl">
-                <node concept="3NFfHV" id="26N7cZTNFTK" role="3NFExx">
-                  <node concept="3clFbS" id="26N7cZTNFTL" role="2VODD2">
-                    <node concept="3clFbF" id="26N7cZTNFTR" role="3cqZAp">
-                      <node concept="2OqwBi" id="26N7cZTNFTM" role="3clFbG">
-                        <node concept="3TrEf2" id="26N7cZTNFTP" role="2OqNvi">
-                          <ref role="3Tt5mk" to="f8gn:ziPuhE_VbX" resolve="cell" />
+      <node concept="1Koe21" id="1vEPqpZaArj" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZaArk" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZaArl" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZaArm" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZaArn" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZaAro" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZaArp" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZaArq" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZaArr" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZaArs" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZaArt" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZaAru" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZaArv" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZaArw" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZaArr" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZaArx" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.optional(kotlin.jvm.functions.Function1)" resolve="optional" />
+                      <node concept="1bVj0M" id="1vEPqpZaAry" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZaArz" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="1vEPqpZaAr$" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="1vEPqpZaAr_" role="1bW5cS">
+                          <node concept="3clFbH" id="1vEPqpZaIek" role="3cqZAp">
+                            <node concept="29HgVG" id="1vEPqpZaIMc" role="lGtFl">
+                              <node concept="3NFfHV" id="1vEPqpZaJ3o" role="3NFExx">
+                                <node concept="3clFbS" id="1vEPqpZaJ3p" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZaJ3s" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZaJnx" role="3clFbG">
+                                      <node concept="30H73N" id="1vEPqpZaJ3r" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="1vEPqpZaNav" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="f8gn:ziPuhE_VbX" resolve="cell" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="1vEPqpZaArA" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZaArB" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="30H73N" id="26N7cZTNFTQ" role="2Oq$k0" />
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZaArC" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="1vEPqpZaArD" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZaArE" 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="AQkLs" id="26N7cZTNG0g" role="THmaL" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="CUW2QYNQYQ" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZaNwa" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:CUW2QYKUUq" resolve="PropertyCell" />
-      <node concept="gft3U" id="CUW2QYNQYR" role="1lVwrX">
-        <node concept="1XD0a7" id="CUW2QYNT33" role="gfFT$">
-          <node concept="1NbEtQ" id="CUW2QYNUUM" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IProperty.cell(kotlin/Function1&lt;PropertyCellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="cell" />
-            <node concept="1XD0eI" id="814F5MppoU" role="TWiod">
-              <node concept="1XD0f0" id="814F5MppoT" role="1XD0ZN">
-                <node concept="1NbEFs" id="814F5MppEj" role="THmaL">
-                  <ref role="AarEw" to="dbfy:~PropertyCellTemplateBuilder.regex(kotlin/String)" resolve="regex" />
-                  <node concept="1XD0eI" id="814F5MppEk" role="TWiod">
-                    <node concept="1XD08G" id="814F5MppVi" role="1XD0ZN">
-                      <node concept="Df6$J" id="3wSPuR_fEr3" role="Df6Hu">
-                        <node concept="21VMdE" id="3wSPuR_fEr2" role="Df7GE">
-                          <property role="21VMdD" value="true|false" />
-                        </node>
-                      </node>
+      <node concept="1Koe21" id="1vEPqpZaNwb" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZaNwc" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZaNwd" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZaNwe" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZaNwf" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZaNwg" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZaNwh" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZaNwi" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZaNwj" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZaNwk" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZaNwl" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZaNwm" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZaNwn" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZaNwo" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZaNwj" resolve="builder" />
                     </node>
-                  </node>
-                  <node concept="1W57fq" id="814F5MppEt" role="lGtFl">
-                    <node concept="3IZrLx" id="814F5MppEu" role="3IZSJc">
-                      <node concept="3clFbS" id="814F5MppEv" role="2VODD2">
-                        <node concept="3clFbF" id="3wSPuR_iPRO" role="3cqZAp">
-                          <node concept="2OqwBi" id="3wSPuR_iTiP" role="3clFbG">
-                            <node concept="2OqwBi" id="3wSPuR_iRyq" role="2Oq$k0">
-                              <node concept="2OqwBi" id="3wSPuR_iQjl" role="2Oq$k0">
-                                <node concept="30H73N" id="3wSPuR_iPRN" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="3wSPuR_iQKn" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                    <node concept="liA8E" id="1vEPqpZaNwp" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.propertyCell(org.modelix.model.api.IProperty,kotlin.jvm.functions.Function1)" resolve="propertyCell" />
+                      <node concept="2ShNRf" id="1vEPqpZaY_6" role="37wK5m">
+                        <node concept="1pGfFk" id="1vEPqpZb01a" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSProperty.&lt;init&gt;(org.jetbrains.mps.openapi.language.SProperty)" resolve="MPSProperty" />
+                          <node concept="355D3s" id="1vEPqpZb5OH" role="37wK5m">
+                            <node concept="1ZhdrF" id="1vEPqpZb6_o" role="lGtFl">
+                              <property role="2qtEX8" value="conceptDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386081" />
+                              <node concept="3$xsQk" id="1vEPqpZb6_p" role="3$ytzL">
+                                <node concept="3clFbS" id="1vEPqpZb6_q" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZb7l4" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZb7l5" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZb7l6" role="2Oq$k0">
+                                        <node concept="30H73N" id="1vEPqpZb7l7" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1vEPqpZb7l8" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="1vEPqpZb7l9" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="3TrEf2" id="3wSPuR_iSez" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
-                              </node>
                             </node>
-                            <node concept="2qgKlT" id="3wSPuR_iTHX" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hKtGpIQ" resolve="isSimpleBoolean" />
+                            <node concept="1ZhdrF" id="1vEPqpZb8Ah" role="lGtFl">
+                              <property role="2qtEX8" value="propertyDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386082" />
+                              <node concept="3$xsQk" id="1vEPqpZb8Ai" role="3$ytzL">
+                                <node concept="3clFbS" id="1vEPqpZb8Aj" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZb9vO" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZb9vP" role="3clFbG">
+                                      <node concept="30H73N" id="1vEPqpZb9vQ" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="1vEPqpZb9vR" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1NbEFs" id="3wSPuR_iUNA" role="THmaL">
-                  <ref role="AarEw" to="dbfy:~PropertyCellTemplateBuilder.regex(kotlin/String)" resolve="regex" />
-                  <node concept="1XD0eI" id="3wSPuR_iUNB" role="TWiod">
-                    <node concept="1XD08G" id="3wSPuR_iUNC" role="1XD0ZN">
-                      <node concept="Df6$J" id="3wSPuR_iUND" role="Df6Hu">
-                        <node concept="21VMdE" id="3wSPuR_iUNE" role="Df7GE">
-                          <property role="21VMdD" value="-?[0-9]{1,10}" />
+                      <node concept="1bVj0M" id="1vEPqpZaNwq" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZaNwr" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="1vEPqpZaNws" role="1tU5fm" />
                         </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="3wSPuR_iUNF" role="lGtFl">
-                    <node concept="3IZrLx" id="3wSPuR_iUNG" role="3IZSJc">
-                      <node concept="3clFbS" id="3wSPuR_iUNH" role="2VODD2">
-                        <node concept="3clFbF" id="3wSPuR_iUNI" role="3cqZAp">
-                          <node concept="2OqwBi" id="3wSPuR_iUNJ" role="3clFbG">
-                            <node concept="2OqwBi" id="3wSPuR_iUNK" role="2Oq$k0">
-                              <node concept="2OqwBi" id="3wSPuR_iUNL" role="2Oq$k0">
-                                <node concept="30H73N" id="3wSPuR_iUNM" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="3wSPuR_iUNN" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
-                                </node>
+                        <node concept="3clFbS" id="1vEPqpZaNwt" role="1bW5cS">
+                          <node concept="3clFbF" id="1vEPqpZbbtn" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZbcD4" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZbbtl" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZaNwr" resolve="builder" />
                               </node>
-                              <node concept="3TrEf2" id="3wSPuR_iUNO" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
+                              <node concept="liA8E" id="1vEPqpZbgUd" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~PropertyCellTemplateBuilder.regex(java.lang.String)" resolve="regex" />
+                                <node concept="Xl_RD" id="1vEPqpZbi44" role="37wK5m">
+                                  <property role="Xl_RC" value="true|false" />
+                                </node>
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="3wSPuR_iUNP" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hKtGkcn" resolve="isSimpleInteger" />
+                            <node concept="1W57fq" id="1vEPqpZbp9j" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZbp9k" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZbp9l" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbqM5" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZbqM6" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZbqM7" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="1vEPqpZbqM8" role="2Oq$k0">
+                                          <node concept="30H73N" id="1vEPqpZbqM9" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="1vEPqpZbqMa" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="1vEPqpZbqMb" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="1vEPqpZbqMc" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:hKtGpIQ" resolve="isSimpleBoolean" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1NbEFs" id="6QRYI6sOjmg" role="THmaL">
-                  <ref role="AarEw" to="dbfy:~PropertyCellTemplateBuilder.regex(kotlin/String)" resolve="regex" />
-                  <node concept="1XD0eI" id="6QRYI6sOjmh" role="TWiod">
-                    <node concept="1XD08G" id="6QRYI6sOjmi" role="1XD0ZN">
-                      <node concept="Df6$J" id="6QRYI6sOjmj" role="Df6Hu">
-                        <node concept="21VMdE" id="6QRYI6sOjmk" role="Df7GE">
-                          <node concept="17Uvod" id="6QRYI6sOk$p" role="lGtFl">
-                            <property role="2qtEX9" value="content" />
-                            <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                            <node concept="3zFVjK" id="6QRYI6sOk$q" role="3zH0cK">
-                              <node concept="3clFbS" id="6QRYI6sOk$r" role="2VODD2">
-                                <node concept="3clFbF" id="6QRYI6sOkOz" role="3cqZAp">
-                                  <node concept="2OqwBi" id="6QRYI6sOn54" role="3clFbG">
-                                    <node concept="1PxgMI" id="6QRYI6sOmRE" role="2Oq$k0">
-                                      <node concept="chp4Y" id="6QRYI6sOmSU" role="3oSUPX">
-                                        <ref role="cht4Q" to="tpce:fKAz7CR" resolve="ConstrainedDataTypeDeclaration" />
-                                      </node>
-                                      <node concept="2OqwBi" id="6QRYI6sOlNw" role="1m5AlR">
-                                        <node concept="2OqwBi" id="6QRYI6sOlht" role="2Oq$k0">
-                                          <node concept="30H73N" id="6QRYI6sOkOy" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="6QRYI6sOluA" role="2OqNvi">
+                          <node concept="3clFbF" id="1vEPqpZbt9d" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZbt9e" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZbt9f" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZaNwr" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="1vEPqpZbt9g" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~PropertyCellTemplateBuilder.regex(java.lang.String)" resolve="regex" />
+                                <node concept="Xl_RD" id="1vEPqpZbt9h" role="37wK5m">
+                                  <property role="Xl_RC" value="-?[0-9]{1,10}" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1W57fq" id="1vEPqpZbt9i" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZbt9j" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZbt9k" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbx1H" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZbx1I" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZbx1J" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="1vEPqpZbx1K" role="2Oq$k0">
+                                          <node concept="30H73N" id="1vEPqpZbx1L" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="1vEPqpZbx1M" role="2OqNvi">
                                             <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="6QRYI6sOmdq" role="2OqNvi">
+                                        <node concept="3TrEf2" id="1vEPqpZbx1N" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
                                         </node>
                                       </node>
-                                    </node>
-                                    <node concept="3TrcHB" id="6QRYI6sOnlk" role="2OqNvi">
-                                      <ref role="3TsBF5" to="tpce:fKFLfW2" resolve="constraint" />
+                                      <node concept="2qgKlT" id="1vEPqpZbx1O" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:hKtGkcn" resolve="isSimpleInteger" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="6QRYI6sOjml" role="lGtFl">
-                    <node concept="3IZrLx" id="6QRYI6sOjmm" role="3IZSJc">
-                      <node concept="3clFbS" id="6QRYI6sOjmn" role="2VODD2">
-                        <node concept="3clFbF" id="6QRYI6sOjmo" role="3cqZAp">
-                          <node concept="2OqwBi" id="6QRYI6sOjmp" role="3clFbG">
-                            <node concept="2OqwBi" id="6QRYI6sOjmq" role="2Oq$k0">
-                              <node concept="2OqwBi" id="6QRYI6sOjmr" role="2Oq$k0">
-                                <node concept="30H73N" id="6QRYI6sOjms" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="6QRYI6sOjmt" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
-                                </node>
+                          <node concept="3clFbF" id="1vEPqpZbz$1" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZbz$2" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZbz$3" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZaNwr" resolve="builder" />
                               </node>
-                              <node concept="3TrEf2" id="6QRYI6sOjmu" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
+                              <node concept="liA8E" id="1vEPqpZbz$4" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~PropertyCellTemplateBuilder.regex(java.lang.String)" resolve="regex" />
+                                <node concept="Xl_RD" id="1vEPqpZbz$5" role="37wK5m">
+                                  <node concept="17Uvod" id="1vEPqpZbBUR" role="lGtFl">
+                                    <property role="2qtEX9" value="value" />
+                                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                    <node concept="3zFVjK" id="1vEPqpZbBUS" role="3zH0cK">
+                                      <node concept="3clFbS" id="1vEPqpZbBUT" role="2VODD2">
+                                        <node concept="3clFbF" id="1vEPqpZbEbk" role="3cqZAp">
+                                          <node concept="2OqwBi" id="1vEPqpZbEbl" role="3clFbG">
+                                            <node concept="1PxgMI" id="1vEPqpZbEbm" role="2Oq$k0">
+                                              <node concept="chp4Y" id="1vEPqpZbEbn" role="3oSUPX">
+                                                <ref role="cht4Q" to="tpce:fKAz7CR" resolve="ConstrainedDataTypeDeclaration" />
+                                              </node>
+                                              <node concept="2OqwBi" id="1vEPqpZbEbo" role="1m5AlR">
+                                                <node concept="2OqwBi" id="1vEPqpZbEbp" role="2Oq$k0">
+                                                  <node concept="30H73N" id="1vEPqpZbEbq" role="2Oq$k0" />
+                                                  <node concept="3TrEf2" id="1vEPqpZbEbr" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                                  </node>
+                                                </node>
+                                                <node concept="3TrEf2" id="1vEPqpZbEbs" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="3TrcHB" id="1vEPqpZbEbt" role="2OqNvi">
+                                              <ref role="3TsBF5" to="tpce:fKFLfW2" resolve="constraint" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="1mIQ4w" id="6QRYI6sOkrO" role="2OqNvi">
-                              <node concept="chp4Y" id="6QRYI6sOkss" role="cj9EA">
-                                <ref role="cht4Q" to="tpce:fKAz7CR" resolve="ConstrainedDataTypeDeclaration" />
+                            <node concept="1W57fq" id="1vEPqpZbz$6" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZbz$7" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZbz$8" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbHD6" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZbHD7" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZbHD8" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="1vEPqpZbHD9" role="2Oq$k0">
+                                          <node concept="30H73N" id="1vEPqpZbHDa" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="1vEPqpZbHDb" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="1vEPqpZbHDc" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="tpce:fKAX2Z_" resolve="dataType" />
+                                        </node>
+                                      </node>
+                                      <node concept="1mIQ4w" id="1vEPqpZbHDd" role="2OqNvi">
+                                        <node concept="chp4Y" id="1vEPqpZbHDe" role="cj9EA">
+                                          <ref role="cht4Q" to="tpce:fKAz7CR" resolve="ConstrainedDataTypeDeclaration" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1NbEFs" id="6QRYI6sOLuS" role="THmaL">
-                  <ref role="AarEw" to="dbfy:~PropertyCellTemplateBuilder.regex(kotlin/String)" resolve="regex" />
-                  <node concept="1XD0eI" id="6QRYI6sOLuT" role="TWiod">
-                    <node concept="1XD08G" id="6QRYI6sOLuU" role="1XD0ZN">
-                      <node concept="Df6$J" id="6QRYI6sOLuV" role="Df6Hu">
-                        <node concept="21VMdE" id="6QRYI6sOLuW" role="Df7GE">
-                          <property role="21VMdD" value="[a-zA-Z$[_]][a-zA-Z0-9$[_]]*" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="6QRYI6sOLva" role="lGtFl">
-                    <node concept="3IZrLx" id="6QRYI6sOLvb" role="3IZSJc">
-                      <node concept="3clFbS" id="6QRYI6sOLvc" role="2VODD2">
-                        <node concept="3clFbF" id="6QRYI6sOLvd" role="3cqZAp">
-                          <node concept="17R0WA" id="6QRYI6sQsZW" role="3clFbG">
-                            <node concept="2OqwBi" id="6QRYI6sQAQA" role="3uHU7B">
-                              <node concept="2OqwBi" id="6QRYI6sOLvg" role="2Oq$k0">
-                                <node concept="30H73N" id="6QRYI6sOLvh" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="6QRYI6sOLvi" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                          <node concept="3clFbF" id="1vEPqpZbKK9" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZbKKa" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZbKKb" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZaNwr" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="1vEPqpZbKKc" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~PropertyCellTemplateBuilder.regex(java.lang.String)" resolve="regex" />
+                                <node concept="Xl_RD" id="1vEPqpZbO_f" role="37wK5m">
+                                  <property role="Xl_RC" value="[a-zA-Z$[_]][a-zA-Z0-9$[_]]*" />
                                 </node>
                               </node>
-                              <node concept="iZEcu" id="6QRYI6sQCu8" role="2OqNvi" />
                             </node>
-                            <node concept="2tJFMh" id="6QRYI6sQvGr" role="3uHU7w">
-                              <node concept="ZC_QK" id="6QRYI6sQwj9" role="2tJFKM">
-                                <ref role="2aWVGs" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                <node concept="ZC_QK" id="6QRYI6sQypD" role="2aWVGa">
-                                  <ref role="2aWVGs" to="tpck:h0TrG11" resolve="name" />
+                            <node concept="1W57fq" id="1vEPqpZbKKr" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZbKKs" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZbKKt" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbTDg" role="3cqZAp">
+                                    <node concept="17R0WA" id="1vEPqpZbTDh" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZbTDi" role="3uHU7B">
+                                        <node concept="2OqwBi" id="1vEPqpZbTDj" role="2Oq$k0">
+                                          <node concept="30H73N" id="1vEPqpZbTDk" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="1vEPqpZbTDl" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
+                                          </node>
+                                        </node>
+                                        <node concept="iZEcu" id="1vEPqpZbTDm" role="2OqNvi" />
+                                      </node>
+                                      <node concept="2tJFMh" id="1vEPqpZbTDn" role="3uHU7w">
+                                        <node concept="ZC_QK" id="1vEPqpZbTDo" role="2tJFKM">
+                                          <ref role="2aWVGs" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                          <node concept="ZC_QK" id="1vEPqpZbTDp" role="2aWVGa">
+                                            <ref role="2aWVGs" to="tpck:h0TrG11" resolve="name" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3cpWs6" id="1vEPqpZaNwA" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZaNwB" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZaNwC" role="lGtFl" />
                 </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1NbEFs" id="CUW2QYO8M8" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-            <node concept="1XD0eI" id="CUW2QYO8N8" role="TWiod">
-              <node concept="kjMFK" id="2KBRAcSrbtN" role="1XD0ZN">
-                <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                <node concept="1ZhdrF" id="2KBRAcSrbwP" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                  <node concept="3$xsQk" id="2KBRAcSrbwQ" role="3$ytzL">
-                    <node concept="3clFbS" id="2KBRAcSrbwR" role="2VODD2">
-                      <node concept="3clFbF" id="2KBRAcSrbxA" role="3cqZAp">
-                        <node concept="2OqwBi" id="2KBRAcSrcqI" role="3clFbG">
-                          <node concept="2OqwBi" id="2KBRAcSrbP0" role="2Oq$k0">
-                            <node concept="30H73N" id="2KBRAcSrbx_" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="2KBRAcSrc5K" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="2KBRAcSrcLu" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="2KBRAcSrcXe" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                  <node concept="3$xsQk" id="2KBRAcSrcXf" role="3$ytzL">
-                    <node concept="3clFbS" id="2KBRAcSrcXg" role="2VODD2">
-                      <node concept="3clFbF" id="2KBRAcSrcZR" role="3cqZAp">
-                        <node concept="2OqwBi" id="2KBRAcSrdjh" role="3clFbG">
-                          <node concept="30H73N" id="2KBRAcSrcZQ" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="2KBRAcSrd$1" role="2OqNvi">
-                            <ref role="3Tt5mk" to="f8gn:CUW2QYKUZw" resolve="property" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+                <node concept="3cpWs6" id="1vEPqpZaNwD" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZaNwE" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                   </node>
                 </node>
               </node>
@@ -799,415 +1016,354 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4dQjfTHZOAl" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZbZQm" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhE_FrH" resolve="FlagCell" />
-      <node concept="gft3U" id="4dQjfTHZOAm" role="1lVwrX">
-        <node concept="1XD0a7" id="4dQjfTHZOAn" role="gfFT$">
-          <node concept="1NbEtQ" id="4dQjfTHZOAo" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IProperty.flagCell(kotlin/String?,kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="flagCell" />
-            <node concept="1XD0eI" id="2pWg6rnXRNe" role="TWiod">
-              <node concept="1XD08G" id="2pWg6rnXXbD" role="1XD0ZN">
-                <node concept="Df6$J" id="2pWg6rnXXbH" role="Df6Hu">
-                  <node concept="21VMdE" id="2pWg6rnXXbG" role="Df7GE">
-                    <property role="21VMdD" value="text" />
-                    <node concept="17Uvod" id="2pWg6rnXXbK" role="lGtFl">
-                      <property role="2qtEX9" value="content" />
-                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                      <node concept="3zFVjK" id="2pWg6rnXXbL" role="3zH0cK">
-                        <node concept="3clFbS" id="2pWg6rnXXbM" role="2VODD2">
-                          <node concept="3clFbF" id="2pWg6rnXXrZ" role="3cqZAp">
-                            <node concept="2OqwBi" id="2pWg6rnXXST" role="3clFbG">
-                              <node concept="30H73N" id="2pWg6rnXXrY" role="2Oq$k0" />
-                              <node concept="3TrcHB" id="2pWg6rnXY62" role="2OqNvi">
-                                <ref role="3TsBF5" to="f8gn:ziPuhE_FrL" resolve="text" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="2pWg6rnXYD0" role="lGtFl">
-                  <node concept="3IZrLx" id="2pWg6rnXYD1" role="3IZSJc">
-                    <node concept="3clFbS" id="2pWg6rnXYD2" role="2VODD2">
-                      <node concept="3clFbF" id="2pWg6rnXYRc" role="3cqZAp">
-                        <node concept="2OqwBi" id="2pWg6rnY1g3" role="3clFbG">
-                          <node concept="2OqwBi" id="2pWg6rnXZht" role="2Oq$k0">
-                            <node concept="30H73N" id="2pWg6rnXYRb" role="2Oq$k0" />
-                            <node concept="3TrcHB" id="2pWg6rnXZFE" role="2OqNvi">
-                              <ref role="3TsBF5" to="f8gn:ziPuhE_FrL" resolve="text" />
-                            </node>
-                          </node>
-                          <node concept="17RvpY" id="2pWg6rnY1Wk" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+      <node concept="1Koe21" id="1vEPqpZbZQn" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZbZQo" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZbZQp" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZbZQq" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
             </node>
           </node>
-          <node concept="1NbEFs" id="4dQjfTHZOAp" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-            <node concept="1XD0eI" id="4dQjfTHZOAq" role="TWiod">
-              <node concept="kjMFK" id="4dQjfTHZOAr" role="1XD0ZN">
-                <ref role="kjMFR" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="kjMFQ" to="hcm8:5q426iHwzIm" resolve="isNullable" />
-                <node concept="1ZhdrF" id="4dQjfTHZOAs" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075796" />
-                  <node concept="3$xsQk" id="4dQjfTHZOAt" role="3$ytzL">
-                    <node concept="3clFbS" id="4dQjfTHZOAu" role="2VODD2">
-                      <node concept="3clFbF" id="4dQjfTHZOAv" role="3cqZAp">
-                        <node concept="2OqwBi" id="4dQjfTHZOAw" role="3clFbG">
-                          <node concept="2OqwBi" id="4dQjfTHZOAx" role="2Oq$k0">
-                            <node concept="30H73N" id="4dQjfTHZOAy" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="4dQjfTHZOAz" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:ziPuhE_FrT" resolve="property" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="4dQjfTHZOA$" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="4dQjfTHZOA_" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179490075795/3181756179490075797" />
-                  <node concept="3$xsQk" id="4dQjfTHZOAA" role="3$ytzL">
-                    <node concept="3clFbS" id="4dQjfTHZOAB" role="2VODD2">
-                      <node concept="3clFbF" id="4dQjfTHZOAC" role="3cqZAp">
-                        <node concept="2OqwBi" id="4dQjfTHZOAD" role="3clFbG">
-                          <node concept="30H73N" id="4dQjfTHZOAE" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="4dQjfTHZOAF" role="2OqNvi">
-                            <ref role="3Tt5mk" to="f8gn:ziPuhE_FrT" resolve="property" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+          <node concept="liA8E" id="1vEPqpZbZQr" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZbZQs" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZbZQt" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZbZQu" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZbZQv" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZbZQw" role="1tU5fm" />
               </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="CUW2QYOQW4" role="3acgRq">
-      <ref role="30HIoZ" to="f8gn:CUW2QYMiki" resolve="ChildrenCollectionCell" />
-      <node concept="gft3U" id="CUW2QYOQW5" role="1lVwrX">
-        <node concept="1XD0a7" id="CUW2QYOQW6" role="gfFT$">
-          <node concept="1NbEtQ" id="CUW2QYOQW7" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.horizontal(kotlin/String?,kotlin/Function1&lt;ChildCellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="horizontal" />
-            <node concept="1XD0eI" id="CUW2QYP3Um" role="TWiod">
-              <ref role="21Xffc" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.horizontal(kotlin/String?,kotlin/Function1&lt;ChildCellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;).separator" resolve="separator" />
-              <node concept="1XD08G" id="CUW2QYP3UE" role="1XD0ZN">
-                <node concept="Df6$J" id="CUW2QYP3Y6" role="Df6Hu">
-                  <node concept="21VMdE" id="CUW2QYP3Y5" role="Df7GE">
-                    <property role="21VMdD" value="separator" />
-                    <node concept="17Uvod" id="CUW2QYP40F" role="lGtFl">
-                      <property role="2qtEX9" value="content" />
-                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                      <node concept="3zFVjK" id="CUW2QYP40G" role="3zH0cK">
-                        <node concept="3clFbS" id="CUW2QYP40H" role="2VODD2">
-                          <node concept="3clFbF" id="CUW2QYP4hK" role="3cqZAp">
-                            <node concept="2OqwBi" id="CUW2QYP4IE" role="3clFbG">
-                              <node concept="30H73N" id="CUW2QYP4hJ" role="2Oq$k0" />
-                              <node concept="3TrcHB" id="CUW2QYP4Zl" role="2OqNvi">
-                                <ref role="3TsBF5" to="f8gn:CUW2QYMiCG" resolve="separator" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+              <node concept="3clFbS" id="1vEPqpZbZQx" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZbZQy" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZbZQz" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZbZQ$" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZbZQv" resolve="builder" />
                     </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="22f9nDgLDS1" role="lGtFl">
-                  <node concept="3IZrLx" id="22f9nDgLDS2" role="3IZSJc">
-                    <node concept="3clFbS" id="22f9nDgLDS3" role="2VODD2">
-                      <node concept="3clFbF" id="CUW2QYP5lj" role="3cqZAp">
-                        <node concept="2OqwBi" id="CUW2QYP8Xa" role="3clFbG">
-                          <node concept="2OqwBi" id="CUW2QYP5$N" role="2Oq$k0">
-                            <node concept="30H73N" id="CUW2QYP5li" role="2Oq$k0" />
-                            <node concept="3TrcHB" id="CUW2QYP5F0" role="2OqNvi">
-                              <ref role="3TsBF5" to="f8gn:CUW2QYMiCG" resolve="separator" />
-                            </node>
-                          </node>
-                          <node concept="17RvpY" id="CUW2QYP9Rg" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gft3U" id="22f9nDgLEpd" role="UU_$l">
-                    <node concept="1XD0k2" id="22f9nDgLEt0" role="gfFT$" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1XD0f0" id="6xJrM0NrToY" role="1XD06E">
-              <node concept="1NbEFs" id="6xJrM0NrU3f" role="THmaL">
-                <ref role="AarEw" to="dbfy:~ChildCellTemplateBuilder.separator(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="separator" />
-                <node concept="1XD0f0" id="6xJrM0NrU3g" role="1XD06E">
-                  <node concept="AQkLs" id="6xJrM0NrU3h" role="THmaL">
-                    <node concept="29HgVG" id="6xJrM0NrU3i" role="lGtFl">
-                      <node concept="3NFfHV" id="6xJrM0NrU3j" role="3NFExx">
-                        <node concept="3clFbS" id="6xJrM0NrU3k" role="2VODD2">
-                          <node concept="3clFbF" id="6xJrM0NrU3l" role="3cqZAp">
-                            <node concept="2OqwBi" id="6xJrM0NrU3m" role="3clFbG">
-                              <node concept="3TrEf2" id="6xJrM0NrU3n" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
+                    <node concept="liA8E" id="1vEPqpZbZQ_" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.flagCell(org.modelix.model.api.IProperty,java.lang.String,kotlin.jvm.functions.Function1)" resolve="flagCell" />
+                      <node concept="2ShNRf" id="1vEPqpZbZQA" role="37wK5m">
+                        <node concept="1pGfFk" id="1vEPqpZbZQB" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSProperty.&lt;init&gt;(org.jetbrains.mps.openapi.language.SProperty)" resolve="MPSProperty" />
+                          <node concept="355D3s" id="1vEPqpZbZQC" role="37wK5m">
+                            <node concept="1ZhdrF" id="1vEPqpZbZQD" role="lGtFl">
+                              <property role="2qtEX8" value="conceptDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386081" />
+                              <node concept="3$xsQk" id="1vEPqpZbZQE" role="3$ytzL">
+                                <node concept="3clFbS" id="1vEPqpZbZQF" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbZQG" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZbZQH" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZbZQI" role="2Oq$k0">
+                                        <node concept="30H73N" id="1vEPqpZbZQJ" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1vEPqpZbZQK" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:ziPuhE_FrT" resolve="property" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="1vEPqpZbZQL" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:2OF3rgRewqT" resolve="getConceptDeclaration" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="30H73N" id="6xJrM0NrU3o" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="AQkLs" id="6xJrM0NrZhx" role="THmaL" />
-                </node>
-                <node concept="1W57fq" id="6xJrM0NrZv0" role="lGtFl">
-                  <node concept="3IZrLx" id="6xJrM0NrZv1" role="3IZSJc">
-                    <node concept="3clFbS" id="6xJrM0NrZv2" role="2VODD2">
-                      <node concept="3clFbF" id="6xJrM0NrZPH" role="3cqZAp">
-                        <node concept="2OqwBi" id="6xJrM0Ns1Oa" role="3clFbG">
-                          <node concept="2OqwBi" id="6xJrM0Ns0fY" role="2Oq$k0">
-                            <node concept="30H73N" id="6xJrM0NrZPG" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="6xJrM0Ns1my" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
                             </node>
-                          </node>
-                          <node concept="3x8VRR" id="6xJrM0Ns2hr" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1NbEFs" id="m1OUzpjPHc" role="THmaL">
-                <ref role="AarEw" to="dbfy:~ChildCellTemplateBuilder.newLineConcept(org/modelix/model/api/IConcept)" resolve="newLineConcept" />
-                <node concept="1XD0eI" id="m1OUzpjPHd" role="TWiod">
-                  <node concept="1XD0k2" id="1pzCNySbu8_" role="1XD0ZN">
-                    <node concept="5jKBG" id="1pzCNySbu8A" role="lGtFl">
-                      <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
-                      <node concept="3NFfHV" id="1pzCNySbu8B" role="5jGum">
-                        <node concept="3clFbS" id="1pzCNySbu8C" role="2VODD2">
-                          <node concept="3clFbF" id="1pzCNySbu8D" role="3cqZAp">
-                            <node concept="2OqwBi" id="1pzCNySbu8E" role="3clFbG">
-                              <node concept="30H73N" id="1pzCNySbu8F" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="1pzCNySbu8G" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                            <node concept="1ZhdrF" id="1vEPqpZbZQM" role="lGtFl">
+                              <property role="2qtEX8" value="propertyDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386082" />
+                              <node concept="3$xsQk" id="1vEPqpZbZQN" role="3$ytzL">
+                                <node concept="3clFbS" id="1vEPqpZbZQO" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZbZQP" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZbZQQ" role="3clFbG">
+                                      <node concept="30H73N" id="1vEPqpZbZQR" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="1vEPqpZbZQS" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="f8gn:ziPuhE_FrT" resolve="property" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="m1OUzpjPHh" role="lGtFl">
-                  <node concept="3IZrLx" id="m1OUzpjPHi" role="3IZSJc">
-                    <node concept="3clFbS" id="m1OUzpjPHj" role="2VODD2">
-                      <node concept="3clFbF" id="m1OUzpjPHk" role="3cqZAp">
-                        <node concept="2OqwBi" id="m1OUzpjPHl" role="3clFbG">
-                          <node concept="2OqwBi" id="m1OUzpjPHm" role="2Oq$k0">
-                            <node concept="30H73N" id="m1OUzpjPHn" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="m1OUzpjPHo" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                      <node concept="Xl_RD" id="1vEPqpZcxze" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="1vEPqpZcNFX" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="1vEPqpZcNFY" role="3zH0cK">
+                            <node concept="3clFbS" id="1vEPqpZcNFZ" role="2VODD2">
+                              <node concept="3clFbF" id="1vEPqpZcRj$" role="3cqZAp">
+                                <node concept="2OqwBi" id="1vEPqpZcRj_" role="3clFbG">
+                                  <node concept="30H73N" id="1vEPqpZcRjA" role="2Oq$k0" />
+                                  <node concept="3TrcHB" id="1vEPqpZcRjB" role="2OqNvi">
+                                    <ref role="3TsBF5" to="f8gn:ziPuhE_FrL" resolve="text" />
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
-                          <node concept="3x8VRR" id="m1OUzpjTgx" role="2OqNvi" />
                         </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1NbEFs" id="CUW2QYOQW8" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSChildLink.new(org/jetbrains/mps/openapi/language/SContainmentLink)" resolve="MPSChildLink" />
-            <node concept="1XD0eI" id="CUW2QYOQW9" role="TWiod">
-              <node concept="rZEcI" id="2KBRAcSs_sX" role="1XD0ZN">
-                <ref role="rZ_zL" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="rZ_F2" to="hcm8:5LVUgW$gbdV" resolve="class" />
-                <node concept="1ZhdrF" id="2KBRAcSs_sY" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675986" />
-                  <node concept="3$xsQk" id="2KBRAcSs_sZ" role="3$ytzL">
-                    <node concept="3clFbS" id="2KBRAcSs_t0" role="2VODD2">
-                      <node concept="3clFbF" id="2KBRAcSs_t1" role="3cqZAp">
-                        <node concept="2OqwBi" id="2KBRAcSs_t2" role="3clFbG">
-                          <node concept="2OqwBi" id="6xJrM0Nr4eV" role="2Oq$k0">
-                            <node concept="2OqwBi" id="2KBRAcSs_t3" role="2Oq$k0">
-                              <node concept="30H73N" id="2KBRAcSs_t4" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="2KBRAcSs_t5" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                        <node concept="1W57fq" id="1vEPqpZcZPH" role="lGtFl">
+                          <node concept="3IZrLx" id="1vEPqpZcZPI" role="3IZSJc">
+                            <node concept="3clFbS" id="1vEPqpZcZPJ" role="2VODD2">
+                              <node concept="3clFbF" id="1vEPqpZd3wg" role="3cqZAp">
+                                <node concept="2OqwBi" id="1vEPqpZd3wh" role="3clFbG">
+                                  <node concept="2OqwBi" id="1vEPqpZd3wi" role="2Oq$k0">
+                                    <node concept="30H73N" id="1vEPqpZd3wj" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="1vEPqpZd3wk" role="2OqNvi">
+                                      <ref role="3TsBF5" to="f8gn:ziPuhE_FrL" resolve="text" />
+                                    </node>
+                                  </node>
+                                  <node concept="17RvpY" id="1vEPqpZd3wl" role="2OqNvi" />
+                                </node>
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="6xJrM0Nr4Ln" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                            </node>
                           </node>
-                          <node concept="2qgKlT" id="2KBRAcSs_t6" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
+                          <node concept="gft3U" id="1vEPqpZd88m" role="UU_$l">
+                            <node concept="10Nm6u" id="1vEPqpZdbNh" role="gfFT$" />
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="2KBRAcSs_t7" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675489" />
-                  <node concept="3$xsQk" id="2KBRAcSs_t8" role="3$ytzL">
-                    <node concept="3clFbS" id="2KBRAcSs_t9" role="2VODD2">
-                      <node concept="3clFbF" id="2KBRAcSs_ta" role="3cqZAp">
-                        <node concept="2OqwBi" id="6xJrM0Nr5Lc" role="3clFbG">
-                          <node concept="2OqwBi" id="2KBRAcSs_tb" role="2Oq$k0">
-                            <node concept="30H73N" id="2KBRAcSs_tc" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="2KBRAcSs_td" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                      <node concept="1bVj0M" id="1vEPqpZbZQT" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZbZQU" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="1vEPqpZbZQV" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="1vEPqpZbZQW" role="1bW5cS">
+                          <node concept="3cpWs6" id="1vEPqpZbZSd" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZbZSe" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="6xJrM0Nr61G" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZbZSf" role="lGtFl" />
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="CUW2QYOYEN" role="30HLyM">
-        <node concept="3clFbS" id="CUW2QYOYEO" role="2VODD2">
-          <node concept="3clFbF" id="CUW2QYOZ38" role="3cqZAp">
-            <node concept="3fqX7Q" id="42C8o9nB1Cf" role="3clFbG">
-              <node concept="2OqwBi" id="42C8o9nB1Ch" role="3fr31v">
-                <node concept="2OqwBi" id="42C8o9nB1Ci" role="2Oq$k0">
-                  <node concept="30H73N" id="42C8o9nB1Cj" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="42C8o9nB1Ck" role="2OqNvi">
-                    <ref role="3Tt5mk" to="f8gn:CUW2QYMi$q" resolve="layout" />
+                <node concept="3cpWs6" id="1vEPqpZbZSg" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZbZSh" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="42C8o9nB1Cl" role="2OqNvi">
-                  <ref role="37wK5l" to="wsib:CUW2QYKKme" resolve="isVertical" />
-                </node>
               </node>
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="CUW2QYP18K" role="3acgRq">
+    <node concept="3aamgX" id="1vEPqpZeylc" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:CUW2QYMiki" resolve="ChildrenCollectionCell" />
-      <node concept="gft3U" id="CUW2QYP18L" role="1lVwrX">
-        <node concept="1XD0a7" id="CUW2QYP18M" role="gfFT$">
-          <node concept="1NbEtQ" id="CUW2QYP18N" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.vertical(kotlin/Function1&lt;ChildCellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="vertical" />
-            <node concept="1XD0f0" id="1pzCNySd5q8" role="1XD06E">
-              <node concept="1NbEFs" id="1pzCNySbFDm" role="THmaL">
-                <ref role="AarEw" to="dbfy:~ChildCellTemplateBuilder.newLineConcept(org/modelix/model/api/IConcept)" resolve="newLineConcept" />
-                <node concept="1XD0eI" id="1pzCNySbFDn" role="TWiod">
-                  <node concept="1XD0k2" id="1pzCNySbFDo" role="1XD0ZN">
-                    <node concept="5jKBG" id="1pzCNySbFDp" role="lGtFl">
-                      <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
-                      <node concept="3NFfHV" id="1pzCNySbFDq" role="5jGum">
-                        <node concept="3clFbS" id="1pzCNySbFDr" role="2VODD2">
-                          <node concept="3clFbF" id="1pzCNySbFDs" role="3cqZAp">
-                            <node concept="2OqwBi" id="1pzCNySbFDt" role="3clFbG">
-                              <node concept="30H73N" id="1pzCNySbFDu" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="1pzCNySbFDv" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+      <node concept="1Koe21" id="1vEPqpZeyld" role="1lVwrX">
+        <node concept="2OqwBi" id="1vEPqpZeyle" role="1Koe22">
+          <node concept="2ShNRf" id="1vEPqpZeylf" role="2Oq$k0">
+            <node concept="1pGfFk" id="1vEPqpZeylg" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="1vEPqpZeylh" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="1vEPqpZeyli" role="37wK5m" />
+            <node concept="3clFbT" id="1vEPqpZeylj" role="37wK5m" />
+            <node concept="1bVj0M" id="1vEPqpZeylk" role="37wK5m">
+              <node concept="gl6BB" id="1vEPqpZeyll" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="1vEPqpZeylm" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="1vEPqpZeyln" role="1bW5cS">
+                <node concept="3clFbF" id="1vEPqpZeylo" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZeylp" role="3clFbG">
+                    <node concept="37vLTw" id="1vEPqpZeylq" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1vEPqpZeyll" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="1vEPqpZeylr" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.vertical(org.modelix.model.api.IChildLink,kotlin.jvm.functions.Function1)" resolve="vertical" />
+                      <node concept="2ShNRf" id="1vEPqpZeyls" role="37wK5m">
+                        <node concept="1pGfFk" id="1vEPqpZeylt" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSChildLink.&lt;init&gt;(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="MPSChildLink" />
+                          <node concept="359W_D" id="2QtC6yYW4kj" role="37wK5m">
+                            <ref role="359W_E" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                            <ref role="359W_F" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
+                            <node concept="1ZhdrF" id="2QtC6yYWeIC" role="lGtFl">
+                              <property role="2qtEX8" value="conceptDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421078" />
+                              <node concept="3$xsQk" id="2QtC6yYWeID" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yYWeIE" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yYWkWq" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yYWkWr" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yYWkWs" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="2QtC6yYWkWt" role="2Oq$k0">
+                                          <node concept="30H73N" id="2QtC6yYWkWu" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="2QtC6yYWkWv" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                                          </node>
+                                        </node>
+                                        <node concept="2qgKlT" id="2QtC6yYWkWw" role="2OqNvi">
+                                          <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yYWkWx" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1ZhdrF" id="2QtC6yYWgmI" role="lGtFl">
+                              <property role="2qtEX8" value="linkDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421079" />
+                              <node concept="3$xsQk" id="2QtC6yYWgmJ" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yYWgmK" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yYWi4v" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yYWi4w" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yYWi4x" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yYWi4y" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yYWi4z" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yYWi4$" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="1pzCNySbFDw" role="lGtFl">
-                  <node concept="3IZrLx" id="1pzCNySbFDx" role="3IZSJc">
-                    <node concept="3clFbS" id="1pzCNySbFDy" role="2VODD2">
-                      <node concept="3clFbF" id="1pzCNySbFDz" role="3cqZAp">
-                        <node concept="2OqwBi" id="1pzCNySbFD$" role="3clFbG">
-                          <node concept="2OqwBi" id="1pzCNySbFD_" role="2Oq$k0">
-                            <node concept="30H73N" id="1pzCNySbFDA" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="1pzCNySbFDB" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                      <node concept="1bVj0M" id="1vEPqpZeym2" role="37wK5m">
+                        <node concept="gl6BB" id="1vEPqpZeym3" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="1vEPqpZeym4" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="1vEPqpZeym5" role="1bW5cS">
+                          <node concept="3clFbF" id="1vEPqpZrgZS" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZrhEO" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZrgZQ" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZeym3" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="1vEPqpZrmx3" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~ChildCellTemplateBuilder.separator(kotlin.jvm.functions.Function1)" resolve="separator" />
+                                <node concept="1bVj0M" id="1vEPqpZrnaa" role="37wK5m">
+                                  <node concept="gl6BB" id="1vEPqpZrnah" role="1bW2Oz">
+                                    <property role="TrG5h" value="builder" />
+                                    <node concept="2jxLKc" id="1vEPqpZrnai" role="1tU5fm" />
+                                  </node>
+                                  <node concept="3clFbS" id="1vEPqpZrnaj" role="1bW5cS">
+                                    <node concept="3clFbH" id="1vEPqpZroVy" role="3cqZAp">
+                                      <node concept="29HgVG" id="1vEPqpZrvrd" role="lGtFl">
+                                        <node concept="3NFfHV" id="1vEPqpZrvre" role="3NFExx">
+                                          <node concept="3clFbS" id="1vEPqpZrvrf" role="2VODD2">
+                                            <node concept="3clFbF" id="1vEPqpZrvrl" role="3cqZAp">
+                                              <node concept="2OqwBi" id="1vEPqpZrvrg" role="3clFbG">
+                                                <node concept="3TrEf2" id="1vEPqpZrvrj" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
+                                                </node>
+                                                <node concept="30H73N" id="1vEPqpZrvrk" role="2Oq$k0" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3cpWs6" id="1vEPqpZrpVa" role="3cqZAp">
+                                      <node concept="10M0yZ" id="1vEPqpZrpVb" role="3cqZAk">
+                                        <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                                        <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1W57fq" id="1vEPqpZr$gx" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZr$gy" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZr$gz" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZr$YW" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZrBfc" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZrA2h" role="2Oq$k0">
+                                        <node concept="30H73N" id="1vEPqpZr$YV" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1vEPqpZrAMA" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="1vEPqpZrC0h" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
-                          <node concept="3x8VRR" id="1pzCNySbFDC" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="AQkLs" id="1pzCNySd5K3" role="THmaL" />
-            </node>
-          </node>
-          <node concept="1NbEFs" id="CUW2QYP18O" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSChildLink.new(org/jetbrains/mps/openapi/language/SContainmentLink)" resolve="MPSChildLink" />
-            <node concept="1XD0eI" id="CUW2QYP18P" role="TWiod">
-              <node concept="rZEcI" id="CUW2QYP18Q" role="1XD0ZN">
-                <ref role="rZ_zL" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="rZ_F2" to="hcm8:5LVUgW$gbdV" resolve="class" />
-                <node concept="1ZhdrF" id="CUW2QYP18R" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675986" />
-                  <node concept="3$xsQk" id="CUW2QYP18S" role="3$ytzL">
-                    <node concept="3clFbS" id="CUW2QYP18T" role="2VODD2">
-                      <node concept="3clFbF" id="CUW2QYP18U" role="3cqZAp">
-                        <node concept="2OqwBi" id="CUW2QYP18V" role="3clFbG">
-                          <node concept="2OqwBi" id="6xJrM0Nr6vG" role="2Oq$k0">
-                            <node concept="2OqwBi" id="CUW2QYP18W" role="2Oq$k0">
-                              <node concept="30H73N" id="CUW2QYP18X" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="CUW2QYP18Y" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                          <node concept="3clFbF" id="1vEPqpZrDky" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZrDQP" role="3clFbG">
+                              <node concept="37vLTw" id="1vEPqpZrDkw" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vEPqpZeym3" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="1vEPqpZrHDY" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~ChildCellTemplateBuilder.newLineConcept(org.modelix.model.api.IConcept)" resolve="newLineConcept" />
+                                <node concept="10Nm6u" id="1vEPqpZrItC" role="37wK5m">
+                                  <node concept="5jKBG" id="1vEPqpZrJYX" role="lGtFl">
+                                    <ref role="v9R2y" node="1vEPqpZ94Ep" resolve="template_SConcept_as_IConcept_java" />
+                                    <node concept="3NFfHV" id="1vEPqpZrLeR" role="5jGum">
+                                      <node concept="3clFbS" id="1vEPqpZrLeS" role="2VODD2">
+                                        <node concept="3clFbF" id="1vEPqpZrLRo" role="3cqZAp">
+                                          <node concept="2OqwBi" id="1vEPqpZrM6T" role="3clFbG">
+                                            <node concept="30H73N" id="1vEPqpZrLRn" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="1vEPqpZrMP0" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="6xJrM0Nr6xx" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                            <node concept="1W57fq" id="1vEPqpZrOjc" role="lGtFl">
+                              <node concept="3IZrLx" id="1vEPqpZrOjd" role="3IZSJc">
+                                <node concept="3clFbS" id="1vEPqpZrOje" role="2VODD2">
+                                  <node concept="3clFbF" id="1vEPqpZrP9_" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1vEPqpZrR6K" role="3clFbG">
+                                      <node concept="2OqwBi" id="1vEPqpZrPq5" role="2Oq$k0">
+                                        <node concept="30H73N" id="1vEPqpZrP9$" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1vEPqpZrQ8L" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="1vEPqpZrS88" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="CUW2QYP18Z" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
+                          <node concept="3cpWs6" id="1vEPqpZeym6" role="3cqZAp">
+                            <node concept="10M0yZ" id="1vEPqpZeym7" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="1vEPqpZeym8" role="lGtFl" />
                 </node>
-                <node concept="1ZhdrF" id="CUW2QYP190" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675489" />
-                  <node concept="3$xsQk" id="CUW2QYP191" role="3$ytzL">
-                    <node concept="3clFbS" id="CUW2QYP192" role="2VODD2">
-                      <node concept="3clFbF" id="CUW2QYP193" role="3cqZAp">
-                        <node concept="2OqwBi" id="6xJrM0Nr6QI" role="3clFbG">
-                          <node concept="2OqwBi" id="CUW2QYP194" role="2Oq$k0">
-                            <node concept="30H73N" id="CUW2QYP195" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="CUW2QYP196" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="6xJrM0Nr6RH" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+                <node concept="3cpWs6" id="1vEPqpZeym9" role="3cqZAp">
+                  <node concept="10M0yZ" id="1vEPqpZeyma" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                   </node>
                 </node>
               </node>
@@ -1215,462 +1371,568 @@
           </node>
         </node>
       </node>
-    </node>
-    <node concept="3aamgX" id="ziPuhEDw$F" role="3acgRq">
-      <ref role="30HIoZ" to="f8gn:ziPuhEA4oI" resolve="SingleChildCell" />
-      <node concept="gft3U" id="ziPuhEDw$G" role="1lVwrX">
-        <node concept="1XD0a7" id="ziPuhEDw$H" role="gfFT$">
-          <node concept="1NbEtQ" id="ziPuhEDw$I" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.cell(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="cell" />
-          </node>
-          <node concept="1NbEFs" id="ziPuhEDw_3" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSChildLink.new(org/jetbrains/mps/openapi/language/SContainmentLink)" resolve="MPSChildLink" />
-            <node concept="1XD0eI" id="ziPuhEDw_4" role="TWiod">
-              <node concept="rZEcI" id="ziPuhEDw_5" role="1XD0ZN">
-                <ref role="rZ_zL" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="rZ_F2" to="hcm8:5LVUgW$gbdV" resolve="class" />
-                <node concept="1ZhdrF" id="ziPuhEDw_6" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675986" />
-                  <node concept="3$xsQk" id="ziPuhEDw_7" role="3$ytzL">
-                    <node concept="3clFbS" id="ziPuhEDw_8" role="2VODD2">
-                      <node concept="3clFbF" id="ziPuhEDw_9" role="3cqZAp">
-                        <node concept="2OqwBi" id="ziPuhEDw_a" role="3clFbG">
-                          <node concept="2OqwBi" id="6xJrM0Nr7nx" role="2Oq$k0">
-                            <node concept="2OqwBi" id="ziPuhEDw_b" role="2Oq$k0">
-                              <node concept="30H73N" id="ziPuhEDw_c" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="ziPuhEDw_d" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:ziPuhEA4oM" resolve="link" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="6xJrM0Nr7ow" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="ziPuhEDw_e" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="ziPuhEDw_f" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675489" />
-                  <node concept="3$xsQk" id="ziPuhEDw_g" role="3$ytzL">
-                    <node concept="3clFbS" id="ziPuhEDw_h" role="2VODD2">
-                      <node concept="3clFbF" id="ziPuhEDw_i" role="3cqZAp">
-                        <node concept="2OqwBi" id="6xJrM0Nr7Jj" role="3clFbG">
-                          <node concept="2OqwBi" id="ziPuhEDw_j" role="2Oq$k0">
-                            <node concept="30H73N" id="ziPuhEDw_k" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="ziPuhEDw_l" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:ziPuhEA4oM" resolve="link" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="6xJrM0Nr7Ki" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+      <node concept="30G5F_" id="2QtC6yZQe0P" role="30HLyM">
+        <node concept="3clFbS" id="2QtC6yZQe0Q" role="2VODD2">
+          <node concept="3clFbF" id="2QtC6yZQfaW" role="3cqZAp">
+            <node concept="2OqwBi" id="2QtC6yZQfX7" role="3clFbG">
+              <node concept="2OqwBi" id="2QtC6yZQf_d" role="2Oq$k0">
+                <node concept="30H73N" id="2QtC6yZQfaV" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2QtC6yZQfKF" role="2OqNvi">
+                  <ref role="3Tt5mk" to="f8gn:CUW2QYMi$q" resolve="layout" />
                 </node>
               </node>
+              <node concept="2qgKlT" id="2QtC6yZQg7_" role="2OqNvi">
+                <ref role="37wK5l" to="wsib:CUW2QYKKme" resolve="isVertical" />
+              </node>
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4dQjfTHX66i" role="3acgRq">
-      <ref role="30HIoZ" to="f8gn:ziPuhEA2a_" resolve="ReferenceCell" />
-      <node concept="gft3U" id="4dQjfTHX66j" role="1lVwrX">
-        <node concept="1XD0a7" id="4dQjfTHX66k" role="gfFT$">
-          <node concept="1NbEtQ" id="4dQjfTHX66l" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~CellTemplateBuilder#org/modelix/model/api/IChildLink.cell(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="cell" />
-            <node concept="1XD0eI" id="4dQjfTHX7Hh" role="TWiod">
-              <node concept="1XD0f0" id="4dQjfTHX7Hg" role="1XD0ZN">
-                <node concept="1NbEFs" id="4dQjfTHX7JP" role="THmaL">
-                  <ref role="AarEw" to="b15i:~INode.getPropertyValue(IProperty)" resolve="getPropertyValue" />
-                  <node concept="1XD0eI" id="4dQjfTHXaSY" role="TWiod">
-                    <node concept="1NbEFs" id="4dQjfTHXaT2" role="1XD0ZN">
-                      <ref role="AarEw" to="1g18:~MPSProperty.new(jetbrains/mps/smodel/adapter/structure/property/SPropertyAdapter)" resolve="MPSProperty" />
-                      <node concept="1XD0eI" id="4dQjfTHXaT3" role="TWiod">
-                        <node concept="kjMFK" id="4dQjfTHXbFD" role="1XD0ZN">
-                          <ref role="kjMFR" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                          <ref role="kjMFQ" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="22f9nDgPeek" role="lGtFl">
-                    <node concept="3IZrLx" id="22f9nDgPeel" role="3IZSJc">
-                      <node concept="3clFbS" id="22f9nDgPeem" role="2VODD2">
-                        <node concept="3clFbF" id="22f9nDgPeua" role="3cqZAp">
-                          <node concept="2OqwBi" id="22f9nDgPfqF" role="3clFbG">
-                            <node concept="2OqwBi" id="22f9nDgPeSr" role="2Oq$k0">
-                              <node concept="30H73N" id="22f9nDgPeu9" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="22f9nDgPf7O" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
-                              </node>
-                            </node>
-                            <node concept="3w_OXm" id="22f9nDgPfMj" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
+    <node concept="3aamgX" id="2QtC6yZQ1VN" role="3acgRq">
+      <ref role="30HIoZ" to="f8gn:CUW2QYMiki" resolve="ChildrenCollectionCell" />
+      <node concept="1Koe21" id="2QtC6yZQ1VO" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZQ1VP" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZQ1VQ" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZQ1VR" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yZQ1VS" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZQ1VT" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZQ1VU" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZQ1VV" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZQ1VW" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZQ1VX" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZQ1VY" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZQ1VZ" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZQ1W0" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZQ1W1" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZQ1VW" resolve="builder" />
                     </node>
-                  </node>
-                </node>
-                <node concept="3rn2iY" id="1edLqv8OXnc" role="THmaL">
-                  <node concept="37vLTG" id="1edLqv8Pxxo" role="3rn2i5">
-                    <property role="TrG5h" value="referenceTarget" />
-                    <node concept="3Tqbb2" id="1edLqv8PxWT" role="1tU5fm">
-                      <ref role="ehGHo" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                      <node concept="1ZhdrF" id="1edLqv8PyTG" role="lGtFl">
-                        <property role="2qtEX8" value="concept" />
-                        <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1138055754698/1138405853777" />
-                        <node concept="3$xsQk" id="1edLqv8PyTH" role="3$ytzL">
-                          <node concept="3clFbS" id="1edLqv8PyTI" role="2VODD2">
-                            <node concept="3clFbF" id="1edLqv8PyYV" role="3cqZAp">
-                              <node concept="2OqwBi" id="1edLqv8P_Nq" role="3clFbG">
-                                <node concept="2OqwBi" id="1edLqv8PziD" role="2Oq$k0">
-                                  <node concept="30H73N" id="1edLqv8PyYU" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="1edLqv8P_ib" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="f8gn:ziPuhEA2aC" resolve="link" />
+                    <node concept="liA8E" id="2QtC6yZQ1W2" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.horizontal(org.modelix.model.api.IChildLink,java.lang.String,kotlin.jvm.functions.Function1)" resolve="horizontal" />
+                      <node concept="2ShNRf" id="2QtC6yZQ1W3" role="37wK5m">
+                        <node concept="1pGfFk" id="2QtC6yZQ1W4" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSChildLink.&lt;init&gt;(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="MPSChildLink" />
+                          <node concept="359W_D" id="2QtC6yZQ1W5" role="37wK5m">
+                            <ref role="359W_E" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                            <ref role="359W_F" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
+                            <node concept="1ZhdrF" id="2QtC6yZQ1W6" role="lGtFl">
+                              <property role="2qtEX8" value="conceptDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421078" />
+                              <node concept="3$xsQk" id="2QtC6yZQ1W7" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yZQ1W8" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZQ1W9" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZQ1Wa" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZQ1Wb" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="2QtC6yZQ1Wc" role="2Oq$k0">
+                                          <node concept="30H73N" id="2QtC6yZQ1Wd" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="2QtC6yZQ1We" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                                          </node>
+                                        </node>
+                                        <node concept="2qgKlT" id="2QtC6yZQ1Wf" role="2OqNvi">
+                                          <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yZQ1Wg" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
-                                <node concept="3TrEf2" id="1edLqv8PAhK" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
-                                </node>
                               </node>
                             </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1edLqv8OXne" role="3rn2iT">
-                    <node concept="3cpWs6" id="1edLqv8OXK3" role="3cqZAp">
-                      <node concept="Xl_RD" id="1edLqv8OXKb" role="3cqZAk">
-                        <property role="Xl_RC" value="" />
-                        <node concept="29HgVG" id="1edLqv8OXKj" role="lGtFl">
-                          <node concept="3NFfHV" id="1edLqv8OXKk" role="3NFExx">
-                            <node concept="3clFbS" id="1edLqv8OXKl" role="2VODD2">
-                              <node concept="3clFbF" id="1edLqv8OXKr" role="3cqZAp">
-                                <node concept="2OqwBi" id="1edLqv8Ps_3" role="3clFbG">
-                                  <node concept="1PxgMI" id="1edLqv8Psdp" role="2Oq$k0">
-                                    <node concept="chp4Y" id="1edLqv8Psn8" role="3oSUPX">
-                                      <ref role="cht4Q" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
-                                    </node>
-                                    <node concept="2OqwBi" id="1edLqv8OXKm" role="1m5AlR">
-                                      <node concept="3TrEf2" id="1edLqv8OXKp" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                            <node concept="1ZhdrF" id="2QtC6yZQ1Wh" role="lGtFl">
+                              <property role="2qtEX8" value="linkDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421079" />
+                              <node concept="3$xsQk" id="2QtC6yZQ1Wi" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yZQ1Wj" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZQ1Wk" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZQ1Wl" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZQ1Wm" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yZQ1Wn" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yZQ1Wo" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:CUW2QYMipn" resolve="link" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yZQ1Wp" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
                                       </node>
-                                      <node concept="30H73N" id="1edLqv8OXKq" role="2Oq$k0" />
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="1edLqv8PsUZ" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="ya4x:22f9nDgNaE3" resolve="expression" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="17QB3L" id="1edLqv8OXK0" role="3rn2ht" />
-                  <node concept="1W57fq" id="1edLqv8OXZr" role="lGtFl">
-                    <node concept="3IZrLx" id="1edLqv8OXZs" role="3IZSJc">
-                      <node concept="3clFbS" id="1edLqv8OXZt" role="2VODD2">
-                        <node concept="3clFbF" id="1edLqv8OY0G" role="3cqZAp">
-                          <node concept="1Wc70l" id="1edLqv8Pmas" role="3clFbG">
-                            <node concept="2OqwBi" id="1edLqv8PnNg" role="3uHU7w">
-                              <node concept="2OqwBi" id="1edLqv8PmQB" role="2Oq$k0">
-                                <node concept="30H73N" id="1edLqv8Pmg0" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="1edLqv8Pnxh" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
-                                </node>
-                              </node>
-                              <node concept="1mIQ4w" id="1edLqv8PoXE" role="2OqNvi">
-                                <node concept="chp4Y" id="1edLqv8PpmA" role="cj9EA">
-                                  <ref role="cht4Q" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
+                      <node concept="Xl_RD" id="2QtC6yZQ1Wq" role="37wK5m">
+                        <property role="Xl_RC" value="separator" />
+                        <node concept="17Uvod" id="2QtC6yZQ1Wr" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="2QtC6yZQ1Ws" role="3zH0cK">
+                            <node concept="3clFbS" id="2QtC6yZQ1Wt" role="2VODD2">
+                              <node concept="3clFbF" id="2QtC6yZQ1Wu" role="3cqZAp">
+                                <node concept="2OqwBi" id="2QtC6yZQ1Wv" role="3clFbG">
+                                  <node concept="30H73N" id="2QtC6yZQ1Ww" role="2Oq$k0" />
+                                  <node concept="3TrcHB" id="2QtC6yZQ1Wx" role="2OqNvi">
+                                    <ref role="3TsBF5" to="f8gn:CUW2QYMiCG" resolve="separator" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="2OqwBi" id="1edLqv8OY0H" role="3uHU7B">
-                              <node concept="2OqwBi" id="1edLqv8OY0I" role="2Oq$k0">
-                                <node concept="30H73N" id="1edLqv8OY0J" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="1edLqv8OY0K" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                          </node>
+                        </node>
+                        <node concept="1W57fq" id="2QtC6yZQ1Wy" role="lGtFl">
+                          <node concept="3IZrLx" id="2QtC6yZQ1Wz" role="3IZSJc">
+                            <node concept="3clFbS" id="2QtC6yZQ1W$" role="2VODD2">
+                              <node concept="3clFbF" id="2QtC6yZQ1W_" role="3cqZAp">
+                                <node concept="2OqwBi" id="2QtC6yZQ1WA" role="3clFbG">
+                                  <node concept="2OqwBi" id="2QtC6yZQ1WB" role="2Oq$k0">
+                                    <node concept="30H73N" id="2QtC6yZQ1WC" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="2QtC6yZQ1WD" role="2OqNvi">
+                                      <ref role="3TsBF5" to="f8gn:CUW2QYMiCG" resolve="separator" />
+                                    </node>
+                                  </node>
+                                  <node concept="17RvpY" id="2QtC6yZQ1WE" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="3x8VRR" id="1edLqv8OY0L" role="2OqNvi" />
                             </node>
                           </node>
+                          <node concept="gft3U" id="2QtC6yZQ1WF" role="UU_$l">
+                            <node concept="10Nm6u" id="2QtC6yZQ1WG" role="gfFT$" />
+                          </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="1NbEFs" id="vaVstE5wzt" role="3rn2i2">
-                    <ref role="AarEw" to="qjbp:~ModelixNodeAsMPSNode.new(org/modelix/model/api/INode)" resolve="ModelixNodeAsMPSNode" />
-                    <node concept="1XD0eI" id="vaVstE5x85" role="TWiod">
-                      <node concept="1XD0df" id="vaVstE5x84" role="1XD0ZN" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1KmxGs" id="22f9nDgPKm9" role="THmaL">
-                  <node concept="10Nm6u" id="22f9nDgPKnY" role="1KmxGj">
-                    <node concept="29HgVG" id="22f9nDgPKo5" role="lGtFl">
-                      <node concept="3NFfHV" id="22f9nDgPKo6" role="3NFExx">
-                        <node concept="3clFbS" id="22f9nDgPKo7" role="2VODD2">
-                          <node concept="3clFbF" id="22f9nDgPKod" role="3cqZAp">
-                            <node concept="2OqwBi" id="22f9nDgPKo8" role="3clFbG">
-                              <node concept="3TrEf2" id="22f9nDgPKob" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                      <node concept="1bVj0M" id="2QtC6yZQ1WH" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZQ1WI" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZQ1WJ" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZQ1WK" role="1bW5cS">
+                          <node concept="3clFbF" id="2QtC6yZQ1WL" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QtC6yZQ1WM" role="3clFbG">
+                              <node concept="37vLTw" id="2QtC6yZQ1WN" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2QtC6yZQ1WI" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="2QtC6yZQ1WO" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~ChildCellTemplateBuilder.separator(kotlin.jvm.functions.Function1)" resolve="separator" />
+                                <node concept="1bVj0M" id="2QtC6yZQ1WP" role="37wK5m">
+                                  <node concept="gl6BB" id="2QtC6yZQ1WQ" role="1bW2Oz">
+                                    <property role="TrG5h" value="builder" />
+                                    <node concept="2jxLKc" id="2QtC6yZQ1WR" role="1tU5fm" />
+                                  </node>
+                                  <node concept="3clFbS" id="2QtC6yZQ1WS" role="1bW5cS">
+                                    <node concept="3clFbH" id="2QtC6yZQ1WT" role="3cqZAp">
+                                      <node concept="29HgVG" id="2QtC6yZQ1WU" role="lGtFl">
+                                        <node concept="3NFfHV" id="2QtC6yZQ1WV" role="3NFExx">
+                                          <node concept="3clFbS" id="2QtC6yZQ1WW" role="2VODD2">
+                                            <node concept="3clFbF" id="2QtC6yZQ1WX" role="3cqZAp">
+                                              <node concept="2OqwBi" id="2QtC6yZQ1WY" role="3clFbG">
+                                                <node concept="3TrEf2" id="2QtC6yZQ1WZ" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
+                                                </node>
+                                                <node concept="30H73N" id="2QtC6yZQ1X0" role="2Oq$k0" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3cpWs6" id="2QtC6yZQ1X1" role="3cqZAp">
+                                      <node concept="10M0yZ" id="2QtC6yZQ1X2" role="3cqZAk">
+                                        <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                                        <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="30H73N" id="22f9nDgPKoc" role="2Oq$k0" />
                             </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="22f9nDgQk0a" role="lGtFl">
-                    <node concept="3IZrLx" id="22f9nDgQk0b" role="3IZSJc">
-                      <node concept="3clFbS" id="22f9nDgQk0c" role="2VODD2">
-                        <node concept="3clFbF" id="22f9nDgQk1n" role="3cqZAp">
-                          <node concept="1Wc70l" id="1edLqv8PqUo" role="3clFbG">
-                            <node concept="3fqX7Q" id="1edLqv8Prjg" role="3uHU7w">
-                              <node concept="1eOMI4" id="1edLqv8Prji" role="3fr31v">
-                                <node concept="2OqwBi" id="1edLqv8ProI" role="1eOMHV">
-                                  <node concept="2OqwBi" id="1edLqv8ProJ" role="2Oq$k0">
-                                    <node concept="30H73N" id="1edLqv8ProK" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="1edLqv8ProL" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                            <node concept="1W57fq" id="2QtC6yZQ1X3" role="lGtFl">
+                              <node concept="3IZrLx" id="2QtC6yZQ1X4" role="3IZSJc">
+                                <node concept="3clFbS" id="2QtC6yZQ1X5" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZQ1X6" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZQ1X7" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZQ1X8" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yZQ1X9" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yZQ1Xa" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:6xJrM0NrOsd" resolve="separatorCell" />
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="2QtC6yZQ1Xb" role="2OqNvi" />
                                     </node>
                                   </node>
-                                  <node concept="1mIQ4w" id="1edLqv8ProM" role="2OqNvi">
-                                    <node concept="chp4Y" id="1edLqv8ProN" role="cj9EA">
-                                      <ref role="cht4Q" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="2QtC6yZQ1Xc" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QtC6yZQ1Xd" role="3clFbG">
+                              <node concept="37vLTw" id="2QtC6yZQ1Xe" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2QtC6yZQ1WI" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="2QtC6yZQ1Xf" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~ChildCellTemplateBuilder.newLineConcept(org.modelix.model.api.IConcept)" resolve="newLineConcept" />
+                                <node concept="10Nm6u" id="2QtC6yZQ1Xg" role="37wK5m">
+                                  <node concept="5jKBG" id="2QtC6yZQ1Xh" role="lGtFl">
+                                    <ref role="v9R2y" node="1vEPqpZ94Ep" resolve="template_SConcept_as_IConcept_java" />
+                                    <node concept="3NFfHV" id="2QtC6yZQ1Xi" role="5jGum">
+                                      <node concept="3clFbS" id="2QtC6yZQ1Xj" role="2VODD2">
+                                        <node concept="3clFbF" id="2QtC6yZQ1Xk" role="3cqZAp">
+                                          <node concept="2OqwBi" id="2QtC6yZQ1Xl" role="3clFbG">
+                                            <node concept="30H73N" id="2QtC6yZQ1Xm" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="2QtC6yZQ1Xn" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="2OqwBi" id="22f9nDgQkTx" role="3uHU7B">
-                              <node concept="2OqwBi" id="22f9nDgQkrC" role="2Oq$k0">
-                                <node concept="30H73N" id="22f9nDgQk1m" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="22f9nDgQkFt" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                            <node concept="1W57fq" id="2QtC6yZQ1Xo" role="lGtFl">
+                              <node concept="3IZrLx" id="2QtC6yZQ1Xp" role="3IZSJc">
+                                <node concept="3clFbS" id="2QtC6yZQ1Xq" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZQ1Xr" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZQ1Xs" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZQ1Xt" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yZQ1Xu" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yZQ1Xv" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:CUW2QYMiut" resolve="subconceptToInsert" />
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="2QtC6yZQ1Xw" role="2OqNvi" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="3x8VRR" id="22f9nDgQl8f" role="2OqNvi" />
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2QtC6yZQ1Xx" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZQ1Xy" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZQ1Xz" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZQ1X$" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZQ1X_" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1NbEFs" id="4dQjfTHX66m" role="21Pmik">
-            <ref role="AarEw" to="1g18:~MPSReferenceLink.new(org/jetbrains/mps/openapi/language/SReferenceLink)" resolve="MPSReferenceLink" />
-            <node concept="1XD0eI" id="4dQjfTHX66n" role="TWiod">
-              <node concept="rZEcI" id="4dQjfTHX66o" role="1XD0ZN">
-                <ref role="rZ_zL" to="hcm8:2yYXHtl6Jjv" resolve="ClassType" />
-                <ref role="rZ_F2" to="hcm8:5LVUgW$gbdV" resolve="class" />
-                <node concept="1ZhdrF" id="4dQjfTHX66p" role="lGtFl">
-                  <property role="2qtEX8" value="concept" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675986" />
-                  <node concept="3$xsQk" id="4dQjfTHX66q" role="3$ytzL">
-                    <node concept="3clFbS" id="4dQjfTHX66r" role="2VODD2">
-                      <node concept="3clFbF" id="4dQjfTHX66s" role="3cqZAp">
-                        <node concept="2OqwBi" id="4dQjfTHX66t" role="3clFbG">
-                          <node concept="2OqwBi" id="6xJrM0NqqLX" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4dQjfTHX66u" role="2Oq$k0">
-                              <node concept="30H73N" id="4dQjfTHX66v" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="4dQjfTHX66w" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:ziPuhEA2aC" resolve="link" />
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2QtC6yYX9px" role="3acgRq">
+      <ref role="30HIoZ" to="f8gn:ziPuhEA4oI" resolve="SingleChildCell" />
+      <node concept="1Koe21" id="2QtC6yYX9py" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yYX9pz" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yYX9p$" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yYX9p_" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yYX9pA" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yYX9pB" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yYX9pC" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yYX9pD" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yYX9pE" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yYX9pF" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yYX9pG" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yYX9pH" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yYX9pI" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yYX9pJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yYX9pE" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yYX9pK" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.cell(org.modelix.model.api.IChildLink,kotlin.jvm.functions.Function1)" resolve="cell" />
+                      <node concept="2ShNRf" id="2QtC6yYX9pL" role="37wK5m">
+                        <node concept="1pGfFk" id="2QtC6yYX9pM" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSChildLink.&lt;init&gt;(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="MPSChildLink" />
+                          <node concept="359W_D" id="2QtC6yYX9pN" role="37wK5m">
+                            <ref role="359W_E" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                            <ref role="359W_F" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
+                            <node concept="1ZhdrF" id="2QtC6yYX9pO" role="lGtFl">
+                              <property role="2qtEX8" value="conceptDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421078" />
+                              <node concept="3$xsQk" id="2QtC6yYX9pP" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yYX9pQ" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yYX9pR" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yYX9pS" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yYX9pT" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="2QtC6yYX9pU" role="2Oq$k0">
+                                          <node concept="30H73N" id="2QtC6yYX9pV" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="2QtC6yYX9pW" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:ziPuhEA4oM" resolve="link" />
+                                          </node>
+                                        </node>
+                                        <node concept="2qgKlT" id="2QtC6yYX9pX" role="2OqNvi">
+                                          <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yYX9pY" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="6xJrM0Nqrhq" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                            <node concept="1ZhdrF" id="2QtC6yYX9pZ" role="lGtFl">
+                              <property role="2qtEX8" value="linkDeclaration" />
+                              <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474301421077/2644386474301421079" />
+                              <node concept="3$xsQk" id="2QtC6yYX9q0" role="3$ytzL">
+                                <node concept="3clFbS" id="2QtC6yYX9q1" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yYX9q2" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yYX9q3" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yYX9q4" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yYX9q5" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yYX9q6" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:ziPuhEA4oM" resolve="link" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="2QtC6yYX9q7" role="2OqNvi">
+                                        <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="4dQjfTHX66x" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:7jb4LXpbWaP" resolve="getConceptDeclaration" />
-                          </node>
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="4dQjfTHX66y" role="lGtFl">
-                  <property role="2qtEX8" value="link" />
-                  <property role="P3scX" value="eb56ebf4-df56-438e-af06-fc1cd08b495a/3181756179480673613/3181756179480675489" />
-                  <node concept="3$xsQk" id="4dQjfTHX66z" role="3$ytzL">
-                    <node concept="3clFbS" id="4dQjfTHX66$" role="2VODD2">
-                      <node concept="3clFbF" id="4dQjfTHX66_" role="3cqZAp">
-                        <node concept="2OqwBi" id="6xJrM0NqwCL" role="3clFbG">
-                          <node concept="2OqwBi" id="4dQjfTHX66A" role="2Oq$k0">
-                            <node concept="30H73N" id="4dQjfTHX66B" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="4dQjfTHX66C" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:ziPuhEA2aC" resolve="link" />
+                      <node concept="1bVj0M" id="2QtC6yYX9qr" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yYX9qs" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yYX9qt" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yYX9qu" role="1bW5cS">
+                          <node concept="3cpWs6" id="2QtC6yYX9rf" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yYX9rg" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="6xJrM0NqxdK" role="2OqNvi">
-                            <ref role="37wK5l" to="tpcn:hEwIf_V" resolve="getGenuineLink" />
-                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yYX9rt" role="lGtFl" />
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="4dQjfTHXrtt" role="30HLyM">
-        <node concept="3clFbS" id="4dQjfTHXrtu" role="2VODD2">
-          <node concept="3clFbF" id="4dQjfTHXrwq" role="3cqZAp">
-            <node concept="2OqwBi" id="4dQjfTHXtAq" role="3clFbG">
-              <node concept="2OqwBi" id="4dQjfTHXsQB" role="2Oq$k0">
-                <node concept="2OqwBi" id="4dQjfTHXrUF" role="2Oq$k0">
-                  <node concept="30H73N" id="4dQjfTHXrwp" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="4dQjfTHXs7O" role="2OqNvi">
-                    <ref role="3Tt5mk" to="f8gn:ziPuhEA2aC" resolve="link" />
+                <node concept="3cpWs6" id="2QtC6yYX9ru" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yYX9rv" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="4dQjfTHXtdB" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="4dQjfTHXtZl" role="2OqNvi">
-                <node concept="chp4Y" id="4dQjfTHXu2z" role="cj9EA">
-                  <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                </node>
               </node>
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="1edLqv8PAVG" role="3acgRq">
-      <ref role="30HIoZ" to="f8gn:22f9nDgOIIh" resolve="BL_ReferenceTargetExpression" />
-      <node concept="30G5F_" id="1edLqv8PAVJ" role="30HLyM">
-        <node concept="3clFbS" id="1edLqv8PAVK" role="2VODD2">
-          <node concept="3clFbF" id="1edLqv8PAVL" role="3cqZAp">
-            <node concept="22lmx$" id="2k1jtbCJzbi" role="3clFbG">
-              <node concept="2OqwBi" id="2k1jtbCJ$Wk" role="3uHU7w">
-                <node concept="2OqwBi" id="2k1jtbCJzTD" role="2Oq$k0">
-                  <node concept="30H73N" id="2k1jtbCJzx6" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="2k1jtbCJ$aE" role="2OqNvi">
-                    <node concept="1xMEDy" id="2k1jtbCJ$aG" role="1xVPHs">
-                      <node concept="chp4Y" id="2k1jtbCJ$rW" role="ri$Ld">
-                        <ref role="cht4Q" to="ya4x:22f9nDgNaE0" resolve="BaseLanguageExpressionWrapper" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="2k1jtbCJ_fj" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="1edLqv8PAVM" role="3uHU7B">
-                <node concept="2OqwBi" id="1edLqv8PAVN" role="2Oq$k0">
-                  <node concept="30H73N" id="1edLqv8PAVO" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="1edLqv8PAVP" role="2OqNvi">
-                    <node concept="1xMEDy" id="1edLqv8PAVQ" role="1xVPHs">
-                      <node concept="chp4Y" id="1edLqv8PAVR" role="ri$Ld">
-                        <ref role="cht4Q" to="j33e:1edLqv8Ou4p" resolve="BaseLanguageFunctionInKotlin" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="1edLqv8PAVS" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1Koe21" id="1edLqv8PFGW" role="1lVwrX">
-        <node concept="3rn2iY" id="1edLqv8PEgc" role="1Koe22">
-          <node concept="37vLTG" id="1edLqv8PEgd" role="3rn2i5">
-            <property role="TrG5h" value="referenceTarget" />
-            <node concept="3Tqbb2" id="1edLqv8PEge" role="1tU5fm">
-              <ref role="ehGHo" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="3aamgX" id="2QtC6yZ1MI3" role="3acgRq">
+      <ref role="30HIoZ" to="f8gn:ziPuhEA2a_" resolve="ReferenceCell" />
+      <node concept="1Koe21" id="2QtC6yZ1MI4" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZ1MI5" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZ1MI6" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZ1MI7" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
             </node>
           </node>
-          <node concept="3clFbS" id="1edLqv8PEgo" role="3rn2iT">
-            <node concept="3cpWs6" id="1edLqv8PEgp" role="3cqZAp">
-              <node concept="3VmV3z" id="1edLqv8PFhH" role="3cqZAk">
-                <property role="3VnrPo" value="referenceTarget" />
-                <node concept="3Tqbb2" id="1edLqv8PFhR" role="3Vn4Tt">
-                  <ref role="ehGHo" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                  <node concept="1ZhdrF" id="2k1jtbCIqN2" role="lGtFl">
-                    <property role="2qtEX8" value="concept" />
-                    <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1138055754698/1138405853777" />
-                    <node concept="3$xsQk" id="2k1jtbCIqN3" role="3$ytzL">
-                      <node concept="3clFbS" id="2k1jtbCIqN4" role="2VODD2">
-                        <node concept="3clFbF" id="2k1jtbCJnYJ" role="3cqZAp">
-                          <node concept="2OqwBi" id="22f9nDgOLNZ" role="3clFbG">
-                            <node concept="2OqwBi" id="22f9nDgOLO0" role="2Oq$k0">
-                              <node concept="2OqwBi" id="22f9nDgOLO1" role="2Oq$k0">
-                                <node concept="2Xjw5R" id="22f9nDgOLO3" role="2OqNvi">
-                                  <node concept="1xMEDy" id="22f9nDgOLO4" role="1xVPHs">
-                                    <node concept="chp4Y" id="22f9nDgOLO5" role="ri$Ld">
-                                      <ref role="cht4Q" to="f8gn:ziPuhEA2a_" resolve="ReferenceCell" />
+          <node concept="liA8E" id="2QtC6yZ1MI8" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZ1MI9" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZ1MIa" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZ1MIb" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZ1MIc" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZ1MId" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZ1MIe" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZ1MIf" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZ1MIg" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZ1MIh" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZ1MIc" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yZ1MIi" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.cell(org.modelix.model.api.IReferenceLink,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1)" resolve="cell" />
+                      <node concept="2ShNRf" id="2QtC6yZ1MIj" role="37wK5m">
+                        <node concept="1pGfFk" id="2QtC6yZ1MIk" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="zxfz:~MPSReferenceLink.&lt;init&gt;(org.jetbrains.mps.openapi.language.SReferenceLink)" resolve="MPSReferenceLink" />
+                          <node concept="359W_D" id="2QtC6yZ1W5E" role="37wK5m">
+                            <ref role="359W_E" to="tpee:fz7vLUo" resolve="VariableReference" />
+                            <ref role="359W_F" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1bVj0M" id="2QtC6yZ1MIE" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ1MIF" role="1bW2Oz">
+                          <property role="TrG5h" value="referenceTarget" />
+                          <node concept="2jxLKc" id="2QtC6yZ1MIG" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ1MIH" role="1bW5cS">
+                          <node concept="3cpWs6" id="2QtC6yZ2wwd" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QtC6yZ2yBt" role="3cqZAk">
+                              <node concept="37vLTw" id="2QtC6yZ2xHX" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2QtC6yZ1MIF" resolve="referenceTarget" />
+                              </node>
+                              <node concept="liA8E" id="2QtC6yZ2$M$" role="2OqNvi">
+                                <ref role="37wK5l" to="jks5:~INode.getPropertyValue(org.modelix.model.api.IProperty)" resolve="getPropertyValue" />
+                                <node concept="2ShNRf" id="2QtC6yZ2_F_" role="37wK5m">
+                                  <node concept="1pGfFk" id="2QtC6yZ2B4I" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="37wK5l" to="zxfz:~MPSProperty.&lt;init&gt;(org.jetbrains.mps.openapi.language.SProperty)" resolve="MPSProperty" />
+                                    <node concept="355D3s" id="2QtC6yZ2BPz" role="37wK5m">
+                                      <ref role="355D3t" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                      <ref role="355D3u" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1W57fq" id="2QtC6yZ2F3s" role="lGtFl">
+                              <node concept="3IZrLx" id="2QtC6yZ2F3t" role="3IZSJc">
+                                <node concept="3clFbS" id="2QtC6yZ2F3u" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZ2FPU" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZ2FPV" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZ2FPW" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yZ2FPX" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yZ2FPY" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                                        </node>
+                                      </node>
+                                      <node concept="3w_OXm" id="2QtC6yZ2FPZ" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2QtC6yZ1MII" role="3cqZAp">
+                            <node concept="Xl_RD" id="2QtC6yZ2lg4" role="3cqZAk">
+                              <property role="Xl_RC" value="" />
+                              <node concept="29HgVG" id="2QtC6yZ2ur2" role="lGtFl">
+                                <node concept="3NFfHV" id="2QtC6yZ2v60" role="3NFExx">
+                                  <node concept="3clFbS" id="2QtC6yZ2v61" role="2VODD2">
+                                    <node concept="3clFbF" id="2QtC6yZ2v63" role="3cqZAp">
+                                      <node concept="2OqwBi" id="2QtC6yZ2v68" role="3clFbG">
+                                        <node concept="3TrEf2" id="2QtC6yZ2v69" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                                        </node>
+                                        <node concept="30H73N" id="2QtC6yZ2v6a" role="2Oq$k0" />
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="1xIGOp" id="22f9nDgOLO6" role="1xVPHs" />
                                 </node>
-                                <node concept="30H73N" id="2k1jtbCJorB" role="2Oq$k0" />
                               </node>
-                              <node concept="3TrEf2" id="22f9nDgOLO7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="f8gn:ziPuhEA2aC" resolve="link" />
+                            </node>
+                            <node concept="1W57fq" id="2QtC6yZ2HHT" role="lGtFl">
+                              <node concept="3IZrLx" id="2QtC6yZ2HHU" role="3IZSJc">
+                                <node concept="3clFbS" id="2QtC6yZ2HHV" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZ2IL3" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZ2ILb" role="3clFbG">
+                                      <node concept="2OqwBi" id="2QtC6yZ2ILc" role="2Oq$k0">
+                                        <node concept="30H73N" id="2QtC6yZ2ILd" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="2QtC6yZ2ILe" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="f8gn:22f9nDgMtfW" resolve="renderTarget" />
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="2QtC6yZ2ILf" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="22f9nDgOLO8" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1bVj0M" id="2QtC6yZ20d0" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ20d1" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZ20d2" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ20d3" role="1bW5cS">
+                          <node concept="3cpWs6" id="2QtC6yZ20d4" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZ20d5" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZ1MIK" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZ1MIL" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZ1MIM" 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="1edLqv8PFOx" role="lGtFl" />
               </node>
             </node>
           </node>
-          <node concept="17QB3L" id="1edLqv8PEgA" role="3rn2ht" />
-          <node concept="1XD0df" id="1edLqv8PEgR" role="3rn2i2" />
         </node>
       </node>
     </node>
     <node concept="3aamgX" id="22f9nDgPg0F" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:22f9nDgOIIh" resolve="BL_ReferenceTargetExpression" />
-      <node concept="gft3U" id="22f9nDgPncm" role="1lVwrX">
-        <node concept="1XD0df" id="22f9nDgPndc" role="gfFT$" />
-      </node>
-      <node concept="30G5F_" id="22f9nDgPgUU" role="30HLyM">
-        <node concept="3clFbS" id="22f9nDgPgUV" role="2VODD2">
-          <node concept="3clFbF" id="22f9nDgPgXE" role="3cqZAp">
-            <node concept="2OqwBi" id="22f9nDgPmHz" role="3clFbG">
-              <node concept="2OqwBi" id="22f9nDgPhn1" role="2Oq$k0">
-                <node concept="30H73N" id="22f9nDgPgXD" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="22f9nDgPi0h" role="2OqNvi">
-                  <node concept="1xMEDy" id="22f9nDgPi0j" role="1xVPHs">
-                    <node concept="chp4Y" id="22f9nDgPmqt" role="ri$Ld">
-                      <ref role="cht4Q" to="ya4x:22f9nDgPjTA" resolve="ConvertToKotlin" />
-                    </node>
+      <node concept="1Koe21" id="2QtC6yZ3dLN" role="1lVwrX">
+        <node concept="3clFb_" id="2QtC6yZ3dQT" role="1Koe22">
+          <property role="TrG5h" value="f" />
+          <node concept="37vLTG" id="2QtC6yZ3dWf" role="3clF46">
+            <property role="TrG5h" value="referenceTarget" />
+            <node concept="3uibUv" id="2QtC6z0GIX$" role="1tU5fm">
+              <ref role="3uigEE" to="jks5:~INode" resolve="INode" />
+            </node>
+          </node>
+          <node concept="3Tqbb2" id="2QtC6yZ3ehA" role="3clF45" />
+          <node concept="3Tm1VV" id="2QtC6yZ3dQV" role="1B3o_S" />
+          <node concept="3clFbS" id="2QtC6yZ3dQW" role="3clF47">
+            <node concept="3clFbF" id="2QtC6z0GMWm" role="3cqZAp">
+              <node concept="2OqwBi" id="2QtC6z0GN6y" role="3clFbG">
+                <node concept="10M0yZ" id="2QtC6z0GMYC" role="2Oq$k0">
+                  <ref role="3cqZAo" to="1ut2:~ModelixNodeAsMPSNode.Companion" resolve="Companion" />
+                  <ref role="1PxDUh" to="1ut2:~ModelixNodeAsMPSNode" resolve="ModelixNodeAsMPSNode" />
+                </node>
+                <node concept="liA8E" id="2QtC6z0GNcQ" role="2OqNvi">
+                  <ref role="37wK5l" to="1ut2:~ModelixNodeAsMPSNode$Companion.toMPSNode(org.modelix.model.api.INode)" resolve="toMPSNode" />
+                  <node concept="37vLTw" id="2QtC6z0GNf0" role="37wK5m">
+                    <ref role="3cqZAo" node="2QtC6yZ3dWf" resolve="referenceTarget" />
                   </node>
                 </node>
+                <node concept="raruj" id="2QtC6z0GNiT" role="lGtFl" />
               </node>
-              <node concept="3x8VRR" id="22f9nDgPn5X" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -1728,25 +1990,72 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="CUW2QYNC_f" role="3acgRq">
+    <node concept="3aamgX" id="2QtC6yZ3g2L" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:CUW2QYOmUP" resolve="WithIdentCell" />
-      <node concept="gft3U" id="CUW2QYNC_g" role="1lVwrX">
-        <node concept="1NbEFs" id="CUW2QYNC_h" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.indented(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="indented" />
-          <node concept="1XD0f0" id="CUW2QYNENP" role="1XD06E">
-            <node concept="AQkLs" id="CUW2QYNHt0" role="THmaL">
-              <node concept="2b32R4" id="CUW2QYNHwv" role="lGtFl">
-                <node concept="3JmXsc" id="CUW2QYNHwy" role="2P8S$">
-                  <node concept="3clFbS" id="CUW2QYNHwz" role="2VODD2">
-                    <node concept="3clFbF" id="CUW2QYNHwD" role="3cqZAp">
-                      <node concept="2OqwBi" id="CUW2QYNHw$" role="3clFbG">
-                        <node concept="3Tsc0h" id="CUW2QYNHwB" role="2OqNvi">
-                          <ref role="3TtcxE" to="f8gn:CUW2QYOnl8" resolve="cells" />
+      <node concept="1Koe21" id="2QtC6yZ3g2M" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZ3g2N" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZ3g2O" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZ3g2P" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yZ3g2Q" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZ3g2R" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZ3g2S" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZ3g2T" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZ3g2U" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZ3g2V" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZ3g2W" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZ3g2X" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZ3g2Y" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZ3g2Z" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZ3g2U" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yZ3g30" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.indented(kotlin.jvm.functions.Function1)" resolve="indented" />
+                      <node concept="1bVj0M" id="2QtC6yZ3g3P" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ3g3Q" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZ3g3R" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ3g3S" role="1bW5cS">
+                          <node concept="3clFbH" id="2QtC6yZ3EZr" role="3cqZAp">
+                            <node concept="2b32R4" id="2QtC6yZ3Fqi" role="lGtFl">
+                              <node concept="3JmXsc" id="2QtC6yZ3Fql" role="2P8S$">
+                                <node concept="3clFbS" id="2QtC6yZ3Fqm" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZ3FV0" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZ3FV2" role="3clFbG">
+                                      <node concept="3Tsc0h" id="2QtC6yZ3FV3" role="2OqNvi">
+                                        <ref role="3TtcxE" to="f8gn:CUW2QYOnl8" resolve="cells" />
+                                      </node>
+                                      <node concept="30H73N" id="2QtC6yZ3FV4" role="2Oq$k0" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2QtC6yZ3g3T" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZ3g3U" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="30H73N" id="CUW2QYNHwC" role="2Oq$k0" />
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZ3g3V" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZ3g3W" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZ3g3X" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1754,37 +2063,84 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="CUW2QYOypp" role="3acgRq">
+    <node concept="3aamgX" id="2QtC6yZ4acj" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:CUW2QYKJtX" resolve="StaticCollectionCell" />
-      <node concept="gft3U" id="CUW2QYOypq" role="1lVwrX">
-        <node concept="1NbEFs" id="CUW2QYOypr" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.vertical(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="vertical" />
-          <node concept="1XD0f0" id="CUW2QYOyps" role="1XD06E">
-            <node concept="AQkLs" id="CUW2QYOypt" role="THmaL">
-              <node concept="2b32R4" id="CUW2QYOypu" role="lGtFl">
-                <node concept="3JmXsc" id="CUW2QYOypv" role="2P8S$">
-                  <node concept="3clFbS" id="CUW2QYOypw" role="2VODD2">
-                    <node concept="3clFbF" id="CUW2QYOypx" role="3cqZAp">
-                      <node concept="2OqwBi" id="CUW2QYOypy" role="3clFbG">
-                        <node concept="3Tsc0h" id="CUW2QYOypz" role="2OqNvi">
-                          <ref role="3TtcxE" to="f8gn:CUW2QYKJ$J" resolve="cells" />
+      <node concept="1Koe21" id="2QtC6yZ4ack" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZ4acl" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZ4acm" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZ4acn" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yZ4aco" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZ4acp" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZ4acq" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZ4acr" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZ4acs" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZ4act" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZ4acu" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZ4acv" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZ4acw" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZ4acx" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZ4acs" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yZ4acy" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.vertical(kotlin.jvm.functions.Function1)" resolve="vertical" />
+                      <node concept="1bVj0M" id="2QtC6yZ4acz" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ4ac$" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZ4ac_" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ4acA" role="1bW5cS">
+                          <node concept="3clFbH" id="2QtC6yZ4acB" role="3cqZAp">
+                            <node concept="2b32R4" id="2QtC6yZ4acC" role="lGtFl">
+                              <node concept="3JmXsc" id="2QtC6yZ4acD" role="2P8S$">
+                                <node concept="3clFbS" id="2QtC6yZ4acE" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZ4acF" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZ4acG" role="3clFbG">
+                                      <node concept="3Tsc0h" id="2QtC6yZ4acH" role="2OqNvi">
+                                        <ref role="3TtcxE" to="f8gn:CUW2QYKJ$J" resolve="cells" />
+                                      </node>
+                                      <node concept="30H73N" id="2QtC6yZ4acI" role="2Oq$k0" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2QtC6yZ4acJ" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZ4acK" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="30H73N" id="CUW2QYOyp$" role="2Oq$k0" />
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZ4acL" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZ4acM" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZ4acN" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="30G5F_" id="CUW2QYOyp_" role="30HLyM">
-        <node concept="3clFbS" id="CUW2QYOypA" role="2VODD2">
-          <node concept="3clFbF" id="CUW2QYOypB" role="3cqZAp">
-            <node concept="2OqwBi" id="CUW2QYOypC" role="3clFbG">
-              <node concept="30H73N" id="CUW2QYOypD" role="2Oq$k0" />
-              <node concept="2qgKlT" id="CUW2QYOypE" role="2OqNvi">
+      <node concept="30G5F_" id="2QtC6yZ4t31" role="30HLyM">
+        <node concept="3clFbS" id="2QtC6yZ4t32" role="2VODD2">
+          <node concept="3clFbF" id="2QtC6yZ4tMd" role="3cqZAp">
+            <node concept="2OqwBi" id="2QtC6yZ4tMe" role="3clFbG">
+              <node concept="30H73N" id="2QtC6yZ4tMf" role="2Oq$k0" />
+              <node concept="2qgKlT" id="2QtC6yZ4tMg" role="2OqNvi">
                 <ref role="37wK5l" to="wsib:CUW2QYKLam" resolve="isVerticalLayout" />
               </node>
             </node>
@@ -1792,25 +2148,72 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="CUW2QYNJix" role="3acgRq">
+    <node concept="3aamgX" id="2QtC6yZ4u_r" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:CUW2QYKJtX" resolve="StaticCollectionCell" />
-      <node concept="gft3U" id="CUW2QYNJiy" role="1lVwrX">
-        <node concept="1NbEFs" id="CUW2QYNJiz" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.horizontal(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="horizontal" />
-          <node concept="1XD0f0" id="CUW2QYNJi$" role="1XD06E">
-            <node concept="AQkLs" id="CUW2QYNJi_" role="THmaL">
-              <node concept="2b32R4" id="CUW2QYNJiA" role="lGtFl">
-                <node concept="3JmXsc" id="CUW2QYNJiB" role="2P8S$">
-                  <node concept="3clFbS" id="CUW2QYNJiC" role="2VODD2">
-                    <node concept="3clFbF" id="CUW2QYNJiD" role="3cqZAp">
-                      <node concept="2OqwBi" id="CUW2QYNJiE" role="3clFbG">
-                        <node concept="3Tsc0h" id="CUW2QYNJiF" role="2OqNvi">
-                          <ref role="3TtcxE" to="f8gn:CUW2QYKJ$J" resolve="cells" />
+      <node concept="1Koe21" id="2QtC6yZ4u_s" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZ4u_t" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZ4u_u" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZ4u_v" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yZ4u_w" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZ4u_x" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZ4u_y" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZ4u_z" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZ4u_$" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZ4u__" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZ4u_A" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZ4u_B" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZ4u_C" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZ4u_D" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZ4u_$" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yZ4u_E" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.horizontal(kotlin.jvm.functions.Function1)" resolve="horizontal" />
+                      <node concept="1bVj0M" id="2QtC6yZ4u_F" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ4u_G" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZ4u_H" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ4u_I" role="1bW5cS">
+                          <node concept="3clFbH" id="2QtC6yZ4u_J" role="3cqZAp">
+                            <node concept="2b32R4" id="2QtC6yZ4u_K" role="lGtFl">
+                              <node concept="3JmXsc" id="2QtC6yZ4u_L" role="2P8S$">
+                                <node concept="3clFbS" id="2QtC6yZ4u_M" role="2VODD2">
+                                  <node concept="3clFbF" id="2QtC6yZ4u_N" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2QtC6yZ4u_O" role="3clFbG">
+                                      <node concept="3Tsc0h" id="2QtC6yZ4u_P" role="2OqNvi">
+                                        <ref role="3TtcxE" to="f8gn:CUW2QYKJ$J" resolve="cells" />
+                                      </node>
+                                      <node concept="30H73N" id="2QtC6yZ4u_Q" role="2Oq$k0" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="2QtC6yZ4u_R" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZ4u_S" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="30H73N" id="CUW2QYNJiG" role="2Oq$k0" />
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZ4u_T" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZ4u_U" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZ4u_V" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1818,42 +2221,156 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="22f9nDgRKSe" role="3acgRq">
+    <node concept="3aamgX" id="2QtC6yZ4Rz6" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:ziPuhE_FoY" resolve="BL_ExpressionCell" />
-      <node concept="gft3U" id="22f9nDgRLae" role="1lVwrX">
-        <node concept="1NbEFs" id="22f9nDgRLaf" role="gfFT$">
-          <ref role="AarEw" to="dbfy:~CellTemplateBuilder.horizontal(kotlin/Function1&lt;CellTemplateBuilder&lt;0,1&gt;,kotlin/Unit&gt;)" resolve="horizontal" />
-          <node concept="1XD0f0" id="22f9nDgRLag" role="1XD06E">
-            <node concept="1NbEFs" id="22f9nDgRMjz" role="THmaL">
-              <ref role="AarEw" to="dbfy:~CellTemplateBuilder.withNode(kotlin/Function1&lt;CellTemplateBuilder.WithNodeContext,kotlin/Unit&gt;)" resolve="withNode" />
-              <node concept="1XD0f0" id="22f9nDgRMj$" role="1XD06E">
-                <node concept="1NbEFs" id="22f9nDgRQ9O" role="THmaL">
-                  <ref role="AarEw" to="dbfy:~CellTemplateBuilder.modelAccess(kotlin/Function1&lt;ModelAccessBuilder,kotlin/Unit&gt;)" resolve="modelAccess" />
-                  <node concept="1XD0f0" id="22f9nDgRQ9P" role="1XD06E">
-                    <node concept="1NbEFs" id="22f9nDgRUp$" role="THmaL">
-                      <ref role="AarEw" to="dbfy:~ModelAccessBuilder.get(kotlin/Function0&lt;kotlin/String?&gt;)" resolve="get" />
-                      <node concept="1XD0f0" id="22f9nDgRUp_" role="1XD06E">
-                        <node concept="1KmxGs" id="22f9nDgRU5Z" role="THmaL">
-                          <node concept="10Nm6u" id="22f9nDgRU81" role="1KmxGj">
-                            <node concept="29HgVG" id="22f9nDgRU87" role="lGtFl">
-                              <node concept="3NFfHV" id="22f9nDgRU88" role="3NFExx">
-                                <node concept="3clFbS" id="22f9nDgRU89" role="2VODD2">
-                                  <node concept="3clFbF" id="22f9nDgRU8f" role="3cqZAp">
-                                    <node concept="2OqwBi" id="22f9nDgRU8a" role="3clFbG">
-                                      <node concept="3TrEf2" id="22f9nDgRU8d" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="f8gn:ziPuhE_Fp2" resolve="expression" />
+      <node concept="1Koe21" id="2QtC6yZ4Rz7" role="1lVwrX">
+        <node concept="2OqwBi" id="2QtC6yZ4Rz8" role="1Koe22">
+          <node concept="2ShNRf" id="2QtC6yZ4Rz9" role="2Oq$k0">
+            <node concept="1pGfFk" id="2QtC6yZ4Rza" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
+            </node>
+          </node>
+          <node concept="liA8E" id="2QtC6yZ4Rzb" role="2OqNvi">
+            <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+            <node concept="10Nm6u" id="2QtC6yZ4Rzc" role="37wK5m" />
+            <node concept="3clFbT" id="2QtC6yZ4Rzd" role="37wK5m" />
+            <node concept="1bVj0M" id="2QtC6yZ4Rze" role="37wK5m">
+              <node concept="gl6BB" id="2QtC6yZ4Rzf" role="1bW2Oz">
+                <property role="TrG5h" value="builder" />
+                <node concept="2jxLKc" id="2QtC6yZ4Rzg" role="1tU5fm" />
+              </node>
+              <node concept="3clFbS" id="2QtC6yZ4Rzh" role="1bW5cS">
+                <node concept="3clFbF" id="2QtC6yZ4Rzi" role="3cqZAp">
+                  <node concept="2OqwBi" id="2QtC6yZ4Rzj" role="3clFbG">
+                    <node concept="37vLTw" id="2QtC6yZ4Rzk" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2QtC6yZ4Rzf" resolve="builder" />
+                    </node>
+                    <node concept="liA8E" id="2QtC6yZ4Rzl" role="2OqNvi">
+                      <ref role="37wK5l" to="jej1:~CellTemplateBuilder.horizontal(kotlin.jvm.functions.Function1)" resolve="horizontal" />
+                      <node concept="1bVj0M" id="2QtC6yZ4Rzm" role="37wK5m">
+                        <node concept="gl6BB" id="2QtC6yZ4Rzn" role="1bW2Oz">
+                          <property role="TrG5h" value="builder" />
+                          <node concept="2jxLKc" id="2QtC6yZ4Rzo" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="2QtC6yZ4Rzp" role="1bW5cS">
+                          <node concept="3clFbF" id="2QtC6yZ50Ta" role="3cqZAp">
+                            <node concept="2OqwBi" id="2QtC6yZ50Tc" role="3clFbG">
+                              <node concept="37vLTw" id="2QtC6yZ50Td" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2QtC6yZ4Rzn" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="2QtC6yZ50Te" role="2OqNvi">
+                                <ref role="37wK5l" to="jej1:~CellTemplateBuilder.withUntypedNode(kotlin.jvm.functions.Function1)" resolve="withUntypedNode" />
+                                <node concept="1bVj0M" id="2QtC6yZ50Tf" role="37wK5m">
+                                  <node concept="gl6BB" id="2QtC6yZ50Tg" role="1bW2Oz">
+                                    <property role="TrG5h" value="modelixNode" />
+                                    <node concept="2jxLKc" id="2QtC6yZ50Th" role="1tU5fm" />
+                                  </node>
+                                  <node concept="3clFbS" id="2QtC6yZ50Ti" role="1bW5cS">
+                                    <node concept="3cpWs8" id="2QtC6z1jQKQ" role="3cqZAp">
+                                      <node concept="3cpWsn" id="2QtC6z1jQKT" role="3cpWs9">
+                                        <property role="TrG5h" value="node" />
+                                        <property role="3TUv4t" value="true" />
+                                        <node concept="3Tqbb2" id="2QtC6z1jQKO" role="1tU5fm" />
+                                        <node concept="2OqwBi" id="2QtC6z1jVld" role="33vP2m">
+                                          <node concept="10M0yZ" id="2QtC6z1jVle" role="2Oq$k0">
+                                            <ref role="3cqZAo" to="1ut2:~ModelixNodeAsMPSNode.Companion" resolve="Companion" />
+                                            <ref role="1PxDUh" to="1ut2:~ModelixNodeAsMPSNode" resolve="ModelixNodeAsMPSNode" />
+                                          </node>
+                                          <node concept="liA8E" id="2QtC6z1jVlf" role="2OqNvi">
+                                            <ref role="37wK5l" to="1ut2:~ModelixNodeAsMPSNode$Companion.toMPSNode(org.modelix.model.api.INode)" resolve="toMPSNode" />
+                                            <node concept="37vLTw" id="2xR011TvVVZ" role="37wK5m">
+                                              <ref role="3cqZAo" node="2QtC6yZ50Tg" resolve="modelixNode" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="2QtC6yZ59nV" role="3cqZAp">
+                                      <node concept="2OqwBi" id="2QtC6yZ59nX" role="3clFbG">
+                                        <node concept="37vLTw" id="2QtC6yZ59nY" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="2QtC6yZ4Rzn" resolve="builder" />
+                                        </node>
+                                        <node concept="liA8E" id="2QtC6yZ59nZ" role="2OqNvi">
+                                          <ref role="37wK5l" to="jej1:~CellTemplateBuilder.modelAccess(kotlin.jvm.functions.Function1)" resolve="modelAccess" />
+                                          <node concept="1bVj0M" id="2QtC6yZ59o0" role="37wK5m">
+                                            <node concept="gl6BB" id="2QtC6yZ59o1" role="1bW2Oz">
+                                              <property role="TrG5h" value="builder" />
+                                              <node concept="2jxLKc" id="2QtC6yZ59o2" role="1tU5fm" />
+                                            </node>
+                                            <node concept="3clFbS" id="2QtC6yZ59o3" role="1bW5cS">
+                                              <node concept="3clFbF" id="2QtC6yZ5lml" role="3cqZAp">
+                                                <node concept="2OqwBi" id="2QtC6yZ5lmn" role="3clFbG">
+                                                  <node concept="37vLTw" id="2QtC6yZ5lmo" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="2QtC6yZ59o1" resolve="builder" />
+                                                  </node>
+                                                  <node concept="liA8E" id="2QtC6yZ5lmp" role="2OqNvi">
+                                                    <ref role="37wK5l" to="jej1:~ModelAccessBuilder.get(kotlin.jvm.functions.Function0)" resolve="get" />
+                                                    <node concept="1bVj0M" id="2QtC6yZ5lmq" role="37wK5m">
+                                                      <node concept="3clFbS" id="2QtC6yZ5lmt" role="1bW5cS">
+                                                        <node concept="3cpWs6" id="2QtC6yZ5lmu" role="3cqZAp">
+                                                          <node concept="Xl_RD" id="2QtC6yZ5wxE" role="3cqZAk">
+                                                            <property role="Xl_RC" value="" />
+                                                            <node concept="29HgVG" id="2QtC6yZ5HO1" role="lGtFl">
+                                                              <node concept="3NFfHV" id="2QtC6yZ5Itw" role="3NFExx">
+                                                                <node concept="3clFbS" id="2QtC6yZ5Itx" role="2VODD2">
+                                                                  <node concept="3clFbF" id="2QtC6yZ5J94" role="3cqZAp">
+                                                                    <node concept="2OqwBi" id="2QtC6yZ5Jm1" role="3clFbG">
+                                                                      <node concept="30H73N" id="2QtC6yZ5J93" role="2Oq$k0" />
+                                                                      <node concept="3TrEf2" id="2QtC6yZ5SFX" role="2OqNvi">
+                                                                        <ref role="3Tt5mk" to="f8gn:ziPuhE_Fp2" resolve="expression" />
+                                                                      </node>
+                                                                    </node>
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3cpWs6" id="2QtC6yZ59oc" role="3cqZAp">
+                                                <node concept="10M0yZ" id="2QtC6yZ59od" role="3cqZAk">
+                                                  <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                                                  <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3cpWs6" id="2QtC6yZ50Tr" role="3cqZAp">
+                                      <node concept="10M0yZ" id="2QtC6yZ50Ts" role="3cqZAk">
+                                        <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                                        <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
                                       </node>
-                                      <node concept="30H73N" id="22f9nDgRU8e" role="2Oq$k0" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3cpWs6" id="2QtC6yZ4Rzy" role="3cqZAp">
+                            <node concept="10M0yZ" id="2QtC6yZ4Rzz" role="3cqZAk">
+                              <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                              <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="raruj" id="2QtC6yZ4Rz$" role="lGtFl" />
+                </node>
+                <node concept="3cpWs6" id="2QtC6yZ4Rz_" role="3cqZAp">
+                  <node concept="10M0yZ" id="2QtC6yZ4RzA" role="3cqZAk">
+                    <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                    <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1861,49 +2378,87 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="22f9nDgS1RE" role="3acgRq">
+    <node concept="3aamgX" id="2xR011UnUZ6" role="3acgRq">
       <ref role="30HIoZ" to="f8gn:22f9nDgNr2y" resolve="BL_NotationNodeExpression" />
-      <node concept="gft3U" id="22f9nDgS50R" role="1lVwrX">
-        <node concept="3VmV3z" id="22f9nDgS50Z" role="gfFT$">
-          <property role="3VnrPo" value="node" />
-          <node concept="3Tqbb2" id="22f9nDgS519" role="3Vn4Tt" />
+      <node concept="1Koe21" id="2xR011UnUZ7" role="1lVwrX">
+        <node concept="3clFb_" id="2xR011UnUZ8" role="1Koe22">
+          <property role="TrG5h" value="f" />
+          <node concept="37vLTG" id="2xR011UnUZ9" role="3clF46">
+            <property role="TrG5h" value="modelixNode" />
+            <node concept="3uibUv" id="2xR011UnUZa" role="1tU5fm">
+              <ref role="3uigEE" to="jks5:~INode" resolve="INode" />
+            </node>
+          </node>
+          <node concept="3Tqbb2" id="2xR011UnUZb" role="3clF45" />
+          <node concept="3Tm1VV" id="2xR011UnUZc" role="1B3o_S" />
+          <node concept="3clFbS" id="2xR011UnUZd" role="3clF47">
+            <node concept="3clFbF" id="2xR011UnUZe" role="3cqZAp">
+              <node concept="2OqwBi" id="2xR011UnUZf" role="3clFbG">
+                <node concept="10M0yZ" id="2xR011UnUZg" role="2Oq$k0">
+                  <ref role="3cqZAo" to="1ut2:~ModelixNodeAsMPSNode.Companion" resolve="Companion" />
+                  <ref role="1PxDUh" to="1ut2:~ModelixNodeAsMPSNode" resolve="ModelixNodeAsMPSNode" />
+                </node>
+                <node concept="liA8E" id="2xR011UnUZh" role="2OqNvi">
+                  <ref role="37wK5l" to="1ut2:~ModelixNodeAsMPSNode$Companion.toMPSNode(org.modelix.model.api.INode)" resolve="toMPSNode" />
+                  <node concept="37vLTw" id="2xR011UnUZi" role="37wK5m">
+                    <ref role="3cqZAo" node="2xR011UnUZ9" resolve="modelixNode" />
+                  </node>
+                </node>
+                <node concept="raruj" id="2xR011UnUZj" role="lGtFl" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
   </node>
-  <node concept="1XD0fY" id="63DBII8pVW4">
+  <node concept="312cEu" id="7HT$1xKu5Jt">
     <property role="TrG5h" value="AspectsDescriptor" />
-    <node concept="eKYAL" id="63DBII8pVZv" role="1XD0Tu" />
-    <node concept="1XD0mN" id="1ixZ$UHlP6U" role="1XD0Tu">
-      <property role="TrG5h" value="AspectsDescriptor" />
-      <node concept="1XD09Q" id="1ixZ$UHlQH3" role="KS$fE">
-        <property role="1Xb$ne" value="true" />
-        <node concept="1XD0eA" id="1ixZ$UHlQH5" role="TDYyH">
-          <property role="TrG5h" value="editorAspect" />
-          <node concept="1XD088" id="1ixZ$UHlQRm" role="1XD0Z0">
-            <ref role="1SePDO" to="dbfy:~org/modelix/editor/EditorAspect" resolve="EditorAspect" />
-          </node>
+    <node concept="Wx3nA" id="7cakuaptePQ" role="jymVt">
+      <property role="TrG5h" value="INSTANCE" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="7cakuaptbYq" role="1tU5fm">
+        <ref role="3uigEE" node="7HT$1xKu5Jt" resolve="AspectsDescriptor" />
+      </node>
+      <node concept="3Tm1VV" id="7cakuaptfPD" role="1B3o_S" />
+      <node concept="2ShNRf" id="7cakuaptcdf" role="33vP2m">
+        <node concept="1pGfFk" id="7cakuaptccZ" role="2ShVmc">
+          <ref role="37wK5l" node="7HT$1xKu819" resolve="AspectsDescriptor" />
         </node>
-        <node concept="1XD0mK" id="1ixZ$UHlQJE" role="1XD05H">
-          <node concept="1NbEFs" id="1ixZ$UHlQOj" role="1XD0cX">
-            <ref role="AarEw" to="dbfy:~EditorAspect.new()" resolve="EditorAspect" />
-          </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7HT$1xKu7eo" role="jymVt">
+      <property role="TrG5h" value="editorAspect" />
+      <node concept="3Tm6S6" id="7HT$1xKu7ep" role="1B3o_S" />
+      <node concept="3uibUv" id="7HT$1xKufRh" role="1tU5fm">
+        <ref role="3uigEE" to="jej1:~EditorAspect" resolve="EditorAspect" />
+      </node>
+      <node concept="2ShNRf" id="7HT$1xKufWk" role="33vP2m">
+        <node concept="1pGfFk" id="7HT$1xKufVS" role="2ShVmc">
+          <ref role="37wK5l" to="jej1:~EditorAspect.&lt;init&gt;()" resolve="EditorAspect" />
         </node>
       </node>
-      <node concept="1XD0fu" id="1ixZ$UHlR6j" role="KS$fE">
-        <node concept="1XD0a7" id="1ixZ$UHlRcY" role="THmaL">
-          <node concept="1NbEtQ" id="1ixZ$UHlTBU" role="1XD07G">
-            <ref role="AarEw" to="dbfy:~EditorAspect.conceptEditor(org/modelix/model/api/IConcept,kotlin/Boolean,kotlin/Function1&lt;NotationRootCellTemplateBuilder&lt;org/modelix/model/api/INode,org/modelix/model/api/IConcept&gt;,kotlin/Unit&gt;)" resolve="conceptEditor" />
-            <node concept="1XD0eI" id="1ixZ$UHlX_H" role="TWiod">
-              <node concept="1XD0k2" id="1pzCNySbtjH" role="1XD0ZN">
-                <node concept="5jKBG" id="1pzCNySbtpc" role="lGtFl">
-                  <ref role="v9R2y" node="1pzCNySbqH2" resolve="template_SConcept_as_IConcept" />
-                  <node concept="3NFfHV" id="1pzCNySbtuv" role="5jGum">
-                    <node concept="3clFbS" id="1pzCNySbtuw" role="2VODD2">
-                      <node concept="3clFbF" id="1pzCNySbtu$" role="3cqZAp">
-                        <node concept="2OqwBi" id="1ixZ$UHlXAS" role="3clFbG">
-                          <node concept="30H73N" id="1ixZ$UHlXAT" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="1ixZ$UHlXAU" role="2OqNvi">
+    </node>
+    <node concept="3clFbW" id="7HT$1xKu819" role="jymVt">
+      <node concept="3cqZAl" id="7HT$1xKu81b" role="3clF45" />
+      <node concept="3Tm6S6" id="7cakuaptcpf" role="1B3o_S" />
+      <node concept="3clFbS" id="7HT$1xKu81d" role="3clF47">
+        <node concept="3clFbF" id="7HT$1xKufYi" role="3cqZAp">
+          <node concept="2OqwBi" id="7HT$1xKugg8" role="3clFbG">
+            <node concept="37vLTw" id="7HT$1xKufYh" role="2Oq$k0">
+              <ref role="3cqZAo" node="7HT$1xKu7eo" resolve="editorAspect" />
+            </node>
+            <node concept="liA8E" id="7HT$1xKugL2" role="2OqNvi">
+              <ref role="37wK5l" to="jej1:~EditorAspect.conceptEditor(org.modelix.model.api.IConcept,boolean,kotlin.jvm.functions.Function1)" resolve="conceptEditor" />
+              <node concept="10Nm6u" id="7HT$1xKugVB" role="37wK5m">
+                <node concept="5jKBG" id="1vEPqpZ9gKg" role="lGtFl">
+                  <ref role="v9R2y" node="1vEPqpZ94Ep" resolve="template_SConcept_as_IConcept_java" />
+                  <node concept="3NFfHV" id="1vEPqpZ9hFs" role="5jGum">
+                    <node concept="3clFbS" id="1vEPqpZ9hFt" role="2VODD2">
+                      <node concept="3clFbF" id="1vEPqpZ9ipa" role="3cqZAp">
+                        <node concept="2OqwBi" id="1vEPqpZ9iWm" role="3clFbG">
+                          <node concept="30H73N" id="1vEPqpZ9ip9" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="1vEPqpZ9lo9" role="2OqNvi">
                             <ref role="3Tt5mk" to="f8gn:7dm8yUsMfNE" resolve="concept" />
                           </node>
                         </node>
@@ -1912,44 +2467,68 @@
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="1XD0eI" id="1zXwHaHuDXc" role="TWiod">
-              <node concept="1XD0ko" id="1zXwHaHuEr0" role="1XD0ZN">
-                <node concept="17Uvod" id="1zXwHaHuEre" role="lGtFl">
+              <node concept="3clFbT" id="7HT$1xKuh1f" role="37wK5m">
+                <node concept="17Uvod" id="7cakuapQ8Vx" role="lGtFl">
                   <property role="2qtEX9" value="value" />
-                  <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/2936055411798373327/2936055411798374017" />
-                  <node concept="3zFVjK" id="1zXwHaHuErf" role="3zH0cK">
-                    <node concept="3clFbS" id="1zXwHaHuErg" role="2VODD2">
-                      <node concept="3clFbF" id="1zXwHaHvEn8" role="3cqZAp">
-                        <node concept="2OqwBi" id="1zXwHaHvEKY" role="3clFbG">
-                          <node concept="30H73N" id="1zXwHaHvEn7" role="2Oq$k0" />
-                          <node concept="3TrcHB" id="1zXwHaHvGR7" role="2OqNvi">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                  <node concept="3zFVjK" id="7cakuapQ8V$" role="3zH0cK">
+                    <node concept="3clFbS" id="7cakuapQ8V_" role="2VODD2">
+                      <node concept="3clFbF" id="7cakuapQ8VF" role="3cqZAp">
+                        <node concept="2OqwBi" id="7cakuapQ8VA" role="3clFbG">
+                          <node concept="3TrcHB" id="7cakuapQ8VD" role="2OqNvi">
                             <ref role="3TsBF5" to="f8gn:1zXwHaHuRnq" resolve="applicableToSubconcepts" />
                           </node>
+                          <node concept="30H73N" id="7cakuapQ8VE" role="2Oq$k0" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="1XD0f0" id="1ixZ$UHlY6w" role="1XD06E">
-              <node concept="1NbEFs" id="2YOUMOf_FCX" role="THmaL">
-                <ref role="AarEw" to="dbfy:~NotationRootCellTemplateBuilder.condition(kotlin/Function1&lt;org/modelix/model/api/INode,kotlin/Boolean&gt;)" resolve="condition" />
-                <node concept="1XD0f0" id="2YOUMOf_FMv" role="1XD06E">
-                  <node concept="1XD0eA" id="2YOUMOf_J5f" role="21PhDs">
-                    <property role="TrG5h" value="node" />
+              <node concept="1bVj0M" id="7HT$1xKui5x" role="37wK5m">
+                <node concept="gl6BB" id="7HT$1xKui5D" role="1bW2Oz">
+                  <property role="TrG5h" value="builder" />
+                  <node concept="2jxLKc" id="7HT$1xKui5E" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7HT$1xKui5H" role="1bW5cS">
+                  <node concept="3cpWs8" id="2QtC6z0YHyI" role="3cqZAp">
+                    <node concept="3KEzu6" id="2QtC6z0YHyF" role="3cpWs9">
+                      <property role="TrG5h" value="rootBuilder" />
+                      <node concept="PeGgZ" id="2QtC6z0YHyG" role="1tU5fm" />
+                      <node concept="37vLTw" id="2QtC6z0YJMq" role="33vP2m">
+                        <ref role="3cqZAo" node="7HT$1xKui5D" resolve="builder" />
+                      </node>
+                    </node>
                   </node>
-                  <node concept="1KmxGs" id="2YOUMOfA0iO" role="THmaL">
-                    <node concept="10Nm6u" id="2YOUMOfA0iS" role="1KmxGj">
-                      <node concept="29HgVG" id="2YOUMOfA0j2" role="lGtFl">
-                        <node concept="3NFfHV" id="2YOUMOfA0j7" role="3NFExx">
-                          <node concept="3clFbS" id="2YOUMOfA0j8" role="2VODD2">
-                            <node concept="3clFbF" id="2YOUMOfA0lo" role="3cqZAp">
-                              <node concept="2OqwBi" id="2YOUMOfA0yh" role="3clFbG">
-                                <node concept="30H73N" id="2YOUMOfA0ln" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="2YOUMOfA1El" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="f8gn:7dm8yUsMfZC" resolve="condition" />
+                  <node concept="3clFbF" id="1vEPqpZ8jNe" role="3cqZAp">
+                    <node concept="2OqwBi" id="1vEPqpZ8kc3" role="3clFbG">
+                      <node concept="37vLTw" id="1vEPqpZ8jNc" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7HT$1xKui5D" resolve="builder" />
+                      </node>
+                      <node concept="liA8E" id="1vEPqpZ8mKD" role="2OqNvi">
+                        <ref role="37wK5l" to="jej1:~NotationRootCellTemplateBuilder.condition(kotlin.jvm.functions.Function1)" resolve="condition" />
+                        <node concept="1bVj0M" id="1vEPqpZ8nh8" role="37wK5m">
+                          <node concept="gl6BB" id="1vEPqpZ8nhf" role="1bW2Oz">
+                            <property role="TrG5h" value="modelixNode" />
+                            <node concept="2jxLKc" id="1vEPqpZ8nhg" role="1tU5fm" />
+                          </node>
+                          <node concept="3clFbS" id="1vEPqpZ8nhj" role="1bW5cS">
+                            <node concept="3clFbF" id="1vEPqpZ8nZM" role="3cqZAp">
+                              <node concept="3clFbT" id="1vEPqpZ8nZL" role="3clFbG">
+                                <property role="3clFbU" value="true" />
+                                <node concept="29HgVG" id="1vEPqpZ8A7o" role="lGtFl">
+                                  <node concept="3NFfHV" id="1vEPqpZ8Aqp" role="3NFExx">
+                                    <node concept="3clFbS" id="1vEPqpZ8Aqq" role="2VODD2">
+                                      <node concept="3clFbF" id="1vEPqpZ8AJO" role="3cqZAp">
+                                        <node concept="2OqwBi" id="1vEPqpZ8Bfu" role="3clFbG">
+                                          <node concept="30H73N" id="1vEPqpZ8AJN" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="1vEPqpZ8DjJ" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="f8gn:7dm8yUsMfZC" resolve="condition" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -1957,70 +2536,73 @@
                         </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="2YOUMOf_JeE" role="lGtFl">
-                  <node concept="3IZrLx" id="2YOUMOf_JeF" role="3IZSJc">
-                    <node concept="3clFbS" id="2YOUMOf_JeG" role="2VODD2">
-                      <node concept="3clFbF" id="2YOUMOf_JtB" role="3cqZAp">
-                        <node concept="2OqwBi" id="2YOUMOf_PmH" role="3clFbG">
-                          <node concept="2OqwBi" id="2YOUMOf_JRt" role="2Oq$k0">
-                            <node concept="30H73N" id="2YOUMOf_JtA" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="2YOUMOf_LXW" role="2OqNvi">
-                              <ref role="3Tt5mk" to="f8gn:7dm8yUsMfZC" resolve="condition" />
+                    <node concept="1W57fq" id="1vEPqpZ8tO5" role="lGtFl">
+                      <node concept="3IZrLx" id="1vEPqpZ8tO6" role="3IZSJc">
+                        <node concept="3clFbS" id="1vEPqpZ8tO7" role="2VODD2">
+                          <node concept="3clFbF" id="1vEPqpZ8utr" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZ8uts" role="3clFbG">
+                              <node concept="2OqwBi" id="1vEPqpZ8utt" role="2Oq$k0">
+                                <node concept="30H73N" id="1vEPqpZ8utu" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="1vEPqpZ8utv" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="f8gn:7dm8yUsMfZC" resolve="condition" />
+                                </node>
+                              </node>
+                              <node concept="3x8VRR" id="1vEPqpZ8utw" role="2OqNvi" />
                             </node>
                           </node>
-                          <node concept="3x8VRR" id="2YOUMOf_P_U" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="AQkLs" id="1ixZ$UHlY6x" role="THmaL">
-                <node concept="29HgVG" id="1ixZ$UHlY6y" role="lGtFl">
-                  <node concept="3NFfHV" id="1ixZ$UHlY6z" role="3NFExx">
-                    <node concept="3clFbS" id="1ixZ$UHlY6$" role="2VODD2">
-                      <node concept="3clFbF" id="1ixZ$UHlY6_" role="3cqZAp">
-                        <node concept="2OqwBi" id="1ixZ$UHlY6A" role="3clFbG">
-                          <node concept="3TrEf2" id="1ixZ$UHlY6B" role="2OqNvi">
-                            <ref role="3Tt5mk" to="f8gn:7dm8yUsMfYJ" resolve="cell" />
+                  <node concept="3clFbH" id="1vEPqpZ8TJN" role="3cqZAp">
+                    <node concept="29HgVG" id="1vEPqpZ8URf" role="lGtFl">
+                      <node concept="3NFfHV" id="1vEPqpZ8URg" role="3NFExx">
+                        <node concept="3clFbS" id="1vEPqpZ8URh" role="2VODD2">
+                          <node concept="3clFbF" id="1vEPqpZ8URn" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vEPqpZ8URi" role="3clFbG">
+                              <node concept="3TrEf2" id="1vEPqpZ8URl" role="2OqNvi">
+                                <ref role="3Tt5mk" to="f8gn:7dm8yUsMfYJ" resolve="cell" />
+                              </node>
+                              <node concept="30H73N" id="1vEPqpZ8URm" role="2Oq$k0" />
+                            </node>
                           </node>
-                          <node concept="30H73N" id="1ixZ$UHlY6C" role="2Oq$k0" />
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="3cpWs6" id="1vEPqpZ8reH" role="3cqZAp">
+                    <node concept="10M0yZ" id="1vEPqpZ8sA4" role="3cqZAk">
+                      <ref role="3cqZAo" to="v18h:~Unit.INSTANCE" resolve="INSTANCE" />
+                      <ref role="1PxDUh" to="v18h:~Unit" resolve="Unit" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="UZU4S" id="1ixZ$UHlRaS" role="21Pmik">
-            <ref role="UZU4V" node="1ixZ$UHlQH5" resolve="editorAspect" />
-          </node>
-          <node concept="1WS0z7" id="1ixZ$UHlYUn" role="lGtFl">
-            <node concept="3JmXsc" id="1ixZ$UHlYUq" role="3Jn$fo">
-              <node concept="3clFbS" id="1ixZ$UHlYUr" role="2VODD2">
-                <node concept="3clFbF" id="22f9nDgKT5m" role="3cqZAp">
-                  <node concept="2OqwBi" id="22f9nDgL5NT" role="3clFbG">
-                    <node concept="2OqwBi" id="22f9nDgL0kn" role="2Oq$k0">
-                      <node concept="2OqwBi" id="22f9nDgKUt7" role="2Oq$k0">
-                        <node concept="2OqwBi" id="22f9nDgKTZF" role="2Oq$k0">
-                          <node concept="1iwH7S" id="22f9nDgKT5l" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="22f9nDgKUd9" role="2OqNvi" />
+          <node concept="1WS0z7" id="1vEPqpZ8y2x" role="lGtFl">
+            <node concept="3JmXsc" id="1vEPqpZ8y2y" role="3Jn$fo">
+              <node concept="3clFbS" id="1vEPqpZ8y2z" role="2VODD2">
+                <node concept="3clFbF" id="1vEPqpZ8yBE" role="3cqZAp">
+                  <node concept="2OqwBi" id="1vEPqpZ8yBF" role="3clFbG">
+                    <node concept="2OqwBi" id="1vEPqpZ8yBG" role="2Oq$k0">
+                      <node concept="2OqwBi" id="1vEPqpZ8yBH" role="2Oq$k0">
+                        <node concept="2OqwBi" id="1vEPqpZ8yBI" role="2Oq$k0">
+                          <node concept="1iwH7S" id="1vEPqpZ8yBJ" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="1vEPqpZ8yBK" role="2OqNvi" />
                         </node>
-                        <node concept="2RRcyG" id="22f9nDgKWSF" role="2OqNvi">
-                          <node concept="chp4Y" id="22f9nDgKWZN" role="3MHsoP">
+                        <node concept="2RRcyG" id="1vEPqpZ8yBL" role="2OqNvi">
+                          <node concept="chp4Y" id="1vEPqpZ8yBM" role="3MHsoP">
                             <ref role="cht4Q" to="f8gn:7dm8yUsM9Ro" resolve="NotationModule" />
                           </node>
                         </node>
                       </node>
-                      <node concept="13MTOL" id="22f9nDgL2HP" role="2OqNvi">
+                      <node concept="13MTOL" id="1vEPqpZ8yBN" role="2OqNvi">
                         <ref role="13MTZf" to="f8gn:7dm8yUsMfq9" resolve="content" />
                       </node>
                     </node>
-                    <node concept="v3k3i" id="22f9nDgL7aT" role="2OqNvi">
-                      <node concept="chp4Y" id="22f9nDgL7ln" role="v3oSu">
+                    <node concept="v3k3i" id="1vEPqpZ8yBO" role="2OqNvi">
+                      <node concept="chp4Y" id="1vEPqpZ8yBP" role="v3oSu">
                         <ref role="cht4Q" to="f8gn:7dm8yUsMfHH" resolve="ConceptNotation" />
                       </node>
                     </node>
@@ -2031,110 +2613,66 @@
           </node>
         </node>
       </node>
-      <node concept="1XD0bz" id="1ixZ$UHlPK8" role="KS$fE">
-        <property role="TrG5h" value="createAspects" />
-        <property role="3qOnjd" value="true" />
-        <node concept="1NbEFs" id="1ixZ$UHlQuI" role="THmaL">
-          <ref role="AarEw" to="1xrd:~.listOf&lt;1&gt;(*0)" resolve="listOf" />
-          <node concept="1XD0eI" id="1ixZ$UHlQBK" role="TWiod">
-            <node concept="UZU4S" id="1ixZ$UHlQWU" role="1XD0ZN">
-              <ref role="UZU4V" node="1ixZ$UHlQH5" resolve="editorAspect" />
+    </node>
+    <node concept="3Tm1VV" id="7HT$1xKu5Ju" role="1B3o_S" />
+    <node concept="n94m4" id="7HT$1xKu5Jv" role="lGtFl" />
+    <node concept="3uibUv" id="7HT$1xKu68i" role="EKbjA">
+      <ref role="3uigEE" to="ljn7:~ILanguageAspectsDescriptor" resolve="ILanguageAspectsDescriptor" />
+    </node>
+    <node concept="3clFb_" id="7HT$1xKu68E" role="jymVt">
+      <property role="TrG5h" value="createAspects" />
+      <node concept="3Tm1VV" id="7HT$1xKu68F" role="1B3o_S" />
+      <node concept="2AHcQZ" id="7HT$1xKu68H" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="3uibUv" id="7HT$1xKu68I" role="3clF45">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3uibUv" id="7HT$1xKu68J" role="11_B2D">
+          <ref role="3uigEE" to="x83f:~ILanguageAspect" resolve="ILanguageAspect" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7HT$1xKu68K" role="3clF47">
+        <node concept="3clFbF" id="1vEPqpZ8VUy" role="3cqZAp">
+          <node concept="2ShNRf" id="1vEPqpZ8VUw" role="3clFbG">
+            <node concept="Tc6Ow" id="1vEPqpZ8Zy7" role="2ShVmc">
+              <node concept="3uibUv" id="1vEPqpZ8ZTZ" role="HW$YZ">
+                <ref role="3uigEE" to="x83f:~ILanguageAspect" resolve="ILanguageAspect" />
+              </node>
+              <node concept="37vLTw" id="1vEPqpZ927w" role="HW$Y0">
+                <ref role="3cqZAo" node="7HT$1xKu7eo" resolve="editorAspect" />
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="KYwOn" id="1ixZ$UHlPFI" role="AST3G">
-        <ref role="KYwOm" to="8jio:~org/modelix/editor/ssr/mps/ILanguageAspectsDescriptor" resolve="ILanguageAspectsDescriptor" />
+      <node concept="2AHcQZ" id="7HT$1xKu68L" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="eKYAL" id="1ixZ$UHlOD0" role="1XD0Tu" />
-    <node concept="eKYAL" id="63DBII8pVZx" role="1XD0Tu" />
-    <node concept="n94m4" id="63DBII8pVW5" role="lGtFl" />
   </node>
-  <node concept="13MO4I" id="1pzCNySbqH2">
-    <property role="TrG5h" value="template_SConcept_as_IConcept" />
+  <node concept="13MO4I" id="1vEPqpZ94Ep">
+    <property role="TrG5h" value="template_SConcept_as_IConcept_java" />
     <ref role="3gUMe" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-    <node concept="1NbEFs" id="1pzCNySbqH4" role="13RCb5">
-      <ref role="AarEw" to="1g18:~MPSConcept.new(org/jetbrains/mps/openapi/language/SAbstractConcept)" resolve="MPSConcept" />
-      <node concept="1XD0eI" id="1pzCNySbqH5" role="TWiod">
-        <node concept="1XD0a7" id="1pzCNySbqH6" role="1XD0ZN">
-          <node concept="2yQVVM" id="1pzCNySbqH7" role="1XD07G">
-            <ref role="2yQV70" to="2k9e:~MetaAdapterFactory.getConcept(jetbrains.mps.smodel.adapter.ids.SConceptId,java.lang.String)" resolve="getConcept" />
-            <node concept="1XD0eI" id="1pzCNySbqH8" role="TWiod">
-              <node concept="1XD0a7" id="1pzCNySbqH9" role="1XD0ZN">
-                <node concept="2yQVVM" id="1pzCNySbqHa" role="1XD07G">
-                  <ref role="2yQV70" to="e8bb:~SConceptId.deserialize(java.lang.String)" resolve="deserialize" />
-                  <node concept="1XD0eI" id="1pzCNySbqHb" role="TWiod">
-                    <node concept="1XD08G" id="1pzCNySbqHc" role="1XD0ZN">
-                      <node concept="Df6$J" id="1pzCNySbqHd" role="Df6Hu">
-                        <node concept="21VMdE" id="1pzCNySbqHe" role="Df7GE">
-                          <property role="21VMdD" value="serializedConceptId" />
-                          <node concept="17Uvod" id="1pzCNySbqHf" role="lGtFl">
-                            <property role="2qtEX9" value="content" />
-                            <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                            <node concept="3zFVjK" id="1pzCNySbqHg" role="3zH0cK">
-                              <node concept="3clFbS" id="1pzCNySbqHh" role="2VODD2">
-                                <node concept="3clFbF" id="1pzCNySbqHi" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1pzCNySbqHj" role="3clFbG">
-                                    <node concept="2YIFZM" id="1pzCNySbqHk" role="2Oq$k0">
-                                      <ref role="37wK5l" to="e8bb:~MetaIdByDeclaration.getConceptId(org.jetbrains.mps.openapi.model.SNode)" resolve="getConceptId" />
-                                      <ref role="1Pybhc" to="e8bb:~MetaIdByDeclaration" resolve="MetaIdByDeclaration" />
-                                      <node concept="30H73N" id="1pzCNySbqHm" role="37wK5m" />
-                                    </node>
-                                    <node concept="liA8E" id="1pzCNySbqHo" role="2OqNvi">
-                                      <ref role="37wK5l" to="e8bb:~SConceptId.serialize()" resolve="serialize" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1XD0em" id="1pzCNySbqHp" role="21Pmik">
-                  <node concept="2EYIWN" id="1pzCNySbqHq" role="1XD0Sn">
-                    <ref role="2EYIUZ" to="e8bb:~SConceptId" resolve="SConceptId" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1XD0eI" id="1pzCNySbqHr" role="TWiod">
-              <node concept="1XD08G" id="1pzCNySbqHs" role="1XD0ZN">
-                <node concept="Df6$J" id="1pzCNySbqHt" role="Df6Hu">
-                  <node concept="21VMdE" id="1pzCNySbqHu" role="Df7GE">
-                    <property role="21VMdD" value="conceptName" />
-                    <node concept="17Uvod" id="1pzCNySbqHv" role="lGtFl">
-                      <property role="2qtEX9" value="content" />
-                      <property role="P4ACc" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689/1243006380188575965/1243006380188575966" />
-                      <node concept="3zFVjK" id="1pzCNySbqHw" role="3zH0cK">
-                        <node concept="3clFbS" id="1pzCNySbqHx" role="2VODD2">
-                          <node concept="3clFbF" id="1pzCNySbqHy" role="3cqZAp">
-                            <node concept="2OqwBi" id="1pzCNySbqHz" role="3clFbG">
-                              <node concept="30H73N" id="1pzCNySbqH_" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1pzCNySbqHB" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+    <node concept="2ShNRf" id="1vEPqpZ95CN" role="13RCb5">
+      <node concept="1pGfFk" id="1vEPqpZ99q5" role="2ShVmc">
+        <property role="373rjd" value="true" />
+        <ref role="37wK5l" to="zxfz:~MPSConcept.&lt;init&gt;(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="MPSConcept" />
+        <node concept="35c_gC" id="7cakuapbHKS" role="37wK5m">
+          <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
+          <node concept="1ZhdrF" id="7cakuapbI28" role="lGtFl">
+            <property role="2qtEX8" value="conceptDeclaration" />
+            <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
+            <node concept="3$xsQk" id="7cakuapbI29" role="3$ytzL">
+              <node concept="3clFbS" id="7cakuapbI2a" role="2VODD2">
+                <node concept="3clFbF" id="7cakuapbI3a" role="3cqZAp">
+                  <node concept="30H73N" id="7cakuapbI39" role="3clFbG" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1XD0em" id="1pzCNySbqHC" role="21Pmik">
-            <node concept="2EYIWN" id="1pzCNySbqHD" role="1XD0Sn">
-              <ref role="2EYIUZ" to="2k9e:~MetaAdapterFactory" resolve="MetaAdapterFactory" />
-            </node>
-          </node>
         </node>
       </node>
-      <node concept="raruj" id="1pzCNySbrAM" role="lGtFl" />
+      <node concept="raruj" id="1vEPqpZ99Xh" role="lGtFl" />
     </node>
   </node>
 </model>
diff --git a/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
index 769c5035..7888c37c 100644
--- a/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
+++ b/mps/modules/org.modelix.mps.notation/models/org.modelix.mps.notation.structure.mps
@@ -8,7 +8,6 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="ya4x" ref="r:2bbee5fa-3e86-4d20-a22d-b5d5f139bede(org.modelix.mps.baseLanguage2kotlin.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -108,7 +107,7 @@
       <property role="IQ2ns" value="8310867745953087464" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="condition" />
-      <ref role="20lvS9" to="ya4x:22f9nDgNaDZ" resolve="IBaseLanguageOrKotlinExpression" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="1TJgyj" id="7dm8yUsMfNE" role="1TKVEi">
       <property role="IQ2ns" value="8310867745953086698" />
@@ -193,6 +192,11 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpce:f_TJgxF" resolve="PropertyDeclaration" />
     </node>
+    <node concept="1TJgyi" id="f1Ei69rzUi" role="1TKVEl">
+      <property role="IQ2nx" value="270683414123658898" />
+      <property role="TrG5h" value="regex" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
   </node>
   <node concept="1TIwiD" id="CUW2QYMiki">
     <property role="EcuMT" value="737165568293545234" />
@@ -322,7 +326,7 @@
       <property role="IQ2ns" value="2346135138154959868" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="renderTarget" />
-      <ref role="20lvS9" to="ya4x:22f9nDgNaDZ" resolve="IBaseLanguageOrKotlinExpression" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="1TJgyj" id="ziPuhEA2aC" role="1TKVEi">
       <property role="IQ2ns" value="635805674430276264" />
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 b3c61ccc..a49c39c5 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
@@ -27,24 +27,20 @@
       <dependencies>
         <dependency reexport="false">771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)</dependency>
         <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
-        <dependency reexport="false">6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</dependency>
-        <dependency reexport="false">8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)</dependency>
-        <dependency reexport="false">cc24a92d-c78e-4016-a5d4-902df7135727(org.modelix.mps.baseLanguageInsideKotlin)</dependency>
+        <dependency reexport="false">208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)</dependency>
+        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:2405a196-e75d-462c-938b-ae8e3fac20aa:jetbrains.mps.baseLanguage.kotlinRefs" version="0" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l: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: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" />
         <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" />
@@ -55,7 +51,6 @@
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-        <language slang="l:cc24a92d-c78e-4016-a5d4-902df7135727:org.modelix.mps.baseLanguageInsideKotlin" version="0" />
         <language slang="l:c7b55726-1795-47bd-aa21-714ac1e30f21:org.modelix.mps.notation" version="0" />
       </languageVersions>
       <dependencyVersions>
@@ -69,17 +64,12 @@
         <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
-        <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-        <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-        <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)" version="0" />
-        <module reference="cc24a92d-c78e-4016-a5d4-902df7135727(org.modelix.mps.baseLanguageInsideKotlin)" version="0" />
         <module reference="208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)" version="0" />
         <module reference="771cf896-ab1b-409b-93b4-48c3bbb6b23f(org.modelix.mps.editor.ssr.stubs)" version="0" />
         <module reference="c7b55726-1795-47bd-aa21-714ac1e30f21(org.modelix.mps.notation)" version="0" />
@@ -93,7 +83,6 @@
     <dependency reexport="false" scope="generate-into">6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
   </dependencies>
   <languageVersions>
@@ -151,7 +140,6 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)" version="0" />
     <module reference="c7b55726-1795-47bd-aa21-714ac1e30f21(org.modelix.mps.notation)" version="0" />
   </dependencyVersions>
   <runtime>
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 b19f2cca..255f50f5 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
@@ -38,9 +38,6 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-    <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-    <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
     <module reference="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" />
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 96bc29d7..e28fa2df 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
@@ -65,9 +65,6 @@
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-        <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-        <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
@@ -150,9 +147,6 @@
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-    <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-    <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/mps/modules/org.modelix.mps.spreadsheets.notation/org.modelix.mps.spreadsheets.notation.msd b/mps/modules/org.modelix.mps.spreadsheets.notation/org.modelix.mps.spreadsheets.notation.msd
index b4cff253..363791be 100644
--- a/mps/modules/org.modelix.mps.spreadsheets.notation/org.modelix.mps.spreadsheets.notation.msd
+++ b/mps/modules/org.modelix.mps.spreadsheets.notation/org.modelix.mps.spreadsheets.notation.msd
@@ -32,8 +32,6 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:8f2def56-7502-4f14-994f-472d404e528c:org.modelix.mps.baseLanguage2kotlin" version="0" />
-    <language slang="l:cc24a92d-c78e-4016-a5d4-902df7135727:org.modelix.mps.baseLanguageInsideKotlin" version="0" />
     <language slang="l:c7b55726-1795-47bd-aa21-714ac1e30f21:org.modelix.mps.notation" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/mps/modules/org.modelix.mps.spreadsheets.sandbox/models/org.modelix.mps.spreadsheets.sandbox.permissions.mps b/mps/modules/org.modelix.mps.spreadsheets.sandbox/models/org.modelix.mps.spreadsheets.sandbox.permissions.mps
index 7a168ed0..fe453022 100644
--- a/mps/modules/org.modelix.mps.spreadsheets.sandbox/models/org.modelix.mps.spreadsheets.sandbox.permissions.mps
+++ b/mps/modules/org.modelix.mps.spreadsheets.sandbox/models/org.modelix.mps.spreadsheets.sandbox.permissions.mps
@@ -17,7 +17,11 @@
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534513062" name="jetbrains.mps.baseLanguage.structure.DoubleType" flags="in" index="10P55v" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -34,10 +38,17 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@@ -612,7 +623,18 @@
       <node concept="3cqZAl" id="67j$1x53G4Q" role="3clF45" />
       <node concept="3Tm1VV" id="67j$1x53G4R" role="1B3o_S" />
       <node concept="3clFbS" id="67j$1x53G4S" role="3clF47" />
+      <node concept="37vLTG" id="2ns544GqWEb" role="3clF46">
+        <property role="TrG5h" value="abc" />
+        <node concept="10Oyi0" id="2ns544GqWEc" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2ns544GqWEd" role="3clF46">
+        <property role="TrG5h" value="def" />
+        <node concept="10P55v" id="2ns544GqWEe" role="1tU5fm" />
+      </node>
     </node>
+    <node concept="2tJIrI" id="2ns544GqWE4" role="jymVt" />
+    <node concept="2tJIrI" id="2ns544GqWDW" role="jymVt" />
+    <node concept="2tJIrI" id="2ns544GqWDX" role="jymVt" />
     <node concept="3clFb_" id="67j$1x53G6f" role="jymVt">
       <property role="TrG5h" value="minuwbbxtjjlsss" />
       <node concept="37vLTG" id="RYBraoAJpy" role="3clF46">
@@ -621,7 +643,22 @@
       </node>
       <node concept="3cqZAl" id="67j$1x53G6h" role="3clF45" />
       <node concept="3Tm1VV" id="67j$1x53G6i" role="1B3o_S" />
-      <node concept="3clFbS" id="67j$1x53G6j" role="3clF47" />
+      <node concept="3clFbS" id="67j$1x53G6j" role="3clF47">
+        <node concept="3cpWs8" id="7HT$1xKtVkN" role="3cqZAp">
+          <node concept="3cpWsn" id="7HT$1xKtVkO" role="3cpWs9">
+            <property role="TrG5h" value="abc" />
+            <node concept="10Oyi0" id="7HT$1xKtVkP" role="1tU5fm" />
+            <node concept="3cpWs3" id="7HT$1xKtVl7" role="33vP2m">
+              <node concept="3cmrfG" id="7HT$1xKtVkY" role="3uHU7B">
+                <property role="3cmrfH" value="10" />
+              </node>
+              <node concept="3cmrfG" id="7HT$1xKtVlg" role="3uHU7w">
+                <property role="3cmrfH" value="10" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5V0cDfz3aJp" role="jymVt" />
     <node concept="3clFb_" id="5V0cDfz3aL0" role="jymVt">
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 3658ad3b..d8836900 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
@@ -6,7 +6,6 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="c7b55726-1795-47bd-aa21-714ac1e30f21" name="org.modelix.mps.notation" version="0" />
-    <use id="8f2def56-7502-4f14-994f-472d404e528c" name="org.modelix.mps.baseLanguage2kotlin" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -15,7 +14,6 @@
     <import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="rkxj" ref="r:b1598fca-3527-4718-b3ee-193781dbf052(jetbrains.mps.java.core.newparser)" />
     <import index="kpbf" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text.impl(MPS.TextGen/)" />
     <import index="f2e5" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:kotlinx.serialization.json(org.modelix.mps.editor.common.stubs/)" />
     <import index="1ut2" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:org.modelix.model.mpsadapters.tomps(org.modelix.mps.editor.common.stubs/)" />
@@ -301,11 +299,6 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="8f2def56-7502-4f14-994f-472d404e528c" name="org.modelix.mps.baseLanguage2kotlin">
-      <concept id="2346135138155145856" name="org.modelix.mps.baseLanguage2kotlin.structure.BaseLanguageExpressionWrapper" flags="ng" index="1KgSZU">
-        <child id="2346135138155145859" name="expression" index="1KgSZT" />
-      </concept>
-    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -3559,12 +3552,10 @@
       <ref role="3JBHV5" to="ur0y:2ti6llKUmc0" resolve="ColumnReference" />
       <node concept="1yiJt1" id="72hS3ltFkcB" role="3JBHQ1">
         <ref role="1yiJtc" to="ur0y:2ti6llKUmc1" resolve="column" />
-        <node concept="1KgSZU" id="1edLqv8Jwq_" role="1KhJq6">
-          <node concept="2OqwBi" id="1edLqv8JwxC" role="1KgSZT">
-            <node concept="1KnsVF" id="1edLqv8JwqD" role="2Oq$k0" />
-            <node concept="2qgKlT" id="1edLqv8JylR" role="2OqNvi">
-              <ref role="37wK5l" to="xmo0:1gyl2moVSFk" resolve="getColumnLabel" />
-            </node>
+        <node concept="2OqwBi" id="1edLqv8JwxC" role="1KhJq6">
+          <node concept="1KnsVF" id="1edLqv8JwqD" role="2Oq$k0" />
+          <node concept="2qgKlT" id="1edLqv8JylR" role="2OqNvi">
+            <ref role="37wK5l" to="xmo0:1gyl2moVSFk" resolve="getColumnLabel" />
           </node>
         </node>
       </node>
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 fcfb7b87..b6ed9aaf 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
@@ -103,7 +103,6 @@
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:8f2def56-7502-4f14-994f-472d404e528c:org.modelix.mps.baseLanguage2kotlin" version="0" />
     <language slang="l:c7b55726-1795-47bd-aa21-714ac1e30f21:org.modelix.mps.notation" version="0" />
     <language slang="l:67accce2-9676-4728-9e9c-8b15ea30d924:org.modelix.mps.react" version="0" />
   </languageVersions>
@@ -120,9 +119,6 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="65557aaa-5381-435d-b705-3f8d546e0f40(jetbrains.mps.java.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="b50d89c0-0fb9-4105-b652-222148c26a9b(jetbrains.mps.kotlin.stdlib)" version="0" />
-    <module reference="d2c5f31a-2aac-440d-a15c-2d8cba42bf3d(jetbrains.mps.kotlin.stdlib.jvm)" version="0" />
-    <module reference="6944825c-ddc2-4099-8cc7-5e6dbbf7f0be(jetbrains.mps.kotlin.stubs)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
diff --git a/mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit b/mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
index fd8a86d1..cba1f83c 100644
--- a/mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
+++ b/mps/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dev-kit name="org.modelix.mps.webaspect.devkit" uuid="46d68387-81c7-4c54-9dd2-2717eb3f009b">
   <exported-language name="c7b55726-1795-47bd-aa21-714ac1e30f21(org.modelix.mps.notation)" />
-  <exported-language name="8f2def56-7502-4f14-994f-472d404e528c(org.modelix.mps.baseLanguage2kotlin)" />
   <exported-language name="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" />
   <exported-language name="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" />
   <exported-language name="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" />
   <exported-language name="b17a9ec8-44a5-40a1-9216-058d277424eb(jetbrains.mps.kotlin.internal)" />
   <exported-language name="eb56ebf4-df56-438e-af06-fc1cd08b495a(jetbrains.mps.kotlin.smodel)" />
-  <exported-language name="cc24a92d-c78e-4016-a5d4-902df7135727(org.modelix.mps.baseLanguageInsideKotlin)" />
   <exported-language name="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" />
   <exported-language name="67accce2-9676-4728-9e9c-8b15ea30d924(org.modelix.mps.react)" />
+  <exported-language name="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" />
+  <exported-language name="515552c7-fcc0-4ab4-9789-2f3c49344e85(jetbrains.mps.baseLanguage.varVariable)" />
+  <exported-language name="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" />
   <exported-solutions>
     <exported-solution>02ad200e-1634-449d-8b0b-db88f7ea0f2d(org.modelix.mps.webaspect.genplan)</exported-solution>
   </exported-solutions>
diff --git a/mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps b/mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
index 9090e2aa..79402408 100644
--- a/mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
+++ b/mps/modules/org.modelix.mps.webaspect.genplan/models/org.modelix.mps.webaspect.genplan.mps
@@ -47,42 +47,30 @@
         </node>
       </node>
     </node>
-    <node concept="2VgMA2" id="22f9nDgQKqj" role="2VgMA7">
+    <node concept="2VgMA2" id="2QtC6yZ8Ed8" role="2VgMA7">
       <property role="1s431M" value="true" />
-      <node concept="2Qf6Nf" id="22f9nDgQKqm" role="2Qf7GQ">
-        <node concept="2V$Bhx" id="22f9nDgQKqT" role="2Qf6Ng">
-          <property role="2V$B1T" value="8f2def56-7502-4f14-994f-472d404e528c" />
-          <property role="2V$B1Q" value="org.modelix.mps.baseLanguage2kotlin" />
+      <node concept="2Qf6Nf" id="2QtC6yZ8EeY" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="2QtC6z0YK9o" role="2Qf6Ng">
+          <property role="2V$B1T" value="515552c7-fcc0-4ab4-9789-2f3c49344e85" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.varVariable" />
         </node>
       </node>
     </node>
-    <node concept="2VgMA2" id="1edLqv8OPSq" role="2VgMA7">
+    <node concept="2VgMA2" id="2QtC6z0YK9l" role="2VgMA7">
       <property role="1s431M" value="true" />
-      <node concept="2Qf6Nf" id="1edLqv8OPSE" role="2Qf7GQ">
-        <node concept="2V$Bhx" id="1edLqv8OPSI" role="2Qf6Ng">
-          <property role="2V$B1T" value="cc24a92d-c78e-4016-a5d4-902df7135727" />
-          <property role="2V$B1Q" value="org.modelix.mps.baseLanguageInsideKotlin" />
+      <node concept="2Qf6Nf" id="2QtC6z0YK9m" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="2QtC6z0YK9n" role="2Qf6Ng">
+          <property role="2V$B1T" value="fd392034-7849-419d-9071-12563d152375" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.closures" />
         </node>
       </node>
     </node>
-    <node concept="2VgMA2" id="22f9nDgQNo1" role="2VgMA7">
+    <node concept="2VgMA2" id="2QtC6z08pBM" role="2VgMA7">
       <property role="1s431M" value="true" />
-      <node concept="2Qf6Nf" id="22f9nDgQNo2" role="2Qf7GQ">
-        <node concept="2V$Bhx" id="22f9nDgQNod" role="2Qf6Ng">
-          <property role="2V$B1T" value="6b3888c1-9802-44d8-8baf-f8e6c33ed689" />
-          <property role="2V$B1Q" value="jetbrains.mps.kotlin" />
-        </node>
-      </node>
-      <node concept="2Qf6Nf" id="22f9nDgQNof" role="2Qf7GQ">
-        <node concept="2V$Bhx" id="22f9nDgQNol" role="2Qf6Ng">
-          <property role="2V$B1T" value="eb56ebf4-df56-438e-af06-fc1cd08b495a" />
-          <property role="2V$B1Q" value="jetbrains.mps.kotlin.smodel" />
-        </node>
-      </node>
-      <node concept="2Qf6Nf" id="22f9nDgQVgk" role="2Qf7GQ">
-        <node concept="2V$Bhx" id="22f9nDgQVgs" role="2Qf6Ng">
-          <property role="2V$B1T" value="b17a9ec8-44a5-40a1-9216-058d277424eb" />
-          <property role="2V$B1Q" value="jetbrains.mps.kotlin.internal" />
+      <node concept="2Qf6Nf" id="2QtC6z08pBN" role="2Qf7GQ">
+        <node concept="2V$Bhx" id="2QtC6z08pBP" role="2Qf6Ng">
+          <property role="2V$B1T" value="83888646-71ce-4f1c-9c53-c54016f6ad4f" />
+          <property role="2V$B1Q" value="jetbrains.mps.baseLanguage.collections" />
         </node>
       </node>
     </node>
diff --git a/projectional-editor-ssr-mps-languages/build.gradle.kts b/projectional-editor-ssr-mps-languages/build.gradle.kts
index 9be6eb3d..29d6e92c 100644
--- a/projectional-editor-ssr-mps-languages/build.gradle.kts
+++ b/projectional-editor-ssr-mps-languages/build.gradle.kts
@@ -121,7 +121,7 @@ tasks {
         intoChild(pluginName.map { "$it/META-INF" })
             .from(patchPluginXml.flatMap { it.outputFiles })
 
-        listOf("editor-languages", "baseLanguage-notation", "baseLanguageInsideKotlin", "react").forEach { publicationName ->
+        listOf("editor-languages", "baseLanguage-notation", "react").forEach { publicationName ->
             intoChild(pluginName.map { "$it/languages" })
                 .from(zipTree({ project(":mps").layout.buildDirectory.file("mpsbuild/publications/$publicationName.zip") }))
                 .eachFile {
diff --git a/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt
index 5ca51572..9cbcbfc9 100644
--- a/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt
+++ b/projectional-editor-ssr-mps-languages/src/test/kotlin/org/modelix/editor/ssr/mps/BaseLanguageTests.kt
@@ -284,12 +284,12 @@ class BaseLanguageTests : TestBase("SimpleProject") {
               }
             }
         """)
-        typeText("string")
+        typeText("int")
         pressKey(KnownKeys.Tab)
         typeText("p2")
         assertFinalEditorText("""
             public class Class1 {
-              public void method1(int p1, string p2) {
+              public void method1(int p1, int p2) {
                 <no statement>
               }
             }
diff --git a/projectional-editor-ssr-mps/build.gradle.kts b/projectional-editor-ssr-mps/build.gradle.kts
index 14d109b8..05cbe80d 100644
--- a/projectional-editor-ssr-mps/build.gradle.kts
+++ b/projectional-editor-ssr-mps/build.gradle.kts
@@ -96,15 +96,16 @@ tasks {
                 outputFolder(defaultDestinationDir.get().resolve(project.name).resolve("languages"))
                 runtimeJars.filterNot { jarsInBasePlugin.contains(it.name) }.forEach {
                     javaJar(it.name)
-                    kotlinJar(it.name)
+//                    kotlinJar(it.name)
                 }
                 moduleDependency(ModuleIdAndName(ModuleId("208eaf68-fd3a-497a-a4b6-4923ff457c3b"), "org.modelix.mps.editor.common.stubs"))
                 moduleDependency(KnownModuleIds.JDK)
+                moduleDependency(KnownModuleIds.Annotations)
                 moduleDependency(KnownModuleIds.MPS_OpenAPI)
                 moduleDependency(KnownModuleIds.MPS_IDEA)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
             }
         }
     }
diff --git a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
index dc3c8e4f..dba55b67 100644
--- a/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
+++ b/projectional-editor/src/commonMain/kotlin/org/modelix/editor/CellTemplateBuilder.kt
@@ -62,7 +62,7 @@ open class CellTemplateBuilder<NodeT : Any, ConceptT : Any>(val template: CellTe
         }
     }
 
-    protected fun withUntypedNode(body: (INode) -> Unit) {
+    fun withUntypedNode(body: (INode) -> Unit) {
         template.withNode += body
     }
 
diff --git a/react-ssr-mps/build.gradle.kts b/react-ssr-mps/build.gradle.kts
index c0393733..3d98e156 100644
--- a/react-ssr-mps/build.gradle.kts
+++ b/react-ssr-mps/build.gradle.kts
@@ -87,15 +87,15 @@ tasks {
                 outputFolder(defaultDestinationDir.get().resolve(project.name).resolve("languages"))
                 runtimeJars.filterNot { jarsInBasePlugin.contains(it.name) }.forEach {
                     javaJar(it.name)
-                    kotlinJar(it.name)
+//                    kotlinJar(it.name)
                 }
                 moduleDependency(ModuleIdAndName(ModuleId("208eaf68-fd3a-497a-a4b6-4923ff457c3b"), "org.modelix.mps.editor.common.stubs"))
                 moduleDependency(KnownModuleIds.JDK)
                 moduleDependency(KnownModuleIds.MPS_OpenAPI)
                 moduleDependency(KnownModuleIds.MPS_IDEA)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
-                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
+//                moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
             }
         }
     }