From 0359ff0ccdfd900babf0dca016d8bf7acdea9240 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Sun, 29 Jan 2017 14:22:17 +0100
Subject: [PATCH] Refactoring in the type templates:  - get rid of the
 dependency on the type concept;  - explicitly create type terms;  - no more
 "alternative block";  - introduce alternative "new type" pseudo constraint; 
 - delete the deprecated constructs;  - transition to TypeTermDeclaration;  -
 separate the term declaration from the type constraints;  - phasing out
 obsolete stuff.

---
 test.xml                                      |    2 +
 .../generator/template/main@generator.mps     | 3342 ++++++++++-------
 .../jetbrains.mps.lang.typesystem2.mpl        |    2 +
 .../languageModels/actions.mps                |  331 --
 .../languageModels/behavior.mps               |  243 +-
 .../languageModels/constraints.mps            |  109 +-
 .../languageModels/editor.mps                 |  905 +----
 .../languageModels/intentions.mps             |  222 --
 .../languageModels/structure.mps              |  215 +-
 .../languageModels/typesystem.mps             |  252 +-
 .../mps/lang/typesystem2/program.mps          |  424 +--
 .../jetbrains/mps/lang/typesystem2/aspect.mps |  111 +-
 .../jetbrains/mps/lang/typesystem2/type.mps   |  294 +-
 13 files changed, 2885 insertions(+), 3567 deletions(-)

diff --git a/test.xml b/test.xml
index 9991e6af..14ccf931 100644
--- a/test.xml
+++ b/test.xml
@@ -814,6 +814,7 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.devkit" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@@ -829,6 +830,7 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index f3d48d3f..83faea2f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -12,6 +12,7 @@
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -45,6 +46,7 @@
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
+    <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -139,17 +141,13 @@
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
-        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </concept>
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -230,6 +228,7 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+        <child id="1107880067339" name="method" index="3MN40a" />
       </concept>
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
@@ -272,9 +271,6 @@
         <child id="1163670677455" name="expression" index="3Kbmr1" />
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
-      <concept id="1206629501431" name="jetbrains.mps.baseLanguage.structure.InstanceInitializer" flags="lg" index="3KIgzJ">
-        <child id="1206629521979" name="statementList" index="3KIlGz" />
-      </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
@@ -525,6 +521,21 @@
       </concept>
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN" />
     </language>
+    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
+      <concept id="1173996401517" name="jetbrains.mps.baseLanguageInternal.structure.InternalNewExpression" flags="nn" index="1nCR9W">
+        <property id="1173996588177" name="fqClassName" index="1nD$Q0" />
+        <child id="1179332974947" name="type" index="2lIhxL" />
+        <child id="319021450862590135" name="actualArgument" index="2U2pNA" />
+      </concept>
+      <concept id="3421461530438559752" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClassCreator" flags="nn" index="1L3L4E">
+        <child id="3421461530438560031" name="cls" index="1L3L0X" />
+      </concept>
+      <concept id="3421461530438559753" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClass" flags="ig" index="1L3L4F">
+        <property id="3421461530438559973" name="fqClassName" index="1L3L77" />
+        <child id="3421461530438559756" name="constructorArgument" index="1L3L4I" />
+        <child id="3421461530438559974" name="type" index="1L3L74" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="5820409030208923287" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingLinkOperation" flags="nn" index="25OxAV" />
       <concept id="1226359078165" name="jetbrains.mps.lang.smodel.structure.LinkRefExpression" flags="nn" index="28GBK8">
@@ -545,7 +556,6 @@
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
-      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -7816,10 +7826,10 @@
       <ref role="2rTdP9" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
     </node>
-    <node concept="2rT7sh" id="4JJCDImI6Rx" role="2rTMjI">
-      <property role="TrG5h" value="typeConcept_field" />
+    <node concept="2rT7sh" id="4MEOIDFGYa1" role="2rTMjI">
+      <property role="TrG5h" value="typeTermParam_field" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
-      <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+      <ref role="2rTdP9" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
     </node>
     <node concept="2rT7sh" id="7IysFeAiAcO" role="2rTMjI">
       <property role="TrG5h" value="typeDecl_typeNode_variable" />
@@ -7868,7 +7878,7 @@
     </node>
     <node concept="3lhOvk" id="2N2MQGCMWNw" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
-      <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="TypeTable" />
+      <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="_TypeTable" />
       <ref role="2sgKRv" node="2N2MQGCMWOf" resolve="typetable_class" />
     </node>
     <node concept="2VPoh5" id="2N2MQGCMV2s" role="2VS0gm">
@@ -8259,29 +8269,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="2CEQDIDZ0q8" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-      <node concept="gft3U" id="2CEQDIDZ0U6" role="1lVwrX">
-        <node concept="1oi1Uc" id="2CEQDIDZ0Uc" role="gfFT$">
-          <node concept="2IllgU" id="2CEQDIDZ0Ul" role="1oi0x0">
-            <node concept="29HgVG" id="2CEQDIDZ0Us" role="lGtFl">
-              <node concept="3NFfHV" id="2CEQDIDZ0Ut" role="3NFExx">
-                <node concept="3clFbS" id="2CEQDIDZ0Uu" role="2VODD2">
-                  <node concept="3clFbF" id="2CEQDIDZ0U$" role="3cqZAp">
-                    <node concept="2OqwBi" id="2CEQDIDZ0Uv" role="3clFbG">
-                      <node concept="3TrEf2" id="2CEQDIDZ0Uy" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                      </node>
-                      <node concept="30H73N" id="2CEQDIDZ0Uz" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1hX44vMYCXM" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1hX44vMEjQg" resolve="GetterBlock" />
       <node concept="14YyZ8" id="7IysFeB8aNz" role="1lVwrX">
@@ -8399,127 +8386,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7IysFeBlmjL" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7IysFeA9CgT" resolve="AltBlock" />
-      <node concept="14YyZ8" id="7IysFeBlmjM" role="1lVwrX">
-        <node concept="14ZrTv" id="7IysFeBlmjN" role="14ZwWg">
-          <node concept="30G5F_" id="7IysFeBlmjO" role="150hEN">
-            <node concept="3clFbS" id="7IysFeBlmjP" role="2VODD2">
-              <node concept="3clFbF" id="7IysFeBlmjQ" role="3cqZAp">
-                <node concept="2OqwBi" id="7IysFeBlmjR" role="3clFbG">
-                  <node concept="2OqwBi" id="7IysFeBlmjS" role="2Oq$k0">
-                    <node concept="30H73N" id="7IysFeBlmjT" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="7IysFeBlmjU" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeBlmjV" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7IysFeBlmjW" role="150oIE">
-            <node concept="3clFb_" id="7IysFeBlmjX" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="7IysFeBlmjY" role="1B3o_S" />
-              <node concept="3uibUv" id="7IysFeBlmjZ" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="7IysFeBlmk0" role="3clF47">
-                <node concept="3clFbF" id="7IysFeBlmk1" role="3cqZAp">
-                  <node concept="10Nm6u" id="7IysFeBlmk2" role="3clFbG">
-                    <node concept="raruj" id="7IysFeBlmk3" role="lGtFl" />
-                    <node concept="29HgVG" id="7IysFeBlmk4" role="lGtFl">
-                      <node concept="3NFfHV" id="7IysFeBlmk5" role="3NFExx">
-                        <node concept="3clFbS" id="7IysFeBlmk6" role="2VODD2">
-                          <node concept="3clFbF" id="7IysFeBlmk7" role="3cqZAp">
-                            <node concept="2OqwBi" id="7IysFeBlmk8" role="3clFbG">
-                              <node concept="1PxgMI" id="7IysFeBlmk9" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                                <node concept="2OqwBi" id="7IysFeBlmka" role="1m5AlR">
-                                  <node concept="2OqwBi" id="7IysFeBlmkb" role="2Oq$k0">
-                                    <node concept="30H73N" id="7IysFeBlmkc" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="7IysFeBlmkd" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="2qgKlT" id="7IysFeBlmke" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7IysFeBlmkf" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="7IysFeBlmkg" role="14YRTM">
-          <node concept="2OqwBi" id="7IysFeBlmkh" role="gfFT$">
-            <node concept="2ShNRf" id="7IysFeBlmki" role="2Oq$k0">
-              <node concept="YeOm9" id="7IysFeBlmkj" role="2ShVmc">
-                <node concept="1Y3b0j" id="7IysFeBlmkk" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <node concept="3Tm1VV" id="7IysFeBlmkl" role="1B3o_S" />
-                  <node concept="3clFb_" id="7IysFeBlmkm" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="get" />
-                    <node concept="3uibUv" id="7IysFeBqtzv" role="3clF45">
-                      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                    </node>
-                    <node concept="3Tm1VV" id="7IysFeBlmko" role="1B3o_S" />
-                    <node concept="3clFbS" id="7IysFeBlmkp" role="3clF47">
-                      <node concept="3clFbF" id="7IysFeBlmkq" role="3cqZAp">
-                        <node concept="10Nm6u" id="7IysFeBlmkr" role="3clFbG" />
-                        <node concept="2b32R4" id="7IysFeBlmks" role="lGtFl">
-                          <node concept="3JmXsc" id="7IysFeBlmkt" role="2P8S$">
-                            <node concept="3clFbS" id="7IysFeBlmku" role="2VODD2">
-                              <node concept="3clFbF" id="7IysFeBlmkv" role="3cqZAp">
-                                <node concept="2OqwBi" id="7IysFeBlmkw" role="3clFbG">
-                                  <node concept="2OqwBi" id="7IysFeBlmkx" role="2Oq$k0">
-                                    <node concept="30H73N" id="7IysFeBlmky" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="7IysFeBlmkz" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="7IysFeBlmk$" role="2OqNvi">
-                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="7IysFeBlmk_" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="7IysFeBqtgV" role="2Ghqu4">
-                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="7IysFeBlmkB" role="2OqNvi">
-              <ref role="37wK5l" node="7IysFeBlmkm" resolve="get" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="7IysFeAYduU" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
       <node concept="14YyZ8" id="7IysFeB5sdu" role="1lVwrX">
@@ -8750,59 +8616,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7IysFeAjc3a" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-      <node concept="1Koe21" id="7IysFeAjeag" role="1lVwrX">
-        <node concept="312cEu" id="7IysFeAjeam" role="1Koe22">
-          <property role="TrG5h" value="Context" />
-          <node concept="312cEg" id="4JJCDImIeQR" role="jymVt">
-            <property role="TrG5h" value="typeConcept" />
-            <node concept="3Tm6S6" id="4JJCDImIeQS" role="1B3o_S" />
-            <node concept="3bZ5Sz" id="4JJCDImIeRF" role="1tU5fm" />
-          </node>
-          <node concept="3clFb_" id="7IysFeAjebE" role="jymVt">
-            <property role="TrG5h" value="context" />
-            <node concept="3bZ5Sz" id="7IysFeAjecU" role="3clF45" />
-            <node concept="3Tm1VV" id="7IysFeAjebH" role="1B3o_S" />
-            <node concept="3clFbS" id="7IysFeAjebI" role="3clF47">
-              <node concept="3clFbF" id="4JJCDImIeZa" role="3cqZAp">
-                <node concept="37vLTw" id="4JJCDImIeZ9" role="3clFbG">
-                  <ref role="3cqZAo" node="4JJCDImIeQR" resolve="typeConcept" />
-                  <node concept="raruj" id="4JJCDImIf0T" role="lGtFl" />
-                  <node concept="1ZhdrF" id="4JJCDImIf4y" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="4JJCDImIf4z" role="3$ytzL">
-                      <node concept="3clFbS" id="4JJCDImIf4$" role="2VODD2">
-                        <node concept="3clFbF" id="4JJCDImIgj3" role="3cqZAp">
-                          <node concept="2OqwBi" id="4JJCDImIgsK" role="3clFbG">
-                            <node concept="1iwH7S" id="4JJCDImIgj2" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4JJCDImIgza" role="2OqNvi">
-                              <ref role="1iwH77" node="4JJCDImI6Rx" resolve="typeConcept_field" />
-                              <node concept="2OqwBi" id="4JJCDImIgRe" role="1iwH7V">
-                                <node concept="30H73N" id="4JJCDImIgGP" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4JJCDImIhav" role="2OqNvi">
-                                  <node concept="1xMEDy" id="4JJCDImIhax" role="1xVPHs">
-                                    <node concept="chp4Y" id="4JJCDImIhdy" role="ri$Ld">
-                                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="7IysFeAjmii" role="1B3o_S" />
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="7IysFeAjkad" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
       <node concept="1Koe21" id="7IysFeAjmhC" role="1lVwrX">
@@ -8958,6 +8771,59 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="4MEOIDFGMIC" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+      <node concept="1Koe21" id="4MEOIDFGMID" role="1lVwrX">
+        <node concept="312cEu" id="4MEOIDFGMIE" role="1Koe22">
+          <property role="TrG5h" value="Context" />
+          <node concept="312cEg" id="4MEOIDFGMIF" role="jymVt">
+            <property role="TrG5h" value="field" />
+            <node concept="3Tm6S6" id="4MEOIDFGMIG" role="1B3o_S" />
+            <node concept="3uibUv" id="4MEOIDFGMIH" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="3clFb_" id="4MEOIDFGMII" role="jymVt">
+            <property role="TrG5h" value="context" />
+            <node concept="3uibUv" id="4MEOIDFGMIJ" role="3clF45">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="3Tm6S6" id="4MEOIDFGMIK" role="1B3o_S" />
+            <node concept="3clFbS" id="4MEOIDFGMIL" role="3clF47">
+              <node concept="3clFbF" id="4MEOIDFGMIM" role="3cqZAp">
+                <node concept="37vLTw" id="4MEOIDFGMIN" role="3clFbG">
+                  <ref role="3cqZAo" node="4MEOIDFGMIF" resolve="field" />
+                  <node concept="raruj" id="4MEOIDFGMIO" role="lGtFl" />
+                  <node concept="1ZhdrF" id="4MEOIDFGMIP" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <node concept="3$xsQk" id="4MEOIDFGMIQ" role="3$ytzL">
+                      <node concept="3clFbS" id="4MEOIDFGMIR" role="2VODD2">
+                        <node concept="3clFbF" id="4MEOIDFGMIS" role="3cqZAp">
+                          <node concept="2OqwBi" id="4MEOIDFGMIT" role="3clFbG">
+                            <node concept="1iwH7S" id="4MEOIDFGMIU" role="2Oq$k0" />
+                            <node concept="1iwH70" id="4MEOIDFGMIV" role="2OqNvi">
+                              <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+                              <node concept="2OqwBi" id="4MEOIDFGMIW" role="1iwH7V">
+                                <node concept="30H73N" id="4MEOIDFGMIX" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDFGMIY" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="4MEOIDFGMIZ" role="1B3o_S" />
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="10IUAVUq92w" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
       <node concept="1Koe21" id="10IUAVUqcHp" role="1lVwrX">
@@ -9658,46 +9524,46 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="1L74NXEuk5D" role="3acgRq">
+    <node concept="3aamgX" id="4MEOIDG9g91" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
-      <node concept="14YyZ8" id="1L74NXFeL5t" role="1lVwrX">
-        <node concept="14ZrTv" id="1L74NXFeL5x" role="14ZwWg">
-          <node concept="30G5F_" id="1L74NXFeL5y" role="150hEN">
-            <node concept="3clFbS" id="1L74NXFeL5z" role="2VODD2">
-              <node concept="3clFbF" id="1L74NXFeMyK" role="3cqZAp">
-                <node concept="1Wc70l" id="1L74NXGlx2f" role="3clFbG">
-                  <node concept="2OqwBi" id="1L74NXGlztn" role="3uHU7w">
-                    <node concept="2OqwBi" id="1L74NXGlxqI" role="2Oq$k0">
-                      <node concept="30H73N" id="1L74NXGlxeA" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="1L74NXGlxQV" role="2OqNvi">
+      <node concept="14YyZ8" id="4MEOIDG9g92" role="1lVwrX">
+        <node concept="14ZrTv" id="4MEOIDG9g93" role="14ZwWg">
+          <node concept="30G5F_" id="4MEOIDG9g94" role="150hEN">
+            <node concept="3clFbS" id="4MEOIDG9g95" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDG9g96" role="3cqZAp">
+                <node concept="1Wc70l" id="4MEOIDG9g97" role="3clFbG">
+                  <node concept="2OqwBi" id="4MEOIDG9g98" role="3uHU7w">
+                    <node concept="2OqwBi" id="4MEOIDG9g99" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDG9g9a" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4MEOIDG9g9b" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                       </node>
                     </node>
-                    <node concept="1v1jN8" id="1L74NXGl_SF" role="2OqNvi" />
+                    <node concept="1v1jN8" id="4MEOIDG9g9c" role="2OqNvi" />
                   </node>
-                  <node concept="1Wc70l" id="60NbDCXKdtG" role="3uHU7B">
-                    <node concept="2OqwBi" id="1L74NXFePJ2" role="3uHU7w">
-                      <node concept="2OqwBi" id="1L74NXFeNuk" role="2Oq$k0">
-                        <node concept="2OqwBi" id="1L74NXFeMIz" role="2Oq$k0">
-                          <node concept="30H73N" id="1L74NXFeMyJ" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="1L74NXFeN5Z" role="2OqNvi">
+                  <node concept="1Wc70l" id="4MEOIDG9g9d" role="3uHU7B">
+                    <node concept="2OqwBi" id="4MEOIDG9g9e" role="3uHU7w">
+                      <node concept="2OqwBi" id="4MEOIDG9g9f" role="2Oq$k0">
+                        <node concept="2OqwBi" id="4MEOIDG9g9g" role="2Oq$k0">
+                          <node concept="30H73N" id="4MEOIDG9g9h" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4MEOIDG9g9i" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
                           </node>
                         </node>
-                        <node concept="3Tsc0h" id="1L74NXFeOam" role="2OqNvi">
+                        <node concept="3Tsc0h" id="4MEOIDG9g9j" role="2OqNvi">
                           <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
                         </node>
                       </node>
-                      <node concept="1v1jN8" id="1L74NXFeS9y" role="2OqNvi" />
+                      <node concept="1v1jN8" id="4MEOIDG9g9k" role="2OqNvi" />
                     </node>
-                    <node concept="3clFbC" id="60NbDCXKdyL" role="3uHU7B">
-                      <node concept="28GBK8" id="60NbDCXKdyM" role="3uHU7w">
+                    <node concept="3clFbC" id="4MEOIDG9g9l" role="3uHU7B">
+                      <node concept="28GBK8" id="4MEOIDG9g9m" role="3uHU7w">
                         <ref role="28GBKb" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
                         <ref role="28H3Ia" to="5j4j:4sSe4$p4oOP" resolve="value" />
                       </node>
-                      <node concept="2OqwBi" id="60NbDCXKdyN" role="3uHU7B">
-                        <node concept="30H73N" id="60NbDCXKdyO" role="2Oq$k0" />
-                        <node concept="25OxAV" id="60NbDCXKdyP" role="2OqNvi" />
+                      <node concept="2OqwBi" id="4MEOIDG9g9n" role="3uHU7B">
+                        <node concept="30H73N" id="4MEOIDG9g9o" role="2Oq$k0" />
+                        <node concept="25OxAV" id="4MEOIDG9g9p" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -9705,176 +9571,161 @@
               </node>
             </node>
           </node>
-          <node concept="1Koe21" id="1L74NXFeTHI" role="150oIE">
-            <node concept="3clFb_" id="1L74NXFeTHJ" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="1L74NXFeTHK" role="1B3o_S" />
-              <node concept="3uibUv" id="1L74NXFeTHL" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="1L74NXFeTHM" role="3clF47">
-                <node concept="3clFbF" id="1L74NXFeTHN" role="3cqZAp">
-                  <node concept="2OqwBi" id="1L74NXFeTHO" role="3clFbG">
-                    <node concept="37vLTw" id="1L74NXFeTHP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1L74NXFeTIm" resolve="session" />
-                      <node concept="1sPUBX" id="1L74NXFeTHQ" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                        <node concept="3NFfHV" id="1L74NXFeTHR" role="1sPUBK">
-                          <node concept="3clFbS" id="1L74NXFeTHS" role="2VODD2">
-                            <node concept="3clFbF" id="1L74NXFeTHT" role="3cqZAp">
-                              <node concept="2OqwBi" id="1L74NXFeTHU" role="3clFbG">
-                                <node concept="30H73N" id="1L74NXFeTHV" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="1L74NXFeTHW" role="2OqNvi">
-                                  <node concept="3gmYPX" id="1L74NXFeTHX" role="1xVPHs">
-                                    <node concept="3gn64h" id="1L74NXFeTHY" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+          <node concept="1Koe21" id="4MEOIDG9g9q" role="150oIE">
+            <node concept="3clFbS" id="4MEOIDG9mN7" role="1Koe22">
+              <node concept="3clFbF" id="4MEOIDG9s7C" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDG9s_B" role="3clFbG">
+                  <node concept="1eOMI4" id="4MEOIDGiDCz" role="2Oq$k0">
+                    <node concept="1nCR9W" id="4MEOIDGiDC$" role="1eOMHV">
+                      <property role="1nD$Q0" value="TermDeclaration" />
+                      <node concept="3clFbT" id="4MEOIDGiDC_" role="2U2pNA">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="10Nm6u" id="4MEOIDGkbk6" role="2U2pNA">
+                        <node concept="1WS0z7" id="4MEOIDGkbk7" role="lGtFl">
+                          <node concept="3JmXsc" id="4MEOIDGkbk8" role="3Jn$fo">
+                            <node concept="3clFbS" id="4MEOIDGkbk9" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDGkbka" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDGmFTi" role="3clFbG">
+                                  <node concept="2OqwBi" id="4MEOIDGmF2j" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4MEOIDGkbkc" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDGkbkd" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGmEBy" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                      </node>
                                     </node>
-                                    <node concept="3gn64h" id="1L74NXFeTHZ" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                    <node concept="3TrEf2" id="4MEOIDGmFlU" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
                                     </node>
                                   </node>
+                                  <node concept="3Tsc0h" id="4MEOIDGmG62" role="2OqNvi">
+                                    <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="liA8E" id="1L74NXFeTI0" role="2OqNvi">
-                      <ref role="37wK5l" to="nz6g:1L74NXF7OB0" resolve="typePattern" />
-                      <node concept="35c_gC" id="1L74NXFeTI1" role="37wK5m">
-                        <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        <node concept="1ZhdrF" id="1L74NXFeTI2" role="lGtFl">
-                          <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                          <property role="2qtEX8" value="conceptDeclaration" />
-                          <node concept="3$xsQk" id="1L74NXFeTI3" role="3$ytzL">
-                            <node concept="3clFbS" id="1L74NXFeTI4" role="2VODD2">
-                              <node concept="3clFbF" id="1L74NXFeTI5" role="3cqZAp">
-                                <node concept="2OqwBi" id="1L74NXFeTI6" role="3clFbG">
-                                  <node concept="2OqwBi" id="1L74NXFeTI7" role="2Oq$k0">
-                                    <node concept="30H73N" id="1L74NXFeTI8" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="1L74NXFeTI9" role="2OqNvi">
+                      <node concept="3uibUv" id="4MEOIDGiDCA" role="2lIhxL">
+                        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                      </node>
+                      <node concept="17Uvod" id="4MEOIDGiDCB" role="lGtFl">
+                        <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                        <property role="2qtEX9" value="fqClassName" />
+                        <node concept="3zFVjK" id="4MEOIDGiDCC" role="3zH0cK">
+                          <node concept="3clFbS" id="4MEOIDGiDCD" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDGiDCE" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDGiDCF" role="3clFbG">
+                                <node concept="2OqwBi" id="4MEOIDGiDCG" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="4MEOIDGiDCH" role="2Oq$k0">
+                                    <node concept="30H73N" id="4MEOIDGiDCI" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="4MEOIDGiDCJ" role="2OqNvi">
                                       <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="1L74NXFeTIa" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+                                  <node concept="3TrEf2" id="4MEOIDGiDCK" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
                                   </node>
                                 </node>
+                                <node concept="2qgKlT" id="4MEOIDGiDCL" role="2OqNvi">
+                                  <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="raruj" id="1L74NXFeTIl" role="lGtFl" />
                   </node>
-                </node>
-              </node>
-              <node concept="37vLTG" id="1L74NXFeTIm" role="3clF46">
-                <property role="TrG5h" value="session" />
-                <node concept="3uibUv" id="1L74NXFeTIn" role="1tU5fm">
-                  <ref role="3uigEE" to="nz6g:18kNIl1vDPZ" resolve="ApplicationSession" />
+                  <node concept="liA8E" id="4MEOIDG9sQ9" role="2OqNvi">
+                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                  </node>
+                  <node concept="raruj" id="4MEOIDG9sYM" role="lGtFl" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="14ZrTv" id="4KRwoelE9qP" role="14ZwWg">
-          <node concept="30G5F_" id="4KRwoelE9qQ" role="150hEN">
-            <node concept="3clFbS" id="4KRwoelE9qR" role="2VODD2">
-              <node concept="3clFbF" id="4KRwoelE9qS" role="3cqZAp">
-                <node concept="2OqwBi" id="4KRwoelE9qT" role="3clFbG">
-                  <node concept="2OqwBi" id="4KRwoelE9qU" role="2Oq$k0">
-                    <node concept="30H73N" id="4KRwoelE9qV" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="4KRwoelE9qW" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+        <node concept="14ZrTv" id="4MEOIDGa7e3" role="14ZwWg">
+          <node concept="30G5F_" id="4MEOIDGa7e4" role="150hEN">
+            <node concept="3clFbS" id="4MEOIDGa7e5" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDGa7e6" role="3cqZAp">
+                <node concept="1Wc70l" id="4MEOIDGa7e7" role="3clFbG">
+                  <node concept="2OqwBi" id="4MEOIDGa7e8" role="3uHU7w">
+                    <node concept="2OqwBi" id="4MEOIDGa7e9" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDGa7ea" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4MEOIDGa7eb" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="4MEOIDGa9Xc" role="2OqNvi" />
+                  </node>
+                  <node concept="1Wc70l" id="4MEOIDGa7ed" role="3uHU7B">
+                    <node concept="2OqwBi" id="4MEOIDGa7ee" role="3uHU7w">
+                      <node concept="2OqwBi" id="4MEOIDGa7ef" role="2Oq$k0">
+                        <node concept="2OqwBi" id="4MEOIDGa7eg" role="2Oq$k0">
+                          <node concept="30H73N" id="4MEOIDGa7eh" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4MEOIDGa7ei" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                          </node>
+                        </node>
+                        <node concept="3Tsc0h" id="4MEOIDGa7ej" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                        </node>
+                      </node>
+                      <node concept="1v1jN8" id="4MEOIDGa7ek" role="2OqNvi" />
+                    </node>
+                    <node concept="3clFbC" id="4MEOIDGa7el" role="3uHU7B">
+                      <node concept="28GBK8" id="4MEOIDGa7em" role="3uHU7w">
+                        <ref role="28GBKb" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                        <ref role="28H3Ia" to="5j4j:4sSe4$p4oOP" resolve="value" />
+                      </node>
+                      <node concept="2OqwBi" id="4MEOIDGa7en" role="3uHU7B">
+                        <node concept="30H73N" id="4MEOIDGa7eo" role="2Oq$k0" />
+                        <node concept="25OxAV" id="4MEOIDGa7ep" role="2OqNvi" />
+                      </node>
                     </node>
                   </node>
-                  <node concept="3GX2aA" id="4KRwoelE9qX" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1Koe21" id="4KRwoelE9qY" role="150oIE">
-            <node concept="3clFb_" id="4KRwoelE9qZ" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="4KRwoelE9r0" role="1B3o_S" />
-              <node concept="3uibUv" id="4KRwoelE9r1" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="4KRwoelE9r2" role="3clF47">
-                <node concept="3clFbF" id="4KRwoelE9r3" role="3cqZAp">
-                  <node concept="2OqwBi" id="4KRwoelE9r4" role="3clFbG">
-                    <node concept="37vLTw" id="4KRwoelE9r5" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4KRwoelE9s$" resolve="session" />
-                      <node concept="1sPUBX" id="4KRwoelE9r6" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                        <node concept="3NFfHV" id="4KRwoelE9r7" role="1sPUBK">
-                          <node concept="3clFbS" id="4KRwoelE9r8" role="2VODD2">
-                            <node concept="3clFbF" id="4KRwoelE9r9" role="3cqZAp">
-                              <node concept="2OqwBi" id="4KRwoelE9ra" role="3clFbG">
-                                <node concept="30H73N" id="4KRwoelE9rb" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4KRwoelE9rc" role="2OqNvi">
-                                  <node concept="3gmYPX" id="4KRwoelE9rd" role="1xVPHs">
-                                    <node concept="3gn64h" id="4KRwoelE9re" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                    </node>
-                                    <node concept="3gn64h" id="4KRwoelE9rf" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
+          <node concept="1Koe21" id="4MEOIDGa7eq" role="150oIE">
+            <node concept="3clFbS" id="4MEOIDGa7er" role="1Koe22">
+              <node concept="3clFbF" id="4MEOIDGa7es" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDGaecJ" role="3clFbG">
+                  <node concept="liA8E" id="4MEOIDGafhq" role="2OqNvi">
+                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                  </node>
+                  <node concept="1eOMI4" id="4MEOIDGiDYF" role="2Oq$k0">
+                    <node concept="2ShNRf" id="4MEOIDGiDYG" role="1eOMHV">
+                      <node concept="1L3L4E" id="4MEOIDGiDYH" role="2ShVmc">
+                        <node concept="1L3L4F" id="4MEOIDGiDYI" role="1L3L0X">
+                          <property role="2bfB8j" value="true" />
+                          <property role="1L3L77" value="TermDeclaration" />
+                          <node concept="3clFbT" id="4MEOIDGiDYJ" role="1L3L4I">
+                            <property role="3clFbU" value="true" />
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="4KRwoelE9rg" role="2OqNvi">
-                      <ref role="37wK5l" to="nz6g:1L74NXGis3$" resolve="typeTermOverriding" />
-                      <node concept="35c_gC" id="4KRwoelE9rh" role="37wK5m">
-                        <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        <node concept="1ZhdrF" id="4KRwoelE9ri" role="lGtFl">
-                          <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                          <property role="2qtEX8" value="conceptDeclaration" />
-                          <node concept="3$xsQk" id="4KRwoelE9rj" role="3$ytzL">
-                            <node concept="3clFbS" id="4KRwoelE9rk" role="2VODD2">
-                              <node concept="3clFbF" id="4KRwoelE9rl" role="3cqZAp">
-                                <node concept="2OqwBi" id="4KRwoelE9rm" role="3clFbG">
-                                  <node concept="2OqwBi" id="4KRwoelE9rn" role="2Oq$k0">
-                                    <node concept="30H73N" id="4KRwoelE9ro" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="4KRwoelE9rp" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="4KRwoelE9rq" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10QFUN" id="4KRwoelLCkN" role="37wK5m">
-                        <node concept="3uibUv" id="4KRwoelLDaM" role="10QFUM">
-                          <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
-                          <node concept="1ZhdrF" id="4KRwoelLDZs" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-                            <property role="2qtEX8" value="classifier" />
-                            <node concept="3$xsQk" id="4KRwoelLDZt" role="3$ytzL">
-                              <node concept="3clFbS" id="4KRwoelLDZu" role="2VODD2">
-                                <node concept="3clFbF" id="4KRwoelLEJq" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4KRwoelLEJr" role="3clFbG">
-                                    <node concept="1iwH7S" id="4KRwoelLEJs" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="4KRwoelLEJt" role="2OqNvi">
-                                      <ref role="1iwH77" node="4KRwoelEhiP" resolve="typeDecl_template_config" />
-                                      <node concept="2OqwBi" id="4KRwoelLEJu" role="1iwH7V">
-                                        <node concept="30H73N" id="4KRwoelLEJv" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="4KRwoelLEJw" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                          <node concept="10Nm6u" id="4MEOIDGmMfO" role="1L3L4I">
+                            <node concept="1WS0z7" id="4MEOIDGmMfP" role="lGtFl">
+                              <node concept="3JmXsc" id="4MEOIDGmMfQ" role="3Jn$fo">
+                                <node concept="3clFbS" id="4MEOIDGmMfR" role="2VODD2">
+                                  <node concept="3clFbF" id="4MEOIDGmMfS" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4MEOIDGmMfT" role="3clFbG">
+                                      <node concept="2OqwBi" id="4MEOIDGmMfU" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="4MEOIDGmMfV" role="2Oq$k0">
+                                          <node concept="30H73N" id="4MEOIDGmMfW" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="4MEOIDGmMfX" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                          </node>
                                         </node>
+                                        <node concept="3TrEf2" id="4MEOIDGmMfY" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                        </node>
+                                      </node>
+                                      <node concept="3Tsc0h" id="4MEOIDGmMfZ" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
                                       </node>
                                     </node>
                                   </node>
@@ -9882,212 +9733,99 @@
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="2ShNRf" id="4KRwoelLCk5" role="10QFUP">
-                          <node concept="YeOm9" id="4KRwoelLCk6" role="2ShVmc">
-                            <node concept="1Y3b0j" id="4KRwoelLCk7" role="YeSDq">
-                              <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
-                              <ref role="37wK5l" node="1GNw78$kUFK" resolve="_TypeTable._Template.TypeConfig" />
-                              <node concept="35c_gC" id="4KRwoelNOpc" role="37wK5m">
-                                <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                <node concept="1ZhdrF" id="4KRwoelNOpd" role="lGtFl">
-                                  <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                                  <property role="2qtEX8" value="conceptDeclaration" />
-                                  <node concept="3$xsQk" id="4KRwoelNOpe" role="3$ytzL">
-                                    <node concept="3clFbS" id="4KRwoelNOpf" role="2VODD2">
-                                      <node concept="3clFbF" id="4KRwoelNOpg" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4KRwoelNOph" role="3clFbG">
-                                          <node concept="2OqwBi" id="4KRwoelNOpi" role="2Oq$k0">
-                                            <node concept="30H73N" id="4KRwoelNOpj" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4KRwoelNOpk" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
-                                            </node>
-                                          </node>
-                                          <node concept="3TrEf2" id="4KRwoelNOpl" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                          </node>
-                                        </node>
+                          <node concept="3clFb_" id="4MEOIDGiDYK" role="3MN40a">
+                            <property role="TrG5h" value="feature" />
+                            <node concept="3uibUv" id="4MEOIDGiDYL" role="3clF45">
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                            </node>
+                            <node concept="3Tmbuc" id="4MEOIDGiDYM" role="1B3o_S" />
+                            <node concept="3clFbS" id="4MEOIDGiDYN" role="3clF47">
+                              <node concept="3clFbF" id="4MEOIDGiDYO" role="3cqZAp">
+                                <node concept="10Nm6u" id="4MEOIDGiDYP" role="3clFbG">
+                                  <node concept="1sPUBX" id="4MEOIDGiDYQ" role="lGtFl">
+                                    <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature" />
+                                    <node concept="2OqwBi" id="4MEOIDGiDYR" role="v9R3O">
+                                      <node concept="30H73N" id="4MEOIDGiDYS" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGiDYT" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXFMBVS" resolve="term" />
                                       </node>
                                     </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="10Nm6u" id="4KRwoelE9sp" role="37wK5m">
-                                <node concept="2b32R4" id="4KRwoelE9sq" role="lGtFl">
-                                  <node concept="3JmXsc" id="4KRwoelE9sr" role="2P8S$">
-                                    <node concept="3clFbS" id="4KRwoelE9ss" role="2VODD2">
-                                      <node concept="3clFbF" id="4KRwoelE9st" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4KRwoelE9su" role="3clFbG">
-                                          <node concept="2OqwBi" id="4KRwoelE9sv" role="2Oq$k0">
-                                            <node concept="30H73N" id="4KRwoelE9sw" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4KRwoelE9sx" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
-                                            </node>
-                                          </node>
-                                          <node concept="2qgKlT" id="4KRwoelE9sy" role="2OqNvi">
-                                            <ref role="37wK5l" to="x5bw:1L74NXEsP5q" resolve="getArguments" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3Tm1VV" id="4KRwoelLCk8" role="1B3o_S" />
-                              <node concept="3KIgzJ" id="60NbDCXQcE6" role="jymVt">
-                                <node concept="3clFbS" id="60NbDCXQcE8" role="3KIlGz">
-                                  <node concept="3clFbF" id="60NbDCXQd_O" role="3cqZAp">
-                                    <node concept="1rXfSq" id="60NbDCXQd_N" role="3clFbG">
-                                      <ref role="37wK5l" node="60NbDCXHBm_" resolve="setPattern" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="1W57fq" id="60NbDCXQdGj" role="lGtFl">
-                                  <node concept="3IZrLx" id="60NbDCXQdGl" role="3IZSJc">
-                                    <node concept="3clFbS" id="60NbDCXQdGn" role="2VODD2">
-                                      <node concept="3clFbF" id="60NbDCXQdQk" role="3cqZAp">
-                                        <node concept="1Wc70l" id="60NbDCXQdQm" role="3clFbG">
-                                          <node concept="2OqwBi" id="60NbDCXQdQn" role="3uHU7w">
-                                            <node concept="2OqwBi" id="60NbDCXQdQo" role="2Oq$k0">
-                                              <node concept="2OqwBi" id="60NbDCXQdQp" role="2Oq$k0">
-                                                <node concept="30H73N" id="60NbDCXQdQq" role="2Oq$k0" />
-                                                <node concept="3TrEf2" id="60NbDCXQdQr" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
-                                                </node>
-                                              </node>
-                                              <node concept="3Tsc0h" id="60NbDCXQdQs" role="2OqNvi">
-                                                <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
-                                              </node>
-                                            </node>
-                                            <node concept="1v1jN8" id="60NbDCXQdQt" role="2OqNvi" />
-                                          </node>
-                                          <node concept="3clFbC" id="60NbDCXQdQu" role="3uHU7B">
-                                            <node concept="28GBK8" id="60NbDCXQdQv" role="3uHU7w">
-                                              <ref role="28GBKb" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
-                                              <ref role="28H3Ia" to="5j4j:4sSe4$p4oOP" resolve="value" />
-                                            </node>
-                                            <node concept="2OqwBi" id="60NbDCXQdQw" role="3uHU7B">
-                                              <node concept="30H73N" id="60NbDCXQdQx" role="2Oq$k0" />
-                                              <node concept="25OxAV" id="60NbDCXQdQy" role="2OqNvi" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2tJIrI" id="60NbDCXQaSn" role="jymVt" />
-                              <node concept="3clFb_" id="4KRwoelLCk9" role="jymVt">
-                                <property role="TrG5h" value="feature" />
-                                <node concept="3uibUv" id="4KRwoelLCka" role="3clF45">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                                </node>
-                                <node concept="3Tmbuc" id="4KRwoelLCkb" role="1B3o_S" />
-                                <node concept="3clFbS" id="4KRwoelLCkc" role="3clF47">
-                                  <node concept="3clFbF" id="4KRwoelLCkd" role="3cqZAp">
-                                    <node concept="10Nm6u" id="4KRwoelLCke" role="3clFbG">
-                                      <node concept="1sPUBX" id="4KRwoelLCkf" role="lGtFl">
-                                        <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature" />
-                                        <node concept="2OqwBi" id="4KRwoelLCkg" role="v9R3O">
-                                          <node concept="30H73N" id="4KRwoelLCkh" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="4KRwoelLCki" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:1L74NXFMBVS" resolve="term" />
-                                          </node>
-                                        </node>
-                                        <node concept="3NFfHV" id="4KRwoelLCkj" role="1sPUBK">
-                                          <node concept="3clFbS" id="4KRwoelLCkk" role="2VODD2">
-                                            <node concept="3clFbF" id="4KRwoelLCkl" role="3cqZAp">
-                                              <node concept="2OqwBi" id="4KRwoelLCkm" role="3clFbG">
-                                                <node concept="30H73N" id="4KRwoelLCkn" role="2Oq$k0" />
-                                                <node concept="3TrEf2" id="4KRwoelLCko" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="17Uvod" id="4KRwoelLCkp" role="lGtFl">
-                                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                                  <property role="2qtEX9" value="name" />
-                                  <node concept="3zFVjK" id="4KRwoelLCkq" role="3zH0cK">
-                                    <node concept="3clFbS" id="4KRwoelLCkr" role="2VODD2">
-                                      <node concept="3clFbF" id="4KRwoelLCks" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4KRwoelLCkt" role="3clFbG">
-                                          <node concept="2OqwBi" id="4KRwoelLCku" role="2Oq$k0">
-                                            <node concept="30H73N" id="4KRwoelLCkv" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4KRwoelLCkw" role="2OqNvi">
+                                    <node concept="3NFfHV" id="4MEOIDGiDYU" role="1sPUBK">
+                                      <node concept="3clFbS" id="4MEOIDGiDYV" role="2VODD2">
+                                        <node concept="3clFbF" id="4MEOIDGiDYW" role="3cqZAp">
+                                          <node concept="2OqwBi" id="4MEOIDGiDYX" role="3clFbG">
+                                            <node concept="30H73N" id="4MEOIDGiDYY" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="4MEOIDGiDYZ" role="2OqNvi">
                                               <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                             </node>
                                           </node>
-                                          <node concept="3TrcHB" id="4KRwoelLCkx" role="2OqNvi">
-                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="1WS0z7" id="4KRwoelLCky" role="lGtFl">
-                                  <node concept="3JmXsc" id="4KRwoelLCkz" role="3Jn$fo">
-                                    <node concept="3clFbS" id="4KRwoelLCk$" role="2VODD2">
-                                      <node concept="3clFbF" id="4KRwoelLCk_" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4KRwoelLCkA" role="3clFbG">
-                                          <node concept="30H73N" id="4KRwoelLCkB" role="2Oq$k0" />
-                                          <node concept="3Tsc0h" id="4KRwoelLCkC" role="2OqNvi">
-                                            <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
-                                          </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1ZhdrF" id="4KRwoelLCkD" role="lGtFl">
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1170345865475/1170346070688" />
-                                <property role="2qtEX8" value="classifier" />
-                                <node concept="3$xsQk" id="4KRwoelLCkE" role="3$ytzL">
-                                  <node concept="3clFbS" id="4KRwoelLCkF" role="2VODD2">
-                                    <node concept="3clFbF" id="4KRwoelLCkG" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4KRwoelLCkH" role="3clFbG">
-                                        <node concept="1iwH7S" id="4KRwoelLCkI" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="4KRwoelLCkJ" role="2OqNvi">
-                                          <ref role="1iwH77" node="4KRwoelEhiP" resolve="typeDecl_template_config" />
-                                          <node concept="2OqwBi" id="4KRwoelLCkK" role="1iwH7V">
-                                            <node concept="30H73N" id="4KRwoelLCkL" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4KRwoelLCkM" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
-                                            </node>
-                                          </node>
+                            </node>
+                            <node concept="17Uvod" id="4MEOIDGiDZ0" role="lGtFl">
+                              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                              <property role="2qtEX9" value="name" />
+                              <node concept="3zFVjK" id="4MEOIDGiDZ1" role="3zH0cK">
+                                <node concept="3clFbS" id="4MEOIDGiDZ2" role="2VODD2">
+                                  <node concept="3clFbF" id="4MEOIDGiDZ3" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4MEOIDGiDZ4" role="3clFbG">
+                                      <node concept="2OqwBi" id="4MEOIDGiDZ5" role="2Oq$k0">
+                                        <node concept="30H73N" id="4MEOIDGiDZ6" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4MEOIDGiDZ7" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                         </node>
                                       </node>
+                                      <node concept="3TrcHB" id="4MEOIDGiDZ8" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1ZhdrF" id="4nxCIBqmt1H" role="lGtFl">
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                <property role="2qtEX8" value="baseMethodDeclaration" />
-                                <node concept="3$xsQk" id="4nxCIBqmt1I" role="3$ytzL">
-                                  <node concept="3clFbS" id="4nxCIBqmt1J" role="2VODD2">
-                                    <node concept="3clFbF" id="4nxCIBqmw6R" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4nxCIBqmw6S" role="3clFbG">
-                                        <node concept="1iwH7S" id="4nxCIBqmw6T" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="4nxCIBqmw6U" role="2OqNvi">
-                                          <ref role="1iwH77" node="4KRwoem6p22" resolve="typeDecl_template_config_constr" />
-                                          <node concept="2OqwBi" id="4nxCIBqmw6V" role="1iwH7V">
-                                            <node concept="30H73N" id="4nxCIBqmw6W" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4nxCIBqmw6X" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
-                                            </node>
-                                          </node>
+                            </node>
+                            <node concept="1WS0z7" id="4MEOIDGiDZ9" role="lGtFl">
+                              <node concept="3JmXsc" id="4MEOIDGiDZa" role="3Jn$fo">
+                                <node concept="3clFbS" id="4MEOIDGiDZb" role="2VODD2">
+                                  <node concept="3clFbF" id="4MEOIDGiDZc" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4MEOIDGiDZd" role="3clFbG">
+                                      <node concept="30H73N" id="4MEOIDGiDZe" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="4MEOIDGiDZf" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3Tm1VV" id="4MEOIDGiDZg" role="1B3o_S" />
+                          <node concept="3uibUv" id="4MEOIDGiDZh" role="1L3L74">
+                            <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                          </node>
+                          <node concept="17Uvod" id="4MEOIDGiDZi" role="lGtFl">
+                            <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                            <property role="2qtEX9" value="fqClassName" />
+                            <node concept="3zFVjK" id="4MEOIDGiDZj" role="3zH0cK">
+                              <node concept="3clFbS" id="4MEOIDGiDZk" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGiDZl" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGiDZm" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDGiDZn" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4MEOIDGiDZo" role="2Oq$k0">
+                                        <node concept="30H73N" id="4MEOIDGiDZp" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4MEOIDGiDZq" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
                                         </node>
                                       </node>
+                                      <node concept="3TrEf2" id="4MEOIDGiDZr" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                      </node>
+                                    </node>
+                                    <node concept="2qgKlT" id="4MEOIDGiDZs" role="2OqNvi">
+                                      <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                                     </node>
                                   </node>
                                 </node>
@@ -10097,114 +9835,480 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="raruj" id="4KRwoelE9sz" role="lGtFl" />
                   </node>
-                </node>
-              </node>
-              <node concept="37vLTG" id="4KRwoelE9s$" role="3clF46">
-                <property role="TrG5h" value="session" />
-                <node concept="3uibUv" id="4KRwoelE9s_" role="1tU5fm">
-                  <ref role="3uigEE" to="nz6g:18kNIl1vDPZ" resolve="ApplicationSession" />
+                  <node concept="raruj" id="4MEOIDGafFN" role="lGtFl" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1Koe21" id="1L74NXEHSrZ" role="14YRTM">
-          <node concept="3clFb_" id="1L74NXEHSs5" role="1Koe22">
-            <property role="TrG5h" value="context" />
-            <node concept="3Tm6S6" id="1L74NXEHSsf" role="1B3o_S" />
-            <node concept="3uibUv" id="1L74NXEHSsz" role="3clF45">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-            <node concept="3clFbS" id="1L74NXEHSzL" role="3clF47">
-              <node concept="3clFbF" id="1L74NXEHS_x" role="3cqZAp">
-                <node concept="2OqwBi" id="1L74NXEHSEu" role="3clFbG">
-                  <node concept="37vLTw" id="1L74NXEHS_v" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1L74NXEHSzY" resolve="session" />
-                    <node concept="1sPUBX" id="1L74NXEHSQr" role="lGtFl">
-                      <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                      <node concept="3NFfHV" id="1L74NXEPciJ" role="1sPUBK">
-                        <node concept="3clFbS" id="1L74NXEPciK" role="2VODD2">
-                          <node concept="3clFbF" id="1L74NXEPheL" role="3cqZAp">
-                            <node concept="2OqwBi" id="1L74NXEPheM" role="3clFbG">
-                              <node concept="30H73N" id="1L74NXEPheN" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="1L74NXEPheO" role="2OqNvi">
-                                <node concept="3gmYPX" id="1L74NXEPheP" role="1xVPHs">
-                                  <node concept="3gn64h" id="1L74NXEPheQ" role="3gmYPZ">
-                                    <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                  </node>
-                                  <node concept="3gn64h" id="1L74NXEPheR" role="3gmYPZ">
-                                    <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
+        <node concept="14ZrTv" id="4MEOIDG9ga2" role="14ZwWg">
+          <node concept="30G5F_" id="4MEOIDG9ga3" role="150hEN">
+            <node concept="3clFbS" id="4MEOIDG9ga4" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDG9ga5" role="3cqZAp">
+                <node concept="1Wc70l" id="4MEOIDGq6vo" role="3clFbG">
+                  <node concept="2OqwBi" id="4MEOIDGq9Yd" role="3uHU7w">
+                    <node concept="2OqwBi" id="4MEOIDGq7G$" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4MEOIDGq6RD" role="2Oq$k0">
+                        <node concept="30H73N" id="4MEOIDGq6DI" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="4MEOIDGq7hU" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
                         </node>
                       </node>
+                      <node concept="3Tsc0h" id="4MEOIDGq85i" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                      </node>
                     </node>
+                    <node concept="3GX2aA" id="4MEOIDGqcoz" role="2OqNvi" />
                   </node>
-                  <node concept="liA8E" id="1L74NXEHSLA" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:1L74NXEx75v" resolve="typeTerm" />
-                    <node concept="35c_gC" id="1L74NXEHSRO" role="37wK5m">
-                      <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                      <node concept="1ZhdrF" id="1L74NXEHSUk" role="lGtFl">
-                        <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                        <property role="2qtEX8" value="conceptDeclaration" />
-                        <node concept="3$xsQk" id="1L74NXEHSUl" role="3$ytzL">
-                          <node concept="3clFbS" id="1L74NXEHSUm" role="2VODD2">
-                            <node concept="3clFbF" id="1L74NXEHUT7" role="3cqZAp">
-                              <node concept="2OqwBi" id="1L74NXEHVSq" role="3clFbG">
-                                <node concept="2OqwBi" id="1L74NXEHV3J" role="2Oq$k0">
-                                  <node concept="30H73N" id="1L74NXEHUT6" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="1L74NXEHVgX" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="1L74NXEHWcc" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="10Nm6u" id="1L74NXEHWB7" role="37wK5m">
-                      <node concept="2b32R4" id="1L74NXEKB75" role="lGtFl">
-                        <node concept="3JmXsc" id="1L74NXEKB77" role="2P8S$">
-                          <node concept="3clFbS" id="1L74NXEKB79" role="2VODD2">
-                            <node concept="3clFbF" id="1L74NXEKDgM" role="3cqZAp">
-                              <node concept="2OqwBi" id="1L74NXEKE77" role="3clFbG">
-                                <node concept="2OqwBi" id="1L74NXEKDr_" role="2Oq$k0">
-                                  <node concept="30H73N" id="1L74NXEKDgL" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="1L74NXEKDKP" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="1L74NXEKEoj" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:1L74NXEsP5q" resolve="getArguments" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
+                  <node concept="2OqwBi" id="4MEOIDG9ga6" role="3uHU7B">
+                    <node concept="2OqwBi" id="4MEOIDG9ga7" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDG9ga8" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4MEOIDG9ga9" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                       </node>
                     </node>
+                    <node concept="3GX2aA" id="4MEOIDG9gaa" role="2OqNvi" />
                   </node>
-                  <node concept="raruj" id="1L74NXEHSPa" role="lGtFl" />
                 </node>
               </node>
             </node>
-            <node concept="37vLTG" id="1L74NXEHSzY" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="1L74NXEHSzX" role="1tU5fm">
-                <ref role="3uigEE" to="nz6g:18kNIl1vDPZ" resolve="ApplicationSession" />
+          </node>
+          <node concept="1Koe21" id="4MEOIDG9gab" role="150oIE">
+            <node concept="3clFbF" id="4MEOIDGaGOd" role="1Koe22">
+              <node concept="2OqwBi" id="4MEOIDGaGOe" role="3clFbG">
+                <node concept="liA8E" id="4MEOIDGaGOf" role="2OqNvi">
+                  <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                </node>
+                <node concept="1eOMI4" id="4MEOIDGiEBp" role="2Oq$k0">
+                  <node concept="2ShNRf" id="4MEOIDGiEBq" role="1eOMHV">
+                    <node concept="1L3L4E" id="4MEOIDGiEBr" role="2ShVmc">
+                      <node concept="1L3L4F" id="4MEOIDGiEBs" role="1L3L0X">
+                        <property role="2bfB8j" value="true" />
+                        <property role="1L3L77" value="TermDeclaration" />
+                        <node concept="3clFbT" id="4MEOIDGiEBt" role="1L3L4I">
+                          <property role="3clFbU" value="false" />
+                        </node>
+                        <node concept="10Nm6u" id="4MEOIDGiEBu" role="1L3L4I">
+                          <node concept="2b32R4" id="4MEOIDGiEBv" role="lGtFl">
+                            <node concept="3JmXsc" id="4MEOIDGiEBw" role="2P8S$">
+                              <node concept="3clFbS" id="4MEOIDGiEBx" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGiEBy" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGiEBz" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDGiEB$" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4MEOIDGiEB_" role="2Oq$k0">
+                                        <node concept="30H73N" id="4MEOIDGiEBA" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4MEOIDGiEBB" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                                        </node>
+                                      </node>
+                                      <node concept="3Tsc0h" id="4MEOIDGiEBC" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                                      </node>
+                                    </node>
+                                    <node concept="3$u5V9" id="4MEOIDGiEBD" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4MEOIDGiEBE" role="23t8la">
+                                        <node concept="3clFbS" id="4MEOIDGiEBF" role="1bW5cS">
+                                          <node concept="3clFbF" id="4MEOIDGiEBG" role="3cqZAp">
+                                            <node concept="2OqwBi" id="4MEOIDGiEBH" role="3clFbG">
+                                              <node concept="37vLTw" id="4MEOIDGiEBI" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4MEOIDGiEBK" resolve="it" />
+                                              </node>
+                                              <node concept="3TrEf2" id="4MEOIDGiEBJ" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4MEOIDGiEBK" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4MEOIDGiEBL" role="1tU5fm" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="4MEOIDGiEBM" role="3MN40a">
+                          <property role="TrG5h" value="feature" />
+                          <node concept="3uibUv" id="4MEOIDGiEBN" role="3clF45">
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                          </node>
+                          <node concept="3Tmbuc" id="4MEOIDGiEBO" role="1B3o_S" />
+                          <node concept="3clFbS" id="4MEOIDGiEBP" role="3clF47">
+                            <node concept="3clFbF" id="4MEOIDGiEBQ" role="3cqZAp">
+                              <node concept="10Nm6u" id="4MEOIDGiEBR" role="3clFbG">
+                                <node concept="1sPUBX" id="4MEOIDGiEBS" role="lGtFl">
+                                  <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature" />
+                                  <node concept="2OqwBi" id="4MEOIDGiEBT" role="v9R3O">
+                                    <node concept="30H73N" id="4MEOIDGiEBU" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="4MEOIDGiEBV" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:1L74NXFMBVS" resolve="term" />
+                                    </node>
+                                  </node>
+                                  <node concept="3NFfHV" id="4MEOIDGiEBW" role="1sPUBK">
+                                    <node concept="3clFbS" id="4MEOIDGiEBX" role="2VODD2">
+                                      <node concept="3clFbF" id="4MEOIDGiEBY" role="3cqZAp">
+                                        <node concept="2OqwBi" id="4MEOIDGiEBZ" role="3clFbG">
+                                          <node concept="30H73N" id="4MEOIDGiEC0" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="4MEOIDGiEC1" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="17Uvod" id="4MEOIDGiEC2" role="lGtFl">
+                            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                            <property role="2qtEX9" value="name" />
+                            <node concept="3zFVjK" id="4MEOIDGiEC3" role="3zH0cK">
+                              <node concept="3clFbS" id="4MEOIDGiEC4" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGiEC5" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGiEC6" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDGiEC7" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDGiEC8" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGiEC9" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrcHB" id="4MEOIDGiECa" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1WS0z7" id="4MEOIDGiECb" role="lGtFl">
+                            <node concept="3JmXsc" id="4MEOIDGiECc" role="3Jn$fo">
+                              <node concept="3clFbS" id="4MEOIDGiECd" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGiECe" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGiECf" role="3clFbG">
+                                    <node concept="30H73N" id="4MEOIDGiECg" role="2Oq$k0" />
+                                    <node concept="3Tsc0h" id="4MEOIDGiECh" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Tm1VV" id="4MEOIDGiECi" role="1B3o_S" />
+                        <node concept="3uibUv" id="4MEOIDGiECj" role="1L3L74">
+                          <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                        </node>
+                        <node concept="17Uvod" id="4MEOIDGiECk" role="lGtFl">
+                          <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                          <property role="2qtEX9" value="fqClassName" />
+                          <node concept="3zFVjK" id="4MEOIDGiECl" role="3zH0cK">
+                            <node concept="3clFbS" id="4MEOIDGiECm" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDGiECn" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDGiECo" role="3clFbG">
+                                  <node concept="2OqwBi" id="4MEOIDGiECp" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4MEOIDGiECq" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDGiECr" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGiECs" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="4MEOIDGiECt" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                    </node>
+                                  </node>
+                                  <node concept="2qgKlT" id="4MEOIDGiECu" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="4MEOIDGaGP0" role="lGtFl" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="14ZrTv" id="4MEOIDGqcCv" role="14ZwWg">
+          <node concept="30G5F_" id="4MEOIDGqcCw" role="150hEN">
+            <node concept="3clFbS" id="4MEOIDGqcCx" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDGqcCy" role="3cqZAp">
+                <node concept="1Wc70l" id="4MEOIDGqcCz" role="3clFbG">
+                  <node concept="2OqwBi" id="4MEOIDGqcC$" role="3uHU7w">
+                    <node concept="2OqwBi" id="4MEOIDGqcC_" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4MEOIDGqcCA" role="2Oq$k0">
+                        <node concept="30H73N" id="4MEOIDGqcCB" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="4MEOIDGqcCC" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="4MEOIDGqcCD" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                      </node>
+                    </node>
+                    <node concept="1v1jN8" id="4MEOIDGqfKs" role="2OqNvi" />
+                  </node>
+                  <node concept="2OqwBi" id="4MEOIDGqcCF" role="3uHU7B">
+                    <node concept="2OqwBi" id="4MEOIDGqcCG" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDGqcCH" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4MEOIDGqcCI" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="4MEOIDGqcCJ" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="4MEOIDGqcCK" role="150oIE">
+            <node concept="3clFbF" id="4MEOIDGqcCL" role="1Koe22">
+              <node concept="2OqwBi" id="4MEOIDGqcCM" role="3clFbG">
+                <node concept="liA8E" id="4MEOIDGqcCN" role="2OqNvi">
+                  <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                </node>
+                <node concept="1eOMI4" id="4MEOIDGqcCO" role="2Oq$k0">
+                  <node concept="2ShNRf" id="4MEOIDGqcCP" role="1eOMHV">
+                    <node concept="1L3L4E" id="4MEOIDGqcCQ" role="2ShVmc">
+                      <node concept="1L3L4F" id="4MEOIDGqcCR" role="1L3L0X">
+                        <property role="2bfB8j" value="true" />
+                        <property role="1L3L77" value="TermDeclaration" />
+                        <node concept="3clFbT" id="4MEOIDGqcCS" role="1L3L4I">
+                          <property role="3clFbU" value="false" />
+                        </node>
+                        <node concept="10Nm6u" id="4MEOIDGqgyG" role="1L3L4I">
+                          <node concept="1WS0z7" id="4MEOIDGqgyH" role="lGtFl">
+                            <node concept="3JmXsc" id="4MEOIDGqgyI" role="3Jn$fo">
+                              <node concept="3clFbS" id="4MEOIDGqgyJ" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGqgyK" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGqgyL" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDGqgyM" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4MEOIDGqgyN" role="2Oq$k0">
+                                        <node concept="30H73N" id="4MEOIDGqgyO" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4MEOIDGqgyP" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="4MEOIDGqgyQ" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                      </node>
+                                    </node>
+                                    <node concept="3Tsc0h" id="4MEOIDGqgyR" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="4MEOIDGqcDd" role="3MN40a">
+                          <property role="TrG5h" value="feature" />
+                          <node concept="3uibUv" id="4MEOIDGqcDe" role="3clF45">
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                          </node>
+                          <node concept="3Tmbuc" id="4MEOIDGqcDf" role="1B3o_S" />
+                          <node concept="3clFbS" id="4MEOIDGqcDg" role="3clF47">
+                            <node concept="3clFbF" id="4MEOIDGqcDh" role="3cqZAp">
+                              <node concept="10Nm6u" id="4MEOIDGqcDi" role="3clFbG">
+                                <node concept="1sPUBX" id="4MEOIDGqcDj" role="lGtFl">
+                                  <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature" />
+                                  <node concept="2OqwBi" id="4MEOIDGqcDk" role="v9R3O">
+                                    <node concept="30H73N" id="4MEOIDGqcDl" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="4MEOIDGqcDm" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:1L74NXFMBVS" resolve="term" />
+                                    </node>
+                                  </node>
+                                  <node concept="3NFfHV" id="4MEOIDGqcDn" role="1sPUBK">
+                                    <node concept="3clFbS" id="4MEOIDGqcDo" role="2VODD2">
+                                      <node concept="3clFbF" id="4MEOIDGqcDp" role="3cqZAp">
+                                        <node concept="2OqwBi" id="4MEOIDGqcDq" role="3clFbG">
+                                          <node concept="30H73N" id="4MEOIDGqcDr" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="4MEOIDGqcDs" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="17Uvod" id="4MEOIDGqcDt" role="lGtFl">
+                            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                            <property role="2qtEX9" value="name" />
+                            <node concept="3zFVjK" id="4MEOIDGqcDu" role="3zH0cK">
+                              <node concept="3clFbS" id="4MEOIDGqcDv" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGqcDw" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGqcDx" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDGqcDy" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDGqcDz" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGqcD$" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrcHB" id="4MEOIDGqcD_" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1WS0z7" id="4MEOIDGqcDA" role="lGtFl">
+                            <node concept="3JmXsc" id="4MEOIDGqcDB" role="3Jn$fo">
+                              <node concept="3clFbS" id="4MEOIDGqcDC" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGqcDD" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGqcDE" role="3clFbG">
+                                    <node concept="30H73N" id="4MEOIDGqcDF" role="2Oq$k0" />
+                                    <node concept="3Tsc0h" id="4MEOIDGqcDG" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Tm1VV" id="4MEOIDGqcDH" role="1B3o_S" />
+                        <node concept="3uibUv" id="4MEOIDGqcDI" role="1L3L74">
+                          <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                        </node>
+                        <node concept="17Uvod" id="4MEOIDGqcDJ" role="lGtFl">
+                          <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                          <property role="2qtEX9" value="fqClassName" />
+                          <node concept="3zFVjK" id="4MEOIDGqcDK" role="3zH0cK">
+                            <node concept="3clFbS" id="4MEOIDGqcDL" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDGqcDM" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDGqcDN" role="3clFbG">
+                                  <node concept="2OqwBi" id="4MEOIDGqcDO" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4MEOIDGqcDP" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDGqcDQ" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4MEOIDGqcDR" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="4MEOIDGqcDS" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                    </node>
+                                  </node>
+                                  <node concept="2qgKlT" id="4MEOIDGqcDT" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="4MEOIDGqcDU" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="4MEOIDG9gco" role="14YRTM">
+          <node concept="2OqwBi" id="4MEOIDG9wHj" role="1Koe22">
+            <node concept="1eOMI4" id="4MEOIDGiFoS" role="2Oq$k0">
+              <node concept="1nCR9W" id="4MEOIDGiFoT" role="1eOMHV">
+                <property role="1nD$Q0" value="TermDeclaration" />
+                <node concept="3clFbT" id="4MEOIDGkcbP" role="2U2pNA">
+                  <property role="3clFbU" value="false" />
+                </node>
+                <node concept="10Nm6u" id="4MEOIDGiFoU" role="2U2pNA">
+                  <node concept="2b32R4" id="4MEOIDGiFoV" role="lGtFl">
+                    <node concept="3JmXsc" id="4MEOIDGiFoW" role="2P8S$">
+                      <node concept="3clFbS" id="4MEOIDGiFoX" role="2VODD2">
+                        <node concept="3clFbF" id="4MEOIDGiFoY" role="3cqZAp">
+                          <node concept="2OqwBi" id="4MEOIDGiFoZ" role="3clFbG">
+                            <node concept="2OqwBi" id="4MEOIDGiFp0" role="2Oq$k0">
+                              <node concept="2OqwBi" id="4MEOIDGiFp1" role="2Oq$k0">
+                                <node concept="30H73N" id="4MEOIDGiFp2" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDGiFp3" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                                </node>
+                              </node>
+                              <node concept="3Tsc0h" id="4MEOIDGiFp4" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                              </node>
+                            </node>
+                            <node concept="3$u5V9" id="4MEOIDGiFp5" role="2OqNvi">
+                              <node concept="1bVj0M" id="4MEOIDGiFp6" role="23t8la">
+                                <node concept="3clFbS" id="4MEOIDGiFp7" role="1bW5cS">
+                                  <node concept="3clFbF" id="4MEOIDGiFp8" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4MEOIDGiFp9" role="3clFbG">
+                                      <node concept="37vLTw" id="4MEOIDGiFpa" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="4MEOIDGiFpc" resolve="it" />
+                                      </node>
+                                      <node concept="3TrEf2" id="4MEOIDGiFpb" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="4MEOIDGiFpc" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="4MEOIDGiFpd" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="4MEOIDGiFpe" role="2lIhxL">
+                  <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                </node>
+                <node concept="17Uvod" id="4MEOIDGiFpf" role="lGtFl">
+                  <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                  <property role="2qtEX9" value="fqClassName" />
+                  <node concept="3zFVjK" id="4MEOIDGiFpg" role="3zH0cK">
+                    <node concept="3clFbS" id="4MEOIDGiFph" role="2VODD2">
+                      <node concept="3clFbF" id="4MEOIDGiFpi" role="3cqZAp">
+                        <node concept="2OqwBi" id="4MEOIDGiFpj" role="3clFbG">
+                          <node concept="2OqwBi" id="4MEOIDGiFpk" role="2Oq$k0">
+                            <node concept="2OqwBi" id="4MEOIDGiFpl" role="2Oq$k0">
+                              <node concept="30H73N" id="4MEOIDGiFpm" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="4MEOIDGiFpn" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="4MEOIDGiFpo" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="4MEOIDGiFpp" role="2OqNvi">
+                            <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="4MEOIDG9wHx" role="2OqNvi">
+              <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+            </node>
+            <node concept="raruj" id="4MEOIDG9wHy" role="lGtFl" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3aamgX" id="2V8TwD0G7nE" role="3acgRq">
@@ -10381,7 +10485,7 @@
     </node>
   </node>
   <node concept="312cEu" id="2N2MQGCMHqo">
-    <property role="TrG5h" value="TypeTable" />
+    <property role="TrG5h" value="_TypeTable" />
     <property role="3GE5qa" value="type" />
     <node concept="2tJIrI" id="2N2MQGCMIt2" role="jymVt" />
     <node concept="3clFb_" id="2N2MQGCMO_b" role="jymVt">
@@ -10480,10 +10584,7 @@
                   </node>
                   <node concept="2ShNRf" id="4KRwoem42xF" role="10QFUP">
                     <node concept="1pGfFk" id="4KRwoem42xG" role="2ShVmc">
-                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="_TypeTable._Template" />
-                      <node concept="37vLTw" id="4KRwoem42xH" role="37wK5m">
-                        <ref role="3cqZAo" node="1GNw78$a431" resolve="typeConcept" />
-                      </node>
+                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__TypeTable._Template" />
                       <node concept="1ZhdrF" id="4KRwoem42xI" role="lGtFl">
                         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
                         <property role="2qtEX8" value="baseMethodDeclaration" />
@@ -10557,47 +10658,225 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4nxCIBqost0" role="jymVt" />
-    <node concept="3clFb_" id="4nxCIBqosZM" role="jymVt">
-      <property role="TrG5h" value="allTypeConcepts" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3vKaQO" id="4nxCIBqosZN" role="3clF45">
-        <node concept="3bZ5Sz" id="4nxCIBqosZO" role="3O5elw" />
+    <node concept="2tJIrI" id="4MEOIDEgrjY" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEgqbt" role="jymVt">
+      <property role="TrG5h" value="typeTemplate" />
+      <node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
+        <property role="TrG5h" value="typeTplId" />
+        <node concept="3uibUv" id="4MEOIDEhHGl" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
       </node>
-      <node concept="3Tm1VV" id="4nxCIBqosZP" role="1B3o_S" />
-      <node concept="3clFbS" id="4nxCIBqosZR" role="3clF47">
-        <node concept="3cpWs8" id="4nxCIBqovEw" role="3cqZAp">
-          <node concept="3cpWsn" id="4nxCIBqovEx" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="_YKpA" id="4nxCIBqovEo" role="1tU5fm">
-              <node concept="3bZ5Sz" id="4nxCIBqovEr" role="_ZDj9" />
+      <node concept="3uibUv" id="4MEOIDEgqbw" role="3clF45">
+        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
+        <node concept="16syzq" id="4MEOIDEgqbx" role="11_B2D">
+          <ref role="16sUi3" node="4MEOIDEgqco" resolve="Cfg" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDEgqby" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEgqbz" role="3clF47">
+        <node concept="3clFbJ" id="4MEOIDEgqb$" role="3cqZAp">
+          <node concept="3clFbS" id="4MEOIDEgqb_" role="3clFbx">
+            <node concept="YS8fn" id="4MEOIDEgqbA" role="3cqZAp">
+              <node concept="2ShNRf" id="4MEOIDEgqbB" role="YScLw">
+                <node concept="1pGfFk" id="4MEOIDEgqbC" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                </node>
+              </node>
             </node>
-            <node concept="2ShNRf" id="4nxCIBqovEy" role="33vP2m">
-              <node concept="Tc6Ow" id="4nxCIBqovEz" role="2ShVmc">
-                <node concept="3bZ5Sz" id="4nxCIBqovE$" role="HW$YZ" />
+          </node>
+          <node concept="3clFbC" id="4MEOIDEgqbD" role="3clFbw">
+            <node concept="10Nm6u" id="4MEOIDEgqbE" role="3uHU7w" />
+            <node concept="37vLTw" id="4MEOIDEhJpZ" role="3uHU7B">
+              <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="typeTplId" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4MEOIDEgzNB" role="3cqZAp" />
+        <node concept="2ignYC" id="4MEOIDEhKRU" role="3cqZAp">
+          <node concept="2OqwBi" id="4MEOIDEhMjx" role="3KbGdf">
+            <node concept="37vLTw" id="4MEOIDEhM1B" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="typeTplId" />
+            </node>
+            <node concept="liA8E" id="4MEOIDEhMJJ" role="2OqNvi">
+              <ref role="37wK5l" to="psr6:4MEOIDEi5VO" resolve="toString" />
+            </node>
+          </node>
+          <node concept="3KbdKl" id="4MEOIDEhN1R" role="3KbHQx">
+            <node concept="Xl_RD" id="4MEOIDEhNeY" role="3Kbmr1">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="4MEOIDEhNrv" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="4MEOIDEhNrw" role="3zH0cK">
+                  <node concept="3clFbS" id="4MEOIDEhNrx" role="2VODD2">
+                    <node concept="3clFbF" id="4MEOIDEhSL1" role="3cqZAp">
+                      <node concept="2OqwBi" id="4MEOIDEhW6j" role="3clFbG">
+                        <node concept="2OqwBi" id="4MEOIDEhVfT" role="2Oq$k0">
+                          <node concept="2JrnkZ" id="4MEOIDEhUMl" role="2Oq$k0">
+                            <node concept="30H73N" id="4MEOIDEhSL0" role="2JrQYb" />
+                          </node>
+                          <node concept="liA8E" id="4MEOIDEhVEp" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4MEOIDEhWxu" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="4MEOIDEhN1T" role="3Kbo56">
+              <node concept="3cpWs6" id="4MEOIDEi0CD" role="3cqZAp">
+                <node concept="10QFUN" id="4MEOIDEkrJU" role="3cqZAk">
+                  <node concept="3uibUv" id="4MEOIDEkrJI" role="10QFUM">
+                    <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
+                    <node concept="16syzq" id="4MEOIDEkrJJ" role="11_B2D">
+                      <ref role="16sUi3" node="4MEOIDEgqco" resolve="Cfg" />
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="4MEOIDEkrJK" role="10QFUP">
+                    <node concept="1pGfFk" id="4MEOIDEkrJL" role="2ShVmc">
+                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__TypeTable._Template" />
+                      <node concept="1ZhdrF" id="4MEOIDEkrJM" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="4MEOIDEkrJN" role="3$ytzL">
+                          <node concept="3clFbS" id="4MEOIDEkrJO" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDEkrJP" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDEkrJQ" role="3clFbG">
+                                <node concept="1iwH7S" id="4MEOIDEkrJR" role="2Oq$k0" />
+                                <node concept="1iwH70" id="4MEOIDEkrJS" role="2OqNvi">
+                                  <ref role="1iwH77" node="4JJCDIm$O$I" resolve="typeDecl_template_constructor" />
+                                  <node concept="30H73N" id="4MEOIDEkrJT" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1WS0z7" id="4MEOIDEhXIT" role="lGtFl">
+              <node concept="3JmXsc" id="4MEOIDEhXIV" role="3Jn$fo">
+                <node concept="3clFbS" id="4MEOIDEhXIX" role="2VODD2">
+                  <node concept="3clFbF" id="4MEOIDEhYfL" role="3cqZAp">
+                    <node concept="2OqwBi" id="4MEOIDEhYNh" role="3clFbG">
+                      <node concept="30H73N" id="4MEOIDEhYfK" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4MEOIDEhZ$2" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4nxCIBqovG$" role="3cqZAp" />
-        <node concept="3clFbF" id="4nxCIBqovJd" role="3cqZAp">
-          <node concept="2OqwBi" id="4nxCIBqowfW" role="3clFbG">
-            <node concept="37vLTw" id="4nxCIBqovJb" role="2Oq$k0">
-              <ref role="3cqZAo" node="4nxCIBqovEx" resolve="result" />
+        <node concept="3clFbH" id="4MEOIDEgqce" role="3cqZAp" />
+        <node concept="YS8fn" id="4MEOIDEgqcf" role="3cqZAp">
+          <node concept="2ShNRf" id="4MEOIDEgqcg" role="YScLw">
+            <node concept="1pGfFk" id="4MEOIDEgqch" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+              <node concept="3cpWs3" id="4MEOIDEgqci" role="37wK5m">
+                <node concept="Xl_RD" id="4MEOIDEgqcm" role="3uHU7B">
+                  <property role="Xl_RC" value="invalid type template id: " />
+                </node>
+                <node concept="37vLTw" id="4MEOIDEi3dN" role="3uHU7w">
+                  <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="typeTplId" />
+                </node>
+              </node>
             </node>
-            <node concept="TSZUe" id="4nxCIBqoxhR" role="2OqNvi">
-              <node concept="35c_gC" id="4nxCIBqoxkP" role="25WWJ7">
-                <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                <node concept="1ZhdrF" id="4nxCIBqoxUo" role="lGtFl">
-                  <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                  <property role="2qtEX8" value="conceptDeclaration" />
-                  <node concept="3$xsQk" id="4nxCIBqoxUp" role="3$ytzL">
-                    <node concept="3clFbS" id="4nxCIBqoxUq" role="2VODD2">
-                      <node concept="3clFbF" id="4nxCIBqoys4" role="3cqZAp">
-                        <node concept="2OqwBi" id="4nxCIBqoyCX" role="3clFbG">
-                          <node concept="30H73N" id="4nxCIBqoys3" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="4nxCIBqoyWj" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4MEOIDEgqcn" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="16euLQ" id="4MEOIDEgqco" role="16eVyc">
+        <property role="TrG5h" value="Cfg" />
+        <node concept="3uibUv" id="4MEOIDEgqcp" role="3ztrMU">
+          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4nxCIBqost0" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEWLFp" role="jymVt">
+      <property role="TrG5h" value="allTypeTemplateIds" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="3vKaQO" id="4MEOIDEWLFq" role="3clF45">
+        <node concept="3uibUv" id="4MEOIDEWQRR" role="3O5elw">
+          <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDEWLFs" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEWLFt" role="3clF47">
+        <node concept="3cpWs8" id="4MEOIDEWLFu" role="3cqZAp">
+          <node concept="3cpWsn" id="4MEOIDEWLFv" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="4MEOIDEWLFw" role="1tU5fm">
+              <node concept="3uibUv" id="4MEOIDEWSA6" role="_ZDj9">
+                <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="4MEOIDEWLFy" role="33vP2m">
+              <node concept="Tc6Ow" id="4MEOIDEWLFz" role="2ShVmc">
+                <node concept="3uibUv" id="4MEOIDEWRmU" role="HW$YZ">
+                  <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4MEOIDEWLF_" role="3cqZAp" />
+        <node concept="3clFbF" id="4MEOIDEWLFA" role="3cqZAp">
+          <node concept="2OqwBi" id="4MEOIDEWLFB" role="3clFbG">
+            <node concept="37vLTw" id="4MEOIDEWLFC" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MEOIDEWLFv" resolve="result" />
+            </node>
+            <node concept="TSZUe" id="4MEOIDEWLFD" role="2OqNvi">
+              <node concept="2YIFZM" id="4MEOIDEWU$t" role="25WWJ7">
+                <ref role="37wK5l" to="psr6:4MEOIDEhz4d" resolve="forReference" />
+                <ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+                <node concept="2OqwBi" id="4MEOIDEWUYy" role="37wK5m">
+                  <node concept="2YIFZM" id="4MEOIDEWUOF" role="2Oq$k0">
+                    <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                    <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
+                  </node>
+                  <node concept="liA8E" id="4MEOIDEWV6s" role="2OqNvi">
+                    <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
+                    <node concept="Xl_RD" id="4MEOIDEWVa7" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                      <node concept="17Uvod" id="4MEOIDEWVf0" role="lGtFl">
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                        <property role="2qtEX9" value="value" />
+                        <node concept="3zFVjK" id="4MEOIDEWVf1" role="3zH0cK">
+                          <node concept="3clFbS" id="4MEOIDEWVf2" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDEWW7p" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDEX0Aw" role="3clFbG">
+                                <node concept="2YIFZM" id="4MEOIDEX0m5" role="2Oq$k0">
+                                  <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                                  <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
+                                </node>
+                                <node concept="liA8E" id="4MEOIDEX0Pn" role="2OqNvi">
+                                  <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
+                                  <node concept="2OqwBi" id="4MEOIDEWZ8Y" role="37wK5m">
+                                    <node concept="2JrnkZ" id="4MEOIDEWYPH" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDEWW7o" role="2JrQYb" />
+                                    </node>
+                                    <node concept="liA8E" id="4MEOIDEX1Sy" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -10607,33 +10886,67 @@
               </node>
             </node>
           </node>
-          <node concept="1WS0z7" id="4nxCIBqoyaU" role="lGtFl">
-            <node concept="3JmXsc" id="4nxCIBqoyaX" role="3Jn$fo">
-              <node concept="3clFbS" id="4nxCIBqoyaY" role="2VODD2">
-                <node concept="3clFbF" id="4nxCIBqoyb4" role="3cqZAp">
-                  <node concept="2OqwBi" id="4nxCIBqoyaZ" role="3clFbG">
-                    <node concept="3Tsc0h" id="4nxCIBqoyb2" role="2OqNvi">
+          <node concept="1WS0z7" id="4MEOIDEWLFM" role="lGtFl">
+            <node concept="3JmXsc" id="4MEOIDEWLFN" role="3Jn$fo">
+              <node concept="3clFbS" id="4MEOIDEWLFO" role="2VODD2">
+                <node concept="3clFbF" id="4MEOIDEWLFP" role="3cqZAp">
+                  <node concept="2OqwBi" id="4MEOIDEWLFQ" role="3clFbG">
+                    <node concept="3Tsc0h" id="4MEOIDEWLFR" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="type" />
                     </node>
-                    <node concept="30H73N" id="4nxCIBqoyb3" role="2Oq$k0" />
+                    <node concept="30H73N" id="4MEOIDEWLFS" role="2Oq$k0" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4nxCIBqovHt" role="3cqZAp" />
-        <node concept="3clFbF" id="4nxCIBqou$Z" role="3cqZAp">
-          <node concept="37vLTw" id="4nxCIBqovE_" role="3clFbG">
-            <ref role="3cqZAo" node="4nxCIBqovEx" resolve="result" />
+        <node concept="3clFbH" id="4MEOIDEWLFT" role="3cqZAp" />
+        <node concept="3clFbF" id="4MEOIDEWLFU" role="3cqZAp">
+          <node concept="37vLTw" id="4MEOIDEWLFV" role="3clFbG">
+            <ref role="3cqZAo" node="4MEOIDEWLFv" resolve="result" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="4nxCIBqosZS" role="2AJF6D">
+      <node concept="2AHcQZ" id="4MEOIDEWLFW" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4nxCIBqot$n" role="jymVt" />
+    <node concept="2tJIrI" id="4MEOIDG8yS6" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDG8zHL" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="typeTermDeclaration" />
+      <node concept="3uibUv" id="4MEOIDG8zHM" role="3clF45">
+        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDG8zHN" role="1B3o_S" />
+      <node concept="37vLTG" id="4MEOIDG8zHP" role="3clF46">
+        <property role="TrG5h" value="typeTplId" />
+        <node concept="3uibUv" id="4MEOIDG8zHQ" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4MEOIDG8zHR" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8zHU" role="3cqZAp">
+          <node concept="10Nm6u" id="4MEOIDG8zHT" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4MEOIDG8zHS" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="1W57fq" id="4MEOIDG8BYC" role="lGtFl">
+        <node concept="3IZrLx" id="4MEOIDG8BYE" role="3IZSJc">
+          <node concept="3clFbS" id="4MEOIDG8BYG" role="2VODD2">
+            <node concept="3clFbF" id="4MEOIDG8CUk" role="3cqZAp">
+              <node concept="3clFbT" id="4MEOIDG8CUj" role="3clFbG">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MEOIDG8$A1" role="jymVt" />
     <node concept="2tJIrI" id="1GNw78$IsA6" role="jymVt">
       <node concept="xERo3" id="1GNw78$I_sH" role="lGtFl">
         <ref role="xH3mL" node="1GNw78$HcGL" resolve="frag_TypeTable_TypeTemplate" />
@@ -10653,18 +10966,10 @@
       <node concept="3zFVjK" id="2N2MQGCZANk" role="3zH0cK">
         <node concept="3clFbS" id="2N2MQGCZANl" role="2VODD2">
           <node concept="3clFbF" id="2N2MQGCZANr" role="3cqZAp">
-            <node concept="3cpWs3" id="2N2MQGCZBj_" role="3clFbG">
-              <node concept="3cpWs3" id="2N2MQGCZBB4" role="3uHU7B">
-                <node concept="3zGtF$" id="2N2MQGCZBHc" role="3uHU7B" />
-                <node concept="Xl_RD" id="2N2MQGCZBpD" role="3uHU7w">
-                  <property role="Xl_RC" value="_" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="2N2MQGCZANm" role="3uHU7w">
-                <node concept="3TrcHB" id="2N2MQGCZANp" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-                <node concept="30H73N" id="2N2MQGCZANq" role="2Oq$k0" />
+            <node concept="2OqwBi" id="4MEOIDG8k4S" role="3clFbG">
+              <node concept="30H73N" id="4MEOIDG8jhS" role="2Oq$k0" />
+              <node concept="2qgKlT" id="4MEOIDG8l3x" role="2OqNvi">
+                <ref role="37wK5l" to="x5bw:4MEOIDG8goY" resolve="runtimeClassName" />
               </node>
             </node>
           </node>
@@ -10702,7 +11007,7 @@
               <ref role="37wK5l" to="fqlx:4JJCDImP5xa" resolve="addTypeTable" />
               <node concept="2ShNRf" id="4JJCDImP7CL" role="37wK5m">
                 <node concept="HV5vD" id="4JJCDImP894" role="2ShVmc">
-                  <ref role="HV5vE" node="2N2MQGCMHqo" resolve="TypeTable" />
+                  <ref role="HV5vE" node="2N2MQGCMHqo" resolve="_TypeTable" />
                   <node concept="1ZhdrF" id="4JJCDImP8vE" role="lGtFl">
                     <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
                     <property role="2qtEX8" value="classifier" />
@@ -15939,114 +16244,213 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7IysFeBic7g" role="3aUrZf">
+    <node concept="3aamgX" id="4MEOIDFfqT2" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-      <node concept="1Koe21" id="7IysFeBic7h" role="1lVwrX">
-        <node concept="3clFb_" id="7IysFeBic7i" role="1Koe22">
-          <property role="TrG5h" value="method" />
-          <node concept="37vLTG" id="7IysFeBic7j" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="7IysFeBic7k" role="1tU5fm">
-              <ref role="3uigEE" to="nz6g:18kNIl1vDPZ" resolve="ApplicationSession" />
+      <ref role="30HIoZ" to="wq2x:4MEOIDFfpSk" resolve="NewTypePseudoConstraint" />
+      <node concept="14YyZ8" id="4MEOIDFhf_y" role="1lVwrX">
+        <node concept="14ZrTv" id="4MEOIDFjGRP" role="14ZwWg">
+          <node concept="30G5F_" id="4MEOIDFjGRQ" role="150hEN">
+            <node concept="3clFbS" id="4MEOIDFjGRR" role="2VODD2">
+              <node concept="3SKdUt" id="4MEOIDGJ0V7" role="3cqZAp">
+                <node concept="3SKdUq" id="4MEOIDGJ0V9" role="3SKWNk">
+                  <property role="3SKdUp" value="FIXME: implement the case" />
+                </node>
+              </node>
+              <node concept="3clFbF" id="4MEOIDFjI9w" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDFjI9x" role="3clFbG">
+                  <node concept="2OqwBi" id="4MEOIDFjI9y" role="2Oq$k0">
+                    <node concept="2OqwBi" id="4MEOIDFjI9z" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDFjI9$" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="4MEOIDFjI9_" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="4MEOIDFjI9A" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4MEOIDFjI9B" role="2OqNvi" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="3cqZAl" id="7IysFeBic7l" role="3clF45" />
-          <node concept="3Tm1VV" id="7IysFeBic7m" role="1B3o_S" />
-          <node concept="3clFbS" id="7IysFeBic7n" role="3clF47">
-            <node concept="3cpWs8" id="4JJCDImZq$y" role="3cqZAp">
-              <node concept="3cpWsn" id="4JJCDImZq$z" role="3cpWs9">
-                <property role="TrG5h" value="builder" />
-                <node concept="3uibUv" id="4JJCDImZq$$" role="1tU5fm">
-                  <ref role="3uigEE" to="nz6g:7eGEHDlc$ap" resolve="RuleBuilder" />
-                </node>
-                <node concept="2ShNRf" id="4JJCDImZq$_" role="33vP2m">
-                  <node concept="1pGfFk" id="4JJCDImZq$A" role="2ShVmc">
-                    <ref role="37wK5l" to="nz6g:6lpwCiZjdph" resolve="RuleBuilder" />
-                    <node concept="Xl_RD" id="4JJCDImZq$B" role="37wK5m">
-                      <property role="Xl_RC" value="" />
+          <node concept="j$LIH" id="4MEOIDGJ0b1" role="150oIE">
+            <node concept="1lLz0L" id="4MEOIDGJ0mV" role="1lHHLF">
+              <property role="1lMjX7" value="error" />
+              <property role="1lLB17" value="NOT IMPLEMENTED" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="4MEOIDFhlG_" role="14YRTM">
+          <node concept="3clFb_" id="4MEOIDFhlSI" role="1Koe22">
+            <property role="TrG5h" value="method" />
+            <node concept="37vLTG" id="4MEOIDFhlSJ" role="3clF46">
+              <property role="TrG5h" value="session" />
+              <node concept="3uibUv" id="4MEOIDFhlSK" role="1tU5fm">
+                <ref role="3uigEE" to="nz6g:18kNIl1vDPZ" resolve="ApplicationSession" />
+              </node>
+            </node>
+            <node concept="3cqZAl" id="4MEOIDFhlSL" role="3clF45" />
+            <node concept="3Tm1VV" id="4MEOIDFhlSM" role="1B3o_S" />
+            <node concept="3clFbS" id="4MEOIDFhlSN" role="3clF47">
+              <node concept="3cpWs8" id="4MEOIDFhlSO" role="3cqZAp">
+                <node concept="3cpWsn" id="4MEOIDFhlSP" role="3cpWs9">
+                  <property role="TrG5h" value="builder" />
+                  <node concept="3uibUv" id="4MEOIDFhlSQ" role="1tU5fm">
+                    <ref role="3uigEE" to="nz6g:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                  <node concept="2ShNRf" id="4MEOIDFhlSR" role="33vP2m">
+                    <node concept="1pGfFk" id="4MEOIDFhlSS" role="2ShVmc">
+                      <ref role="37wK5l" to="nz6g:6lpwCiZjdph" resolve="RuleBuilder" />
+                      <node concept="Xl_RD" id="4MEOIDFhlST" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3clFbH" id="4JJCDImZqlM" role="3cqZAp" />
-            <node concept="3clFbF" id="4JJCDImZrul" role="3cqZAp">
-              <node concept="2OqwBi" id="4JJCDImZrYY" role="3clFbG">
-                <node concept="liA8E" id="4JJCDImZswS" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:77AxcO4ZwMR" resolve="merge" />
-                  <node concept="2OqwBi" id="4JJCDImZt0Q" role="37wK5m">
-                    <node concept="liA8E" id="4JJCDImZt14" role="2OqNvi">
-                      <ref role="37wK5l" to="nz6g:7IysFeAaLtH" resolve="newType" />
-                      <node concept="10Nm6u" id="4JJCDImZt15" role="37wK5m">
-                        <node concept="29HgVG" id="4JJCDImZt16" role="lGtFl">
-                          <node concept="3NFfHV" id="4JJCDImZt17" role="3NFExx">
-                            <node concept="3clFbS" id="4JJCDImZt18" role="2VODD2">
-                              <node concept="3clFbF" id="4JJCDImZt19" role="3cqZAp">
-                                <node concept="2OqwBi" id="4JJCDImZt1a" role="3clFbG">
-                                  <node concept="3TrEf2" id="4JJCDImZt1b" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:6p0DfM0gdsG" resolve="typeVar" />
-                                  </node>
-                                  <node concept="30H73N" id="4JJCDImZt1c" role="2Oq$k0" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="35c_gC" id="4JJCDImZt1d" role="37wK5m">
-                        <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                        <node concept="1ZhdrF" id="4JJCDImZt1e" role="lGtFl">
-                          <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                          <property role="2qtEX8" value="conceptDeclaration" />
-                          <node concept="3$xsQk" id="4JJCDImZt1f" role="3$ytzL">
-                            <node concept="3clFbS" id="4JJCDImZt1g" role="2VODD2">
-                              <node concept="3clFbF" id="4JJCDImZt1h" role="3cqZAp">
-                                <node concept="2OqwBi" id="4JJCDImZt1i" role="3clFbG">
-                                  <node concept="2OqwBi" id="4JJCDImZt1j" role="2Oq$k0">
-                                    <node concept="30H73N" id="4JJCDImZt1k" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="4JJCDImZt1l" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
+              <node concept="3clFbH" id="4MEOIDFhlSU" role="3cqZAp" />
+              <node concept="3clFbF" id="4MEOIDFhlSV" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDFhlSW" role="3clFbG">
+                  <node concept="liA8E" id="4MEOIDFhlSX" role="2OqNvi">
+                    <ref role="37wK5l" to="nz6g:77AxcO4ZwMR" resolve="merge" />
+                    <node concept="2OqwBi" id="4MEOIDFhlSY" role="37wK5m">
+                      <node concept="liA8E" id="4MEOIDFhlSZ" role="2OqNvi">
+                        <ref role="37wK5l" to="nz6g:4MEOIDFgV3a" resolve="newType" />
+                        <node concept="10Nm6u" id="4MEOIDFhlT0" role="37wK5m">
+                          <node concept="29HgVG" id="4MEOIDFhlT1" role="lGtFl">
+                            <node concept="3NFfHV" id="4MEOIDFhlT2" role="3NFExx">
+                              <node concept="3clFbS" id="4MEOIDFhlT3" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDFhlT4" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDFhlT5" role="3clFbG">
+                                    <node concept="3TrEf2" id="4MEOIDFhlT6" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:4MEOIDFfpT9" resolve="typeVar" />
                                     </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="4JJCDImZt1m" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
+                                    <node concept="30H73N" id="4MEOIDFhlT7" role="2Oq$k0" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="10Nm6u" id="4JJCDImZt1n" role="37wK5m">
-                        <node concept="2b32R4" id="4JJCDImZt1o" role="lGtFl">
-                          <node concept="3JmXsc" id="4JJCDImZt1p" role="2P8S$">
-                            <node concept="3clFbS" id="4JJCDImZt1q" role="2VODD2">
-                              <node concept="3clFbF" id="4JJCDImZt1r" role="3cqZAp">
-                                <node concept="2OqwBi" id="4JJCDImZt1s" role="3clFbG">
-                                  <node concept="2OqwBi" id="4JJCDImZt1t" role="2Oq$k0">
-                                    <node concept="30H73N" id="4JJCDImZt1u" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="4JJCDImZt1v" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:6p0DfM0gSN1" resolve="argument" />
-                                    </node>
-                                  </node>
-                                  <node concept="3$u5V9" id="4JJCDImZt1w" role="2OqNvi">
-                                    <node concept="1bVj0M" id="4JJCDImZt1x" role="23t8la">
-                                      <node concept="3clFbS" id="4JJCDImZt1y" role="1bW5cS">
-                                        <node concept="3clFbF" id="4JJCDImZt1z" role="3cqZAp">
-                                          <node concept="2OqwBi" id="4JJCDImZt1$" role="3clFbG">
-                                            <node concept="37vLTw" id="4JJCDImZt1_" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4JJCDImZt1B" resolve="it" />
-                                            </node>
-                                            <node concept="3TrEf2" id="4JJCDImZt1A" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:7IysFeA4qC_" resolve="value" />
+                        <node concept="2YIFZM" id="4MEOIDFhs3T" role="37wK5m">
+                          <ref role="37wK5l" to="psr6:4MEOIDEhz4d" resolve="forReference" />
+                          <ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+                          <node concept="2OqwBi" id="4MEOIDFhs3U" role="37wK5m">
+                            <node concept="2YIFZM" id="4MEOIDFhs3V" role="2Oq$k0">
+                              <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                              <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
+                            </node>
+                            <node concept="liA8E" id="4MEOIDFhs3W" role="2OqNvi">
+                              <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
+                              <node concept="Xl_RD" id="4MEOIDFhs3X" role="37wK5m">
+                                <property role="Xl_RC" value="" />
+                                <node concept="17Uvod" id="4MEOIDFhs3Y" role="lGtFl">
+                                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                  <property role="2qtEX9" value="value" />
+                                  <node concept="3zFVjK" id="4MEOIDFhs3Z" role="3zH0cK">
+                                    <node concept="3clFbS" id="4MEOIDFhs40" role="2VODD2">
+                                      <node concept="3clFbF" id="4MEOIDFhs41" role="3cqZAp">
+                                        <node concept="2OqwBi" id="4MEOIDFhs42" role="3clFbG">
+                                          <node concept="2YIFZM" id="4MEOIDFhs43" role="2Oq$k0">
+                                            <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                                            <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
+                                          </node>
+                                          <node concept="liA8E" id="4MEOIDFhs44" role="2OqNvi">
+                                            <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
+                                            <node concept="2OqwBi" id="4MEOIDFhs45" role="37wK5m">
+                                              <node concept="2JrnkZ" id="4MEOIDFhs46" role="2Oq$k0">
+                                                <node concept="2OqwBi" id="4MEOIDFhs47" role="2JrQYb">
+                                                  <node concept="2OqwBi" id="4MEOIDFhuaP" role="2Oq$k0">
+                                                    <node concept="30H73N" id="4MEOIDFhs48" role="2Oq$k0" />
+                                                    <node concept="3TrEf2" id="4MEOIDFhu_m" role="2OqNvi">
+                                                      <ref role="3Tt5mk" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3TrEf2" id="4MEOIDFhvlD" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="liA8E" id="4MEOIDFhs4a" role="2OqNvi">
+                                                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="4JJCDImZt1B" role="1bW2Oz">
-                                        <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="4JJCDImZt1C" role="1tU5fm" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="10Nm6u" id="4MEOIDFhlTi" role="37wK5m">
+                          <node concept="2b32R4" id="4MEOIDFhlTj" role="lGtFl">
+                            <node concept="3JmXsc" id="4MEOIDFhlTk" role="2P8S$">
+                              <node concept="3clFbS" id="4MEOIDFhlTl" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDFhlTm" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDFhlTn" role="3clFbG">
+                                    <node concept="2OqwBi" id="4MEOIDFhKav" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4MEOIDFhxOg" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="4MEOIDFhlTo" role="2Oq$k0">
+                                          <node concept="30H73N" id="4MEOIDFhlTp" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="4MEOIDFhwS2" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="4MEOIDFhy8r" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                                        </node>
+                                      </node>
+                                      <node concept="3Tsc0h" id="4MEOIDFhK_n" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                                      </node>
+                                    </node>
+                                    <node concept="3$u5V9" id="4MEOIDFhlTr" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4MEOIDFhlTs" role="23t8la">
+                                        <node concept="3clFbS" id="4MEOIDFhlTt" role="1bW5cS">
+                                          <node concept="3clFbF" id="4MEOIDFhlTu" role="3cqZAp">
+                                            <node concept="2OqwBi" id="4MEOIDFhlTv" role="3clFbG">
+                                              <node concept="37vLTw" id="4MEOIDFhlTw" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4MEOIDFhlTy" resolve="it" />
+                                              </node>
+                                              <node concept="3TrEf2" id="4MEOIDFidM1" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4MEOIDFhlTy" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4MEOIDFhlTz" role="1tU5fm" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="4MEOIDFhlT$" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4MEOIDFhlSJ" resolve="session" />
+                        <node concept="1sPUBX" id="4MEOIDFhlT_" role="lGtFl">
+                          <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
+                          <node concept="3NFfHV" id="4MEOIDFhlTA" role="1sPUBK">
+                            <node concept="3clFbS" id="4MEOIDFhlTB" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDFhlTC" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDFhlTD" role="3clFbG">
+                                  <node concept="30H73N" id="4MEOIDFhlTE" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="4MEOIDFhlTF" role="2OqNvi">
+                                    <node concept="3gmYPX" id="4MEOIDFhlTG" role="1xVPHs">
+                                      <node concept="3gn64h" id="4MEOIDFhlTH" role="3gmYPZ">
+                                        <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                      </node>
+                                      <node concept="3gn64h" id="4MEOIDFhlTI" role="3gmYPZ">
+                                        <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                       </node>
                                     </node>
                                   </node>
@@ -16057,23 +16461,23 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="37vLTw" id="1L74NXECe_J" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7IysFeBic7j" resolve="session" />
-                      <node concept="1sPUBX" id="1L74NXECe_K" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                        <node concept="3NFfHV" id="1L74NXECe_L" role="1sPUBK">
-                          <node concept="3clFbS" id="1L74NXECe_M" role="2VODD2">
-                            <node concept="3clFbF" id="1L74NXECe_N" role="3cqZAp">
-                              <node concept="2OqwBi" id="1L74NXECe_O" role="3clFbG">
-                                <node concept="30H73N" id="1L74NXECe_P" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="1L74NXECe_Q" role="2OqNvi">
-                                  <node concept="3gmYPX" id="1L74NXECe_R" role="1xVPHs">
-                                    <node concept="3gn64h" id="1L74NXECe_S" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                    </node>
-                                    <node concept="3gn64h" id="1L74NXECe_T" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                    </node>
+                  </node>
+                  <node concept="37vLTw" id="4MEOIDFhlTJ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4MEOIDFhlSP" resolve="builder" />
+                    <node concept="1sPUBX" id="4MEOIDFhlTK" role="lGtFl">
+                      <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
+                      <node concept="3NFfHV" id="4MEOIDFhlTL" role="1sPUBK">
+                        <node concept="3clFbS" id="4MEOIDFhlTM" role="2VODD2">
+                          <node concept="3clFbF" id="4MEOIDFhlTN" role="3cqZAp">
+                            <node concept="2OqwBi" id="4MEOIDFhlTO" role="3clFbG">
+                              <node concept="30H73N" id="4MEOIDFhlTP" role="2Oq$k0" />
+                              <node concept="2Xjw5R" id="4MEOIDFhlTQ" role="2OqNvi">
+                                <node concept="3gmYPX" id="4MEOIDFhlTR" role="1xVPHs">
+                                  <node concept="3gn64h" id="4MEOIDFhlTS" role="3gmYPZ">
+                                    <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                  </node>
+                                  <node concept="3gn64h" id="4MEOIDFhlTT" role="3gmYPZ">
+                                    <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                   </node>
                                 </node>
                               </node>
@@ -16084,33 +16488,8 @@
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="1L74NXECdxu" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4JJCDImZq$z" resolve="builder" />
-                  <node concept="1sPUBX" id="1L74NXECdxv" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="1L74NXECdxw" role="1sPUBK">
-                      <node concept="3clFbS" id="1L74NXECdxx" role="2VODD2">
-                        <node concept="3clFbF" id="1L74NXECdxy" role="3cqZAp">
-                          <node concept="2OqwBi" id="1L74NXECdxz" role="3clFbG">
-                            <node concept="30H73N" id="1L74NXECdx$" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="1L74NXECdx_" role="2OqNvi">
-                              <node concept="3gmYPX" id="1L74NXECdxA" role="1xVPHs">
-                                <node concept="3gn64h" id="1L74NXECdxB" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="1L74NXECdxC" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+                <node concept="raruj" id="4MEOIDFhlTU" role="lGtFl" />
               </node>
-              <node concept="raruj" id="4JJCDImZu59" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -18269,7 +18648,7 @@
     <property role="TrG5h" value="frag_TypeTable_TypeTemplate" />
     <ref role="3gUMe" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
     <node concept="312cEu" id="1GNw78$HcGN" role="13RCb5">
-      <property role="TrG5h" value="_TypeTable" />
+      <property role="TrG5h" value="__TypeTable" />
       <node concept="2tJIrI" id="1GNw78$HcHb" role="jymVt" />
       <node concept="312cEu" id="4JJCDIm$yLt" role="jymVt">
         <property role="2bfB8j" value="false" />
@@ -18279,86 +18658,76 @@
           <property role="2bfB8j" value="false" />
           <property role="TrG5h" value="TypeConfig" />
           <node concept="2tJIrI" id="1GNw78$khpO" role="jymVt" />
-          <node concept="3clFbW" id="1GNw78$kQkd" role="jymVt">
-            <node concept="37vLTG" id="1GNw78$kU$4" role="3clF46">
+          <node concept="2YIFZL" id="4MEOIDGH8rn" role="jymVt">
+            <property role="TrG5h" value="forTypeNode" />
+            <node concept="37vLTG" id="4MEOIDGHboL" role="3clF46">
               <property role="TrG5h" value="typeNode" />
-              <node concept="3Tqbb2" id="1GNw78$kUC6" role="1tU5fm" />
-              <node concept="2ZBi8u" id="4KRwoemg3Gd" role="lGtFl">
+              <node concept="3Tqbb2" id="4MEOIDGHbsQ" role="1tU5fm" />
+              <node concept="2ZBi8u" id="4MEOIDGHmbS" role="lGtFl">
                 <ref role="2rW$FS" node="7IysFeAiAcO" resolve="typeDecl_typeNode_variable" />
               </node>
             </node>
-            <node concept="3cqZAl" id="1GNw78$kQkf" role="3clF45" />
-            <node concept="3Tm1VV" id="1GNw78$kQkg" role="1B3o_S" />
-            <node concept="3clFbS" id="1GNw78$kQkh" role="3clF47">
-              <node concept="3clFbF" id="1GNw78$moTh" role="3cqZAp">
-                <node concept="37vLTI" id="1GNw78$mqfR" role="3clFbG">
-                  <node concept="2OqwBi" id="1GNw78$mqud" role="37vLTx">
-                    <node concept="37vLTw" id="1GNw78$mqkK" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1GNw78$kU$4" resolve="typeNode" />
-                    </node>
-                    <node concept="2yIwOk" id="1GNw78$mq$A" role="2OqNvi" />
-                  </node>
-                  <node concept="2OqwBi" id="1GNw78$mpvN" role="37vLTJ">
-                    <node concept="Xjq3P" id="1GNw78$moTf" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="1GNw78$mpF5" role="2OqNvi">
-                      <ref role="2Oxat5" node="1GNw78$m5xx" resolve="typeConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1GNw78$lFOR" role="3cqZAp">
-                <node concept="37vLTI" id="1GNw78$lFOS" role="3clFbG">
-                  <node concept="2OqwBi" id="1GNw78$lFOT" role="37vLTx">
-                    <node concept="2ShNRf" id="1GNw78$lFOU" role="2Oq$k0">
-                      <node concept="YeOm9" id="1GNw78$lFOV" role="2ShVmc">
-                        <node concept="1Y3b0j" id="1GNw78$lFOW" role="YeSDq">
-                          <property role="2bfB8j" value="true" />
-                          <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
-                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <node concept="3Tm1VV" id="1GNw78$lFOX" role="1B3o_S" />
-                          <node concept="3clFb_" id="1GNw78$lFOY" role="jymVt">
-                            <property role="1EzhhJ" value="false" />
-                            <property role="TrG5h" value="get" />
-                            <node concept="3Tm1VV" id="1GNw78$lFOZ" role="1B3o_S" />
-                            <node concept="3uibUv" id="1GNw78$lFP0" role="3clF45">
-                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                              <node concept="29HgVG" id="1GNw78$lFP1" role="lGtFl">
-                                <node concept="3NFfHV" id="1GNw78$lFP2" role="3NFExx">
-                                  <node concept="3clFbS" id="1GNw78$lFP3" role="2VODD2">
-                                    <node concept="3clFbF" id="1GNw78$lFP4" role="3cqZAp">
-                                      <node concept="2OqwBi" id="1GNw78$lFP5" role="3clFbG">
-                                        <node concept="3TrEf2" id="1GNw78$lFP6" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
+            <node concept="3uibUv" id="20Ay2Ve9uJe" role="3clF45">
+              <ref role="3uigEE" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
+            </node>
+            <node concept="3Tm1VV" id="4MEOIDGH8rq" role="1B3o_S" />
+            <node concept="3clFbS" id="4MEOIDGH8rr" role="3clF47">
+              <node concept="3clFbF" id="4MEOIDGHbyZ" role="3cqZAp">
+                <node concept="2ShNRf" id="4MEOIDGHbyX" role="3clFbG">
+                  <node concept="1pGfFk" id="4MEOIDGHc5A" role="2ShVmc">
+                    <ref role="37wK5l" node="1GNw78$kUFK" resolve="__TypeTable._Template.TypeConfig" />
+                    <node concept="2OqwBi" id="4MEOIDGHc9G" role="37wK5m">
+                      <node concept="2ShNRf" id="4MEOIDGHc9H" role="2Oq$k0">
+                        <node concept="YeOm9" id="4MEOIDGHc9I" role="2ShVmc">
+                          <node concept="1Y3b0j" id="4MEOIDGHc9J" role="YeSDq">
+                            <property role="2bfB8j" value="true" />
+                            <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
+                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                            <node concept="3Tm1VV" id="4MEOIDGHc9K" role="1B3o_S" />
+                            <node concept="3clFb_" id="4MEOIDGHc9L" role="jymVt">
+                              <property role="1EzhhJ" value="false" />
+                              <property role="TrG5h" value="get" />
+                              <node concept="3Tm1VV" id="4MEOIDGHc9M" role="1B3o_S" />
+                              <node concept="3uibUv" id="4MEOIDGHc9N" role="3clF45">
+                                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                                <node concept="29HgVG" id="4MEOIDGHc9O" role="lGtFl">
+                                  <node concept="3NFfHV" id="4MEOIDGHc9P" role="3NFExx">
+                                    <node concept="3clFbS" id="4MEOIDGHc9Q" role="2VODD2">
+                                      <node concept="3clFbF" id="4MEOIDGHc9R" role="3cqZAp">
+                                        <node concept="2OqwBi" id="4MEOIDGHc9S" role="3clFbG">
+                                          <node concept="3TrEf2" id="4MEOIDGHc9T" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
+                                          </node>
+                                          <node concept="30H73N" id="4MEOIDGHc9U" role="2Oq$k0" />
                                         </node>
-                                        <node concept="30H73N" id="1GNw78$lFP7" role="2Oq$k0" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="3clFbS" id="1GNw78$lFP8" role="3clF47">
-                              <node concept="3clFbF" id="1GNw78$lFP9" role="3cqZAp">
-                                <node concept="10Nm6u" id="1GNw78$lFPa" role="3clFbG" />
-                                <node concept="2b32R4" id="1GNw78$lFPb" role="lGtFl">
-                                  <node concept="3JmXsc" id="1GNw78$lFPc" role="2P8S$">
-                                    <node concept="3clFbS" id="1GNw78$lFPd" role="2VODD2">
-                                      <node concept="3clFbF" id="1GNw78$lFPe" role="3cqZAp">
-                                        <node concept="2OqwBi" id="1GNw78$lFPf" role="3clFbG">
-                                          <node concept="2OqwBi" id="1GNw78$lFPg" role="2Oq$k0">
-                                            <node concept="2OqwBi" id="1GNw78$lFPh" role="2Oq$k0">
-                                              <node concept="30H73N" id="1GNw78$lFPi" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="1GNw78$lFPj" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
+                              <node concept="3clFbS" id="4MEOIDGHc9V" role="3clF47">
+                                <node concept="3clFbF" id="4MEOIDGHc9W" role="3cqZAp">
+                                  <node concept="10Nm6u" id="4MEOIDGHc9X" role="3clFbG" />
+                                  <node concept="2b32R4" id="4MEOIDGHc9Y" role="lGtFl">
+                                    <node concept="3JmXsc" id="4MEOIDGHc9Z" role="2P8S$">
+                                      <node concept="3clFbS" id="4MEOIDGHca0" role="2VODD2">
+                                        <node concept="3clFbF" id="4MEOIDGHca1" role="3cqZAp">
+                                          <node concept="2OqwBi" id="4MEOIDGHca2" role="3clFbG">
+                                            <node concept="2OqwBi" id="4MEOIDGHca3" role="2Oq$k0">
+                                              <node concept="2OqwBi" id="4MEOIDGHca4" role="2Oq$k0">
+                                                <node concept="30H73N" id="4MEOIDGHca5" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="4MEOIDGHca6" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="4MEOIDGHca7" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
                                               </node>
                                             </node>
-                                            <node concept="3TrEf2" id="1GNw78$lFPk" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
+                                            <node concept="3Tsc0h" id="4MEOIDGHca8" role="2OqNvi">
+                                              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
                                             </node>
                                           </node>
-                                          <node concept="3Tsc0h" id="1GNw78$lFPl" role="2OqNvi">
-                                            <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -18366,18 +18735,18 @@
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="3uibUv" id="1GNw78$lFPm" role="2Ghqu4">
-                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                            <node concept="29HgVG" id="1GNw78$lFPn" role="lGtFl">
-                              <node concept="3NFfHV" id="1GNw78$lFPo" role="3NFExx">
-                                <node concept="3clFbS" id="1GNw78$lFPp" role="2VODD2">
-                                  <node concept="3clFbF" id="1GNw78$lFPq" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1GNw78$lFPr" role="3clFbG">
-                                      <node concept="3TrEf2" id="1GNw78$lFPs" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
+                            <node concept="3uibUv" id="4MEOIDGHca9" role="2Ghqu4">
+                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                              <node concept="29HgVG" id="4MEOIDGHcaa" role="lGtFl">
+                                <node concept="3NFfHV" id="4MEOIDGHcab" role="3NFExx">
+                                  <node concept="3clFbS" id="4MEOIDGHcac" role="2VODD2">
+                                    <node concept="3clFbF" id="4MEOIDGHcad" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4MEOIDGHcae" role="3clFbG">
+                                        <node concept="3TrEf2" id="4MEOIDGHcaf" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
+                                        </node>
+                                        <node concept="30H73N" id="4MEOIDGHcag" role="2Oq$k0" />
                                       </node>
-                                      <node concept="30H73N" id="1GNw78$lFPt" role="2Oq$k0" />
                                     </node>
                                   </node>
                                 </node>
@@ -18385,27 +18754,38 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="1W57fq" id="4MEOIDGHA0Q" role="lGtFl">
+                          <node concept="3IZrLx" id="4MEOIDGHA0S" role="3IZSJc">
+                            <node concept="3clFbS" id="4MEOIDGHA0U" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDGHBiY" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDGHCNw" role="3clFbG">
+                                  <node concept="2OqwBi" id="4MEOIDGHByX" role="2Oq$k0">
+                                    <node concept="30H73N" id="4MEOIDGHBiX" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="4MEOIDGHCix" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
+                                    </node>
+                                  </node>
+                                  <node concept="3x8VRR" id="4MEOIDGHDmN" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="gft3U" id="4MEOIDGHDFj" role="UU_$l">
+                            <node concept="10Nm6u" id="4MEOIDGHEtU" role="gfFT$" />
+                          </node>
+                        </node>
                       </node>
-                    </node>
-                    <node concept="liA8E" id="1GNw78$lFPu" role="2OqNvi">
-                      <ref role="37wK5l" node="1GNw78$lFOY" resolve="get" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1GNw78$lFPv" role="37vLTJ">
-                    <node concept="Xjq3P" id="1GNw78$lFPw" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="1GNw78$lFPx" role="2OqNvi">
-                      <ref role="2Oxat5" node="1GNw78$lpLZ" resolve="param" />
-                      <node concept="1ZhdrF" id="60NbDCXHMjG" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
-                        <property role="2qtEX8" value="fieldDeclaration" />
-                        <node concept="3$xsQk" id="60NbDCXHMjH" role="3$ytzL">
-                          <node concept="3clFbS" id="60NbDCXHMjI" role="2VODD2">
-                            <node concept="3clFbF" id="60NbDCXHP4f" role="3cqZAp">
-                              <node concept="2OqwBi" id="60NbDCXHPC0" role="3clFbG">
-                                <node concept="1iwH7S" id="60NbDCXHP4e" role="2Oq$k0" />
-                                <node concept="1iwH70" id="60NbDCXHPQn" role="2OqNvi">
-                                  <ref role="1iwH77" node="7IysFeAaXEh" resolve="typeParam_field" />
-                                  <node concept="30H73N" id="60NbDCXHQ4m" role="1iwH7V" />
+                      <node concept="liA8E" id="4MEOIDGHcah" role="2OqNvi">
+                        <ref role="37wK5l" node="4MEOIDGHc9L" resolve="get" />
+                      </node>
+                      <node concept="1WS0z7" id="4MEOIDGHsEN" role="lGtFl">
+                        <node concept="3JmXsc" id="4MEOIDGHsEP" role="3Jn$fo">
+                          <node concept="3clFbS" id="4MEOIDGHsER" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDGHtH6" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDGHulc" role="3clFbG">
+                                <node concept="30H73N" id="4MEOIDGHtH5" role="2Oq$k0" />
+                                <node concept="3Tsc0h" id="4MEOIDGHviP" role="2OqNvi">
+                                  <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
                                 </node>
                               </node>
                             </node>
@@ -18415,63 +18795,14 @@
                     </node>
                   </node>
                 </node>
-                <node concept="1WS0z7" id="1GNw78$lFPy" role="lGtFl">
-                  <node concept="3JmXsc" id="1GNw78$lFPz" role="3Jn$fo">
-                    <node concept="3clFbS" id="1GNw78$lFP$" role="2VODD2">
-                      <node concept="3clFbF" id="1GNw78$lFP_" role="3cqZAp">
-                        <node concept="2OqwBi" id="1GNw78$lFPA" role="3clFbG">
-                          <node concept="3Tsc0h" id="1GNw78$lFPB" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                          </node>
-                          <node concept="30H73N" id="1GNw78$lFPC" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="1GNw78$lFPD" role="lGtFl">
-                  <node concept="3IZrLx" id="1GNw78$lFPE" role="3IZSJc">
-                    <node concept="3clFbS" id="1GNw78$lFPF" role="2VODD2">
-                      <node concept="3clFbF" id="1GNw78$lFPG" role="3cqZAp">
-                        <node concept="2OqwBi" id="1GNw78$lFPH" role="3clFbG">
-                          <node concept="2OqwBi" id="1GNw78$lFPI" role="2Oq$k0">
-                            <node concept="30H73N" id="1GNw78$lFPJ" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="1GNw78$lFPK" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
-                            </node>
-                          </node>
-                          <node concept="3x8VRR" id="1GNw78$lFPL" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1GNw78$rvjX" role="3cqZAp">
-                <node concept="1rXfSq" id="1GNw78$rvjV" role="3clFbG">
-                  <ref role="37wK5l" node="1GNw78$ri7u" resolve="init" />
-                </node>
               </node>
             </node>
           </node>
-          <node concept="2tJIrI" id="1GNw78$kYVP" role="jymVt" />
+          <node concept="2tJIrI" id="4MEOIDGH5Ef" role="jymVt" />
           <node concept="3clFbW" id="1GNw78$kUFK" role="jymVt">
             <node concept="3cqZAl" id="1GNw78$kUFN" role="3clF45" />
             <node concept="3Tm1VV" id="1GNw78$kUFO" role="1B3o_S" />
             <node concept="3clFbS" id="1GNw78$kUFP" role="3clF47">
-              <node concept="3clFbF" id="1GNw78$ms8e" role="3cqZAp">
-                <node concept="37vLTI" id="1GNw78$mtmO" role="3clFbG">
-                  <node concept="37vLTw" id="1GNw78$mtrN" role="37vLTx">
-                    <ref role="3cqZAo" node="1GNw78$mqA_" resolve="typeConcept" />
-                  </node>
-                  <node concept="2OqwBi" id="1GNw78$ms_J" role="37vLTJ">
-                    <node concept="Xjq3P" id="1GNw78$ms8c" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="1GNw78$mt7T" role="2OqNvi">
-                      <ref role="2Oxat5" node="1GNw78$m5xx" resolve="typeConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
               <node concept="3clFbJ" id="1GNw78$lynN" role="3cqZAp">
                 <node concept="3clFbS" id="1GNw78$lynO" role="3clFbx">
                   <node concept="3clFbF" id="1GNw78$lynP" role="3cqZAp">
@@ -18567,10 +18898,6 @@
                 </node>
               </node>
             </node>
-            <node concept="37vLTG" id="1GNw78$mqA_" role="3clF46">
-              <property role="TrG5h" value="typeConcept" />
-              <node concept="3bZ5Sz" id="1GNw78$mrm5" role="1tU5fm" />
-            </node>
             <node concept="37vLTG" id="1GNw78$l3fp" role="3clF46">
               <property role="TrG5h" value="args" />
               <node concept="8X2XB" id="1GNw78$l3N7" role="1tU5fm">
@@ -18584,99 +18911,133 @@
             </node>
           </node>
           <node concept="2tJIrI" id="4KRwoem6ilI" role="jymVt" />
-          <node concept="3clFb_" id="60NbDCXHBm_" role="jymVt">
-            <property role="TrG5h" value="setPattern" />
-            <node concept="3cqZAl" id="60NbDCXHBmB" role="3clF45" />
-            <node concept="3Tmbuc" id="60NbDCXHEbO" role="1B3o_S" />
-            <node concept="3clFbS" id="60NbDCXHBmD" role="3clF47">
-              <node concept="3clFbF" id="60NbDCXHLw0" role="3cqZAp">
-                <node concept="37vLTI" id="60NbDCXHMd9" role="3clFbG">
-                  <node concept="3clFbT" id="60NbDCXHMgN" role="37vLTx">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                  <node concept="2OqwBi" id="60NbDCXHLE_" role="37vLTJ">
-                    <node concept="Xjq3P" id="60NbDCXHLvZ" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="60NbDCXHLMw" role="2OqNvi">
-                      <ref role="2Oxat5" node="4KRwoelXmCt" resolve="pattern" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="1GNw78$khr2" role="jymVt" />
-          <node concept="3clFb_" id="1GNw78$gR0l" role="jymVt">
-            <property role="TrG5h" value="feature" />
-            <node concept="3uibUv" id="1GNw78$gR0o" role="3clF45">
+          <node concept="3clFb_" id="4MEOIDGBueD" role="jymVt">
+            <property role="TrG5h" value="typeNode" />
+            <node concept="3uibUv" id="4MEOIDGBCUY" role="3clF45">
               <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
-            <node concept="3Tmbuc" id="1GNw78$gR0p" role="1B3o_S" />
-            <node concept="3clFbS" id="1GNw78$gR0q" role="3clF47">
-              <node concept="3clFbJ" id="4KRwoelXsfZ" role="3cqZAp">
-                <node concept="3clFbS" id="4KRwoelXsg1" role="3clFbx">
-                  <node concept="3cpWs6" id="4KRwoelXskT" role="3cqZAp">
-                    <node concept="10Nm6u" id="1GNw78$gWvB" role="3cqZAk">
-                      <node concept="1sPUBX" id="1GNw78$gWvC" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXFaLHB" resolve="type_term_pattern" />
+            <node concept="3Tmbuc" id="4MEOIDGBx0G" role="1B3o_S" />
+            <node concept="3clFbS" id="4MEOIDGBueH" role="3clF47">
+              <node concept="3clFbF" id="4MEOIDGCfiE" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDGCfiG" role="3clFbG">
+                  <node concept="1eOMI4" id="4MEOIDGCfiH" role="2Oq$k0">
+                    <node concept="1nCR9W" id="4MEOIDGCfiI" role="1eOMHV">
+                      <property role="1nD$Q0" value="TermDeclaration" />
+                      <node concept="3clFbT" id="4MEOIDGCfiJ" role="2U2pNA" />
+                      <node concept="2OqwBi" id="4MEOIDGCm7c" role="2U2pNA">
+                        <node concept="Xjq3P" id="4MEOIDGClN8" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="4MEOIDGCm_T" role="2OqNvi">
+                          <ref role="2Oxat5" node="1GNw78$lpLZ" resolve="param" />
+                          <node concept="1ZhdrF" id="4MEOIDGCq5t" role="lGtFl">
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                            <property role="2qtEX8" value="fieldDeclaration" />
+                            <node concept="3$xsQk" id="4MEOIDGCq5u" role="3$ytzL">
+                              <node concept="3clFbS" id="4MEOIDGCq5v" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDGCqBg" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDGCqBh" role="3clFbG">
+                                    <node concept="1iwH7S" id="4MEOIDGCqBi" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4MEOIDGCqBj" role="2OqNvi">
+                                      <ref role="1iwH77" node="7IysFeAaXEh" resolve="typeParam_field" />
+                                      <node concept="30H73N" id="4MEOIDGCMnB" role="1iwH7V" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1WS0z7" id="4MEOIDGCmHs" role="lGtFl">
+                          <node concept="3JmXsc" id="4MEOIDGCmHu" role="3Jn$fo">
+                            <node concept="3clFbS" id="4MEOIDGCmHw" role="2VODD2">
+                              <node concept="3clFbF" id="4MEOIDGCpt4" role="3cqZAp">
+                                <node concept="2OqwBi" id="4MEOIDGCpt7" role="3clFbG">
+                                  <node concept="30H73N" id="4MEOIDGCpt8" role="2Oq$k0" />
+                                  <node concept="3Tsc0h" id="4MEOIDGCsZh" role="2OqNvi">
+                                    <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1W57fq" id="4MEOIDGCt$g" role="lGtFl">
+                          <node concept="3IZrLx" id="4MEOIDGCt$i" role="3IZSJc">
+                            <node concept="3clFbS" id="4MEOIDGCt$k" role="2VODD2">
+                              <node concept="3cpWs8" id="4MEOIDGCJ5R" role="3cqZAp">
+                                <node concept="3cpWsn" id="4MEOIDGCJ5S" role="3cpWs9">
+                                  <property role="TrG5h" value="termArgsSize" />
+                                  <node concept="10Oyi0" id="4MEOIDGCJ5H" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="4MEOIDGCJ5T" role="33vP2m">
+                                    <node concept="2OqwBi" id="4MEOIDGCJ5U" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4MEOIDGCJ5V" role="2Oq$k0">
+                                        <node concept="1PxgMI" id="4MEOIDGCJ5W" role="2Oq$k0">
+                                          <ref role="1m5ApE" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+                                          <node concept="2OqwBi" id="4MEOIDGCJ5X" role="1m5AlR">
+                                            <node concept="30H73N" id="4MEOIDGCJ5Y" role="2Oq$k0" />
+                                            <node concept="1mfA1w" id="4MEOIDGCJ5Z" role="2OqNvi" />
+                                          </node>
+                                        </node>
+                                        <node concept="3TrEf2" id="4MEOIDGCJ60" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                        </node>
+                                      </node>
+                                      <node concept="3Tsc0h" id="4MEOIDGCJ61" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                                      </node>
+                                    </node>
+                                    <node concept="34oBXx" id="4MEOIDGCJ62" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4MEOIDGCErC" role="3cqZAp">
+                                <node concept="3eOVzh" id="4MEOIDGCIe1" role="3clFbG">
+                                  <node concept="37vLTw" id="4MEOIDGCKV6" role="3uHU7w">
+                                    <ref role="3cqZAo" node="4MEOIDGCJ5S" resolve="termArgsSize" />
+                                  </node>
+                                  <node concept="2OqwBi" id="4MEOIDGCEO4" role="3uHU7B">
+                                    <node concept="30H73N" id="4MEOIDGCErA" role="2Oq$k0" />
+                                    <node concept="2bSWHS" id="4MEOIDGCFym" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4KRwoelXCWg" role="3cqZAp" />
-                </node>
-                <node concept="37vLTw" id="4KRwoelXsi2" role="3clFbw">
-                  <ref role="3cqZAo" node="4KRwoelXmCt" resolve="pattern" />
-                </node>
-                <node concept="9aQIb" id="4KRwoelXHMt" role="9aQIa">
-                  <node concept="3clFbS" id="4KRwoelXHMu" role="9aQI4">
-                    <node concept="3cpWs6" id="4KRwoelXKet" role="3cqZAp">
-                      <node concept="10Nm6u" id="4KRwoelXKgp" role="3cqZAk">
-                        <node concept="1sPUBX" id="4KRwoelXP4K" role="lGtFl">
-                          <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+                      <node concept="3uibUv" id="4MEOIDGCfiW" role="2lIhxL">
+                        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                      </node>
+                      <node concept="17Uvod" id="4MEOIDGCfiX" role="lGtFl">
+                        <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                        <property role="2qtEX9" value="fqClassName" />
+                        <node concept="3zFVjK" id="4MEOIDGCfiY" role="3zH0cK">
+                          <node concept="3clFbS" id="4MEOIDGCfiZ" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDGCfj0" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDGCfj1" role="3clFbG">
+                                <node concept="2OqwBi" id="4MEOIDGCfj2" role="2Oq$k0">
+                                  <node concept="30H73N" id="4MEOIDGCfj4" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="4MEOIDGCfj6" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                                  </node>
+                                </node>
+                                <node concept="2qgKlT" id="4MEOIDGCfj7" role="2OqNvi">
+                                  <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1WS0z7" id="1GNw78$gR0v" role="lGtFl">
-              <ref role="2rW$FS" node="1L74NXG7ihq" resolve="typeFeature_method" />
-              <node concept="3JmXsc" id="1GNw78$gR0w" role="3Jn$fo">
-                <node concept="3clFbS" id="1GNw78$gR0x" role="2VODD2">
-                  <node concept="3clFbF" id="1GNw78$gR0y" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$gR0z" role="3clFbG">
-                      <node concept="2OqwBi" id="1GNw78$gR0$" role="2Oq$k0">
-                        <node concept="30H73N" id="1GNw78$gR0_" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="1GNw78$gR0A" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="1GNw78$gR0B" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="17Uvod" id="1GNw78$gR0C" role="lGtFl">
-              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-              <property role="2qtEX9" value="name" />
-              <node concept="3zFVjK" id="1GNw78$gR0D" role="3zH0cK">
-                <node concept="3clFbS" id="1GNw78$gR0E" role="2VODD2">
-                  <node concept="3clFbF" id="1GNw78$gR0F" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$gR0G" role="3clFbG">
-                      <node concept="30H73N" id="1GNw78$gR0H" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="1GNw78$gR0I" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
+                  <node concept="liA8E" id="4MEOIDGCfj8" role="2OqNvi">
+                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="2tJIrI" id="1GNw78$lluY" role="jymVt" />
+          <node concept="2tJIrI" id="4MEOIDGBrv_" role="jymVt" />
           <node concept="3clFb_" id="1GNw78$ri7u" role="jymVt">
             <property role="TrG5h" value="init" />
             <node concept="3cqZAl" id="1GNw78$ri7v" role="3clF45" />
@@ -18804,158 +19165,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="4KRwoelno36" role="3cqZAp">
-                <node concept="3cpWsn" id="4KRwoelno37" role="3cpWs9">
-                  <property role="TrG5h" value="altLogicalValue" />
-                  <node concept="26uTi9" id="4KRwoelno38" role="1tU5fm" />
-                  <node concept="10Nm6u" id="4KRwoelno39" role="33vP2m">
-                    <node concept="1W57fq" id="4KRwoelno3a" role="lGtFl">
-                      <node concept="3IZrLx" id="4KRwoelno3b" role="3IZSJc">
-                        <node concept="3clFbS" id="4KRwoelno3c" role="2VODD2">
-                          <node concept="3clFbF" id="4KRwoelno3d" role="3cqZAp">
-                            <node concept="2OqwBi" id="4KRwoelno3e" role="3clFbG">
-                              <node concept="2OqwBi" id="4KRwoelno3f" role="2Oq$k0">
-                                <node concept="2OqwBi" id="4KRwoelno3g" role="2Oq$k0">
-                                  <node concept="30H73N" id="4KRwoelno3h" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="4KRwoelno3i" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="init" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="4KRwoelno3j" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:7IysFeA9D7k" resolve="altBlock" />
-                                </node>
-                              </node>
-                              <node concept="3x8VRR" id="4KRwoelno3k" role="2OqNvi" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="gft3U" id="4KRwoelno3l" role="UU_$l">
-                        <node concept="10Nm6u" id="4KRwoelno3m" role="gfFT$" />
-                      </node>
-                    </node>
-                    <node concept="29HgVG" id="4KRwoelno3n" role="lGtFl">
-                      <node concept="3NFfHV" id="4KRwoelno3o" role="3NFExx">
-                        <node concept="3clFbS" id="4KRwoelno3p" role="2VODD2">
-                          <node concept="3clFbF" id="4KRwoelno3q" role="3cqZAp">
-                            <node concept="2OqwBi" id="4KRwoelno3r" role="3clFbG">
-                              <node concept="2OqwBi" id="4KRwoelno3s" role="2Oq$k0">
-                                <node concept="3TrEf2" id="4KRwoelno3t" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="init" />
-                                </node>
-                                <node concept="30H73N" id="4KRwoelno3u" role="2Oq$k0" />
-                              </node>
-                              <node concept="3TrEf2" id="4KRwoelno3v" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:7IysFeA9D7k" resolve="altBlock" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="4KRwoelno3w" role="3cqZAp">
-                <node concept="3clFbS" id="4KRwoelno3x" role="3clFbx">
-                  <node concept="3clFbF" id="4KRwoelno3y" role="3cqZAp">
-                    <node concept="2OqwBi" id="4KRwoelno3z" role="3clFbG">
-                      <node concept="37vLTw" id="4KRwoelno3$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4KRwoelno2F" resolve="builder" />
-                      </node>
-                      <node concept="liA8E" id="4KRwoelno3_" role="2OqNvi">
-                        <ref role="37wK5l" to="nz6g:7eGEHDlc$aw" resolve="appendBody" />
-                        <node concept="2OqwBi" id="4KRwoelno3A" role="37wK5m">
-                          <node concept="2OqwBi" id="4KRwoelno3B" role="2Oq$k0">
-                            <node concept="2ShNRf" id="4KRwoelno3C" role="2Oq$k0">
-                              <node concept="1pGfFk" id="4KRwoelno3D" role="2ShVmc">
-                                <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
-                                <node concept="10M0yZ" id="4KRwoelno3E" role="37wK5m">
-                                  <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-                                  <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="4KRwoelno3F" role="2OqNvi">
-                              <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
-                              <node concept="37vLTw" id="4KRwoelxDKM" role="37wK5m">
-                                <ref role="3cqZAo" node="4KRwoelnkwd" resolve="typeLogical" />
-                              </node>
-                              <node concept="37vLTw" id="4KRwoelno3H" role="37wK5m">
-                                <ref role="3cqZAo" node="4KRwoelno37" resolve="altLogicalValue" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4KRwoelno3I" role="2OqNvi">
-                            <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4KRwoelno3J" role="3cqZAp" />
-                </node>
-                <node concept="3y3z36" id="4KRwoelno3K" role="3clFbw">
-                  <node concept="10Nm6u" id="4KRwoelno3L" role="3uHU7w" />
-                  <node concept="37vLTw" id="4KRwoelno3M" role="3uHU7B">
-                    <ref role="3cqZAo" node="4KRwoelno37" resolve="altLogicalValue" />
-                  </node>
-                </node>
-                <node concept="9aQIb" id="4KRwoelno3N" role="9aQIa">
-                  <node concept="3clFbS" id="4KRwoelno3O" role="9aQI4">
-                    <node concept="3clFbF" id="4KRwoelno3P" role="3cqZAp">
-                      <node concept="2OqwBi" id="4KRwoelno3Q" role="3clFbG">
-                        <node concept="37vLTw" id="4KRwoelno3R" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4KRwoelno2F" resolve="builder" />
-                        </node>
-                        <node concept="liA8E" id="4KRwoelno3S" role="2OqNvi">
-                          <ref role="37wK5l" to="nz6g:7eGEHDlc$aw" resolve="appendBody" />
-                          <node concept="2OqwBi" id="4KRwoelno3T" role="37wK5m">
-                            <node concept="2OqwBi" id="4KRwoelno3U" role="2Oq$k0">
-                              <node concept="2ShNRf" id="4KRwoelno3V" role="2Oq$k0">
-                                <node concept="1pGfFk" id="4KRwoelno3W" role="2ShVmc">
-                                  <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
-                                  <node concept="10M0yZ" id="4KRwoelno3X" role="37wK5m">
-                                    <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-                                    <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="4KRwoelno3Y" role="2OqNvi">
-                                <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
-                                <node concept="37vLTw" id="4KRwoelxDrz" role="37wK5m">
-                                  <ref role="3cqZAo" node="4KRwoelnkwd" resolve="typeLogical" />
-                                </node>
-                                <node concept="10Nm6u" id="4KRwoelno40" role="37wK5m">
-                                  <node concept="1sPUBX" id="4KRwoelno41" role="lGtFl">
-                                    <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
-                                    <node concept="3NFfHV" id="4KRwoelno42" role="1sPUBK">
-                                      <node concept="3clFbS" id="4KRwoelno43" role="2VODD2">
-                                        <node concept="3clFbF" id="4KRwoelno44" role="3cqZAp">
-                                          <node concept="2OqwBi" id="4KRwoelno45" role="3clFbG">
-                                            <node concept="30H73N" id="4KRwoelno46" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="4KRwoelno47" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="4KRwoelno48" role="2OqNvi">
-                              <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4KRwoelno2S" role="3cqZAp" />
+              <node concept="3clFbH" id="4MEOIDEEkJ_" role="3cqZAp" />
               <node concept="3clFbH" id="4KRwoelno2T" role="3cqZAp">
                 <node concept="2b32R4" id="4KRwoelno2U" role="lGtFl">
                   <node concept="3JmXsc" id="4KRwoelno2V" role="2P8S$">
@@ -19043,14 +19253,6 @@
               </node>
             </node>
           </node>
-          <node concept="312cEg" id="1GNw78$m5xx" role="jymVt">
-            <property role="TrG5h" value="typeConcept" />
-            <node concept="3Tmbuc" id="1GNw78$rtHA" role="1B3o_S" />
-            <node concept="3bZ5Sz" id="1GNw78$m5xz" role="1tU5fm" />
-            <node concept="2ZBi8u" id="4KRwoemfDH8" role="lGtFl">
-              <ref role="2rW$FS" node="4JJCDImI6Rx" resolve="typeConcept_field" />
-            </node>
-          </node>
           <node concept="312cEg" id="4KRwoemkfTN" role="jymVt">
             <property role="TrG5h" value="logical" />
             <node concept="3Tmbuc" id="4KRwoemkyyc" role="1B3o_S" />
@@ -19097,18 +19299,7 @@
               <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
             </node>
           </node>
-          <node concept="312cEg" id="4KRwoelXmCt" role="jymVt">
-            <property role="34CwA1" value="false" />
-            <property role="eg7rD" value="false" />
-            <property role="TrG5h" value="pattern" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3Tm6S6" id="4KRwoelXioj" role="1B3o_S" />
-            <node concept="10P_77" id="4KRwoelXmC1" role="1tU5fm" />
-            <node concept="3clFbT" id="4KRwoelXpC8" role="33vP2m">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-          <node concept="2tJIrI" id="1GNw78$llvH" role="jymVt" />
+          <node concept="2tJIrI" id="4MEOIDGDRuv" role="jymVt" />
           <node concept="3Tm1VV" id="1GNw78$gMhm" role="1B3o_S" />
           <node concept="2ZBi8u" id="4KRwoelEyRO" role="lGtFl">
             <ref role="2rW$FS" node="4KRwoelEhiP" resolve="typeDecl_template_config" />
@@ -19120,20 +19311,9 @@
         <node concept="2tJIrI" id="1GNw78$gI1a" role="jymVt" />
         <node concept="2tJIrI" id="1GNw78$gI1L" role="jymVt" />
         <node concept="3clFbW" id="4JJCDIm$QjW" role="jymVt">
-          <node concept="37vLTG" id="4JJCDIm$RGu" role="3clF46">
-            <property role="TrG5h" value="typeConcept" />
-            <node concept="3bZ5Sz" id="4JJCDIm$RGv" role="1tU5fm" />
-          </node>
           <node concept="3cqZAl" id="4JJCDIm$QjY" role="3clF45" />
           <node concept="3Tm1VV" id="4JJCDIm$QjZ" role="1B3o_S" />
-          <node concept="3clFbS" id="4JJCDIm$Qk0" role="3clF47">
-            <node concept="XkiVB" id="4JJCDIm$RJA" role="3cqZAp">
-              <ref role="37wK5l" to="psr6:7IysFeAhRJB" resolve="AbstractTypeTemplate" />
-              <node concept="37vLTw" id="4JJCDIm$RJB" role="37wK5m">
-                <ref role="3cqZAo" node="4JJCDIm$RGu" resolve="typeConcept" />
-              </node>
-            </node>
-          </node>
+          <node concept="3clFbS" id="4JJCDIm$Qk0" role="3clF47" />
           <node concept="2ZBi8u" id="4JJCDIm_tMI" role="lGtFl">
             <ref role="2rW$FS" node="4JJCDIm$O$I" resolve="typeDecl_template_constructor" />
           </node>
@@ -19161,7 +19341,7 @@
         <node concept="3uibUv" id="4JJCDIm$SaN" role="1zkMxy">
           <ref role="3uigEE" to="psr6:1hX44vNlvEV" resolve="AbstractTypeTemplate" />
           <node concept="3uibUv" id="1GNw78$kyyL" role="11_B2D">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
+            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
           </node>
         </node>
         <node concept="2tJIrI" id="60NbDCXHpqs" role="jymVt" />
@@ -19177,17 +19357,14 @@
             </node>
           </node>
           <node concept="3uibUv" id="4KRwoelAK4n" role="3clF45">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
+            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
           </node>
           <node concept="3Tm1VV" id="4KRwoelAK4l" role="1B3o_S" />
           <node concept="3clFbS" id="4KRwoelAK4o" role="3clF47">
             <node concept="3clFbF" id="4KRwoelAVUv" role="3cqZAp">
               <node concept="2ShNRf" id="4KRwoelAVUw" role="3clFbG">
                 <node concept="1pGfFk" id="4KRwoelAVUx" role="2ShVmc">
-                  <ref role="37wK5l" node="1GNw78$kUFK" resolve="_TypeTable._Template.TypeConfig" />
-                  <node concept="37vLTw" id="4KRwoelAWs6" role="37wK5m">
-                    <ref role="3cqZAo" to="psr6:7IysFeAhSvd" resolve="typeConcept" />
-                  </node>
+                  <ref role="37wK5l" node="1GNw78$kUFK" resolve="__TypeTable._Template.TypeConfig" />
                   <node concept="37vLTw" id="4KRwoelAWIE" role="37wK5m">
                     <ref role="3cqZAo" node="4KRwoelAK4h" resolve="args" />
                   </node>
@@ -19208,17 +19385,16 @@
             <node concept="3Tqbb2" id="4KRwoelAK49" role="1tU5fm" />
           </node>
           <node concept="3uibUv" id="4KRwoelAK4d" role="3clF45">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
+            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
           </node>
           <node concept="3Tmbuc" id="60NbDCXHfR8" role="1B3o_S" />
           <node concept="3clFbS" id="4KRwoelAK4e" role="3clF47">
-            <node concept="3clFbF" id="4KRwoelASMD" role="3cqZAp">
-              <node concept="2ShNRf" id="4KRwoelASMB" role="3clFbG">
-                <node concept="1pGfFk" id="4KRwoelAVGV" role="2ShVmc">
-                  <ref role="37wK5l" node="1GNw78$kQkd" resolve="_TypeTable._Template.TypeConfig" />
-                  <node concept="37vLTw" id="4KRwoelAVKR" role="37wK5m">
-                    <ref role="3cqZAo" node="4KRwoelAK48" resolve="typeNode" />
-                  </node>
+            <node concept="3cpWs6" id="20Ay2Ve9Vq_" role="3cqZAp">
+              <node concept="2YIFZM" id="20Ay2Ve9VqA" role="3cqZAk">
+                <ref role="37wK5l" node="4MEOIDGH8rn" resolve="forTypeNode" />
+                <ref role="1Pybhc" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
+                <node concept="37vLTw" id="20Ay2Ve9VqB" role="37wK5m">
+                  <ref role="3cqZAo" node="4KRwoelAK48" resolve="typeNode" />
                 </node>
               </node>
             </node>
@@ -19227,161 +19403,66 @@
             <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
           </node>
         </node>
-        <node concept="2tJIrI" id="4KRwoelAN00" role="jymVt" />
-        <node concept="3clFb_" id="4KRwoelAK4q" role="jymVt">
-          <property role="TrG5h" value="asPattern" />
+        <node concept="2tJIrI" id="4MEOIDG_fi5" role="jymVt" />
+        <node concept="3clFb_" id="4MEOIDG_iAp" role="jymVt">
           <property role="1EzhhJ" value="false" />
-          <node concept="3uibUv" id="4KRwoelAK4u" role="3clF45">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
-          </node>
-          <node concept="3Tmbuc" id="60NbDCXFYu7" role="1B3o_S" />
-          <node concept="3clFbS" id="4KRwoelAK4v" role="3clF47">
-            <node concept="3cpWs8" id="60NbDCXI2vN" role="3cqZAp">
-              <node concept="3cpWsn" id="60NbDCXI2vO" role="3cpWs9">
-                <property role="TrG5h" value="config" />
-                <node concept="3uibUv" id="60NbDCXI2vL" role="1tU5fm">
-                  <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
-                </node>
-                <node concept="2ShNRf" id="60NbDCXI2vP" role="33vP2m">
-                  <node concept="1pGfFk" id="60NbDCXI2vQ" role="2ShVmc">
-                    <ref role="37wK5l" node="1GNw78$kUFK" resolve="_TypeTable._Template.TypeConfig" />
-                    <node concept="37vLTw" id="60NbDCXI2vR" role="37wK5m">
-                      <ref role="3cqZAo" to="psr6:7IysFeAhSvd" resolve="typeConcept" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4KRwoelAWUj" role="3cqZAp">
-              <node concept="2OqwBi" id="60NbDCXI3a8" role="3clFbG">
-                <node concept="37vLTw" id="60NbDCXI2vS" role="2Oq$k0">
-                  <ref role="3cqZAo" node="60NbDCXI2vO" resolve="config" />
-                </node>
-                <node concept="liA8E" id="60NbDCXI3qq" role="2OqNvi">
-                  <ref role="37wK5l" node="60NbDCXHBm_" resolve="setPattern" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="60NbDCXI3Bc" role="3cqZAp">
-              <node concept="37vLTw" id="60NbDCXI3Ba" role="3clFbG">
-                <ref role="3cqZAo" node="60NbDCXI2vO" resolve="config" />
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="4KRwoelAK4w" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="1GNw78$NE6m" role="jymVt" />
-        <node concept="3clFb_" id="1eKXYsjAEvH" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="typeTerm" />
-          <node concept="3uibUv" id="1eKXYsjAEvI" role="3clF45">
+          <property role="TrG5h" value="patternTypeTerm" />
+          <node concept="3uibUv" id="4MEOIDG_iAq" role="3clF45">
             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
-          <node concept="3Tm1VV" id="1eKXYsjAEvJ" role="1B3o_S" />
-          <node concept="37vLTG" id="1eKXYsjAEvL" role="3clF46">
-            <property role="TrG5h" value="config" />
-            <node concept="3uibUv" id="1eKXYsjFkPP" role="1tU5fm">
-              <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
-            </node>
+          <node concept="3Tm1VV" id="4MEOIDG_iAr" role="1B3o_S" />
+          <node concept="2AHcQZ" id="4MEOIDG_iAw" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
           </node>
-          <node concept="3clFbS" id="1eKXYsjAEvS" role="3clF47">
-            <node concept="3cpWs6" id="1GNw78$s21Q" role="3cqZAp">
-              <node concept="1oi1Uc" id="1GNw78$s21R" role="3cqZAk">
-                <node concept="1oi5UN" id="1GNw78$s21S" role="1oi0x0">
-                  <node concept="1oi5Wm" id="1GNw78$s21T" role="1ojpOf">
-                    <property role="TrG5h" value="name" />
-                    <node concept="1WS0z7" id="1GNw78$s21U" role="lGtFl">
-                      <node concept="3JmXsc" id="1GNw78$s21V" role="3Jn$fo">
-                        <node concept="3clFbS" id="1GNw78$s21W" role="2VODD2">
-                          <node concept="3clFbF" id="5YVpdheB1C6" role="3cqZAp">
-                            <node concept="2OqwBi" id="5YVpdheB1C7" role="3clFbG">
-                              <node concept="2OqwBi" id="5YVpdheB4gB" role="2Oq$k0">
-                                <node concept="30H73N" id="5YVpdheB1C8" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="5YVpdheB4Ch" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="5YVpdheB1C9" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:5UYwY$H7MGm" resolve="valueFeatures" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+          <node concept="3clFbS" id="4MEOIDG_iAx" role="3clF47">
+            <node concept="3clFbF" id="4MEOIDG_qKe" role="3cqZAp">
+              <node concept="2OqwBi" id="4MEOIDG_qKg" role="3clFbG">
+                <node concept="1eOMI4" id="4MEOIDG_qKh" role="2Oq$k0">
+                  <node concept="1nCR9W" id="4MEOIDG_qKi" role="1eOMHV">
+                    <property role="1nD$Q0" value="TermDeclaration" />
+                    <node concept="3clFbT" id="4MEOIDG_qKj" role="2U2pNA">
+                      <property role="3clFbU" value="true" />
                     </node>
-                    <node concept="22Ky0T" id="1GNw78$s22j" role="lGtFl">
-                      <node concept="2OqwBi" id="1GNw78$s22k" role="22Ky0K">
-                        <node concept="37vLTw" id="1GNw78$Q65u" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1eKXYsjAEvL" resolve="config" />
-                        </node>
-                        <node concept="liA8E" id="1GNw78$s22m" role="2OqNvi">
-                          <ref role="37wK5l" node="1GNw78$gR0l" resolve="feature" />
-                          <node concept="1ZhdrF" id="1GNw78$s22n" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <node concept="3$xsQk" id="1GNw78$s22o" role="3$ytzL">
-                              <node concept="3clFbS" id="1GNw78$s22p" role="2VODD2">
-                                <node concept="3clFbF" id="1GNw78$s22q" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1GNw78$s22r" role="3clFbG">
-                                    <node concept="1iwH7S" id="1GNw78$s22s" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="1GNw78$s22t" role="2OqNvi">
-                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
-                                      <node concept="30H73N" id="1GNw78$s22u" role="1iwH7V" />
-                                    </node>
+                    <node concept="10Nm6u" id="4MEOIDG_qKk" role="2U2pNA">
+                      <node concept="1WS0z7" id="4MEOIDG_qKl" role="lGtFl">
+                        <node concept="3JmXsc" id="4MEOIDG_qKm" role="3Jn$fo">
+                          <node concept="3clFbS" id="4MEOIDG_qKn" role="2VODD2">
+                            <node concept="3clFbF" id="4MEOIDG_qKo" role="3cqZAp">
+                              <node concept="2OqwBi" id="4MEOIDG_qKp" role="3clFbG">
+                                <node concept="2OqwBi" id="4MEOIDG_qKq" role="2Oq$k0">
+                                  <node concept="30H73N" id="4MEOIDG_qKs" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="4MEOIDG_qKu" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
                                   </node>
                                 </node>
+                                <node concept="3Tsc0h" id="4MEOIDG_qKv" role="2OqNvi">
+                                  <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="1oi5ST" id="1GNw78$s22v" role="1ojpOf">
-                    <property role="TrG5h" value="name" />
-                    <node concept="1WS0z7" id="1GNw78$s22w" role="lGtFl">
-                      <node concept="3JmXsc" id="1GNw78$s22x" role="3Jn$fo">
-                        <node concept="3clFbS" id="1GNw78$s22y" role="2VODD2">
-                          <node concept="3clFbF" id="5YVpdheB6wn" role="3cqZAp">
-                            <node concept="2OqwBi" id="5YVpdheB6wo" role="3clFbG">
-                              <node concept="2OqwBi" id="5YVpdheB92p" role="2Oq$k0">
-                                <node concept="30H73N" id="5YVpdheB6wp" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="5YVpdheB9z_" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="5YVpdheBafa" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:5UYwY$H7TrL" resolve="childFeatures" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="3uibUv" id="4MEOIDG_qKw" role="2lIhxL">
+                      <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                     </node>
-                    <node concept="22Ky0T" id="1GNw78$s22O" role="lGtFl">
-                      <node concept="2OqwBi" id="1GNw78$s22P" role="22Ky0K">
-                        <node concept="37vLTw" id="1GNw78$Q6ew" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1eKXYsjAEvL" resolve="config" />
-                        </node>
-                        <node concept="liA8E" id="1GNw78$s22R" role="2OqNvi">
-                          <ref role="37wK5l" node="1GNw78$gR0l" resolve="feature" />
-                          <node concept="1ZhdrF" id="1GNw78$s22S" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <node concept="3$xsQk" id="1GNw78$s22T" role="3$ytzL">
-                              <node concept="3clFbS" id="1GNw78$s22U" role="2VODD2">
-                                <node concept="3clFbF" id="1GNw78$s22V" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1GNw78$s22W" role="3clFbG">
-                                    <node concept="1iwH7S" id="1GNw78$s22X" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="1GNw78$s22Y" role="2OqNvi">
-                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
-                                      <node concept="30H73N" id="1GNw78$s22Z" role="1iwH7V" />
-                                    </node>
-                                  </node>
+                    <node concept="17Uvod" id="4MEOIDG_qKx" role="lGtFl">
+                      <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                      <property role="2qtEX9" value="fqClassName" />
+                      <node concept="3zFVjK" id="4MEOIDG_qKy" role="3zH0cK">
+                        <node concept="3clFbS" id="4MEOIDG_qKz" role="2VODD2">
+                          <node concept="3clFbF" id="4MEOIDG_qK$" role="3cqZAp">
+                            <node concept="2OqwBi" id="4MEOIDG_qK_" role="3clFbG">
+                              <node concept="2OqwBi" id="4MEOIDG_qKA" role="2Oq$k0">
+                                <node concept="30H73N" id="4MEOIDG_qKC" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDG_qKE" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
                                 </node>
                               </node>
+                              <node concept="2qgKlT" id="4MEOIDG_qKF" role="2OqNvi">
+                                <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -19389,12 +19470,12 @@
                     </node>
                   </node>
                 </node>
+                <node concept="liA8E" id="4MEOIDG_qKG" role="2OqNvi">
+                  <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="2AHcQZ" id="1eKXYsjAEvT" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
         </node>
         <node concept="2tJIrI" id="1eKXYsjIGC7" role="jymVt" />
         <node concept="3clFb_" id="60NbDCXH15L" role="jymVt">
@@ -19409,15 +19490,17 @@
             <node concept="3Tqbb2" id="60NbDCXH15Q" role="1tU5fm" />
           </node>
           <node concept="3clFbS" id="60NbDCXH15U" role="3clF47">
-            <node concept="3clFbF" id="60NbDCXH8Mu" role="3cqZAp">
-              <node concept="1rXfSq" id="60NbDCXH8Ms" role="3clFbG">
-                <ref role="37wK5l" node="1eKXYsjAEvH" resolve="typeTerm" />
-                <node concept="1rXfSq" id="60NbDCXH9fd" role="37wK5m">
+            <node concept="3cpWs6" id="20Ay2Ve81mU" role="3cqZAp">
+              <node concept="2OqwBi" id="20Ay2Ve81mV" role="3cqZAk">
+                <node concept="1rXfSq" id="20Ay2Ve81mW" role="2Oq$k0">
                   <ref role="37wK5l" node="4KRwoelAK47" resolve="withNode" />
-                  <node concept="37vLTw" id="60NbDCXH9fe" role="37wK5m">
+                  <node concept="37vLTw" id="20Ay2Ve81mX" role="37wK5m">
                     <ref role="3cqZAo" node="60NbDCXH15P" resolve="typeNode" />
                   </node>
                 </node>
+                <node concept="liA8E" id="20Ay2Ve81mY" role="2OqNvi">
+                  <ref role="37wK5l" node="4MEOIDGBueD" resolve="typeNode" />
+                </node>
               </node>
             </node>
           </node>
@@ -19436,7 +19519,7 @@
           <node concept="37vLTG" id="1GNw78$ryBp" role="3clF46">
             <property role="TrG5h" value="config" />
             <node concept="3uibUv" id="1GNw78$ryBv" role="1tU5fm">
-              <ref role="3uigEE" node="1GNw78$gMhl" resolve="_TypeTable._Template.TypeConfig" />
+              <ref role="3uigEE" node="1GNw78$gMhl" resolve="__TypeTable._Template.TypeConfig" />
             </node>
           </node>
           <node concept="37vLTG" id="1GNw78$ryBr" role="3clF46">
@@ -19610,13 +19693,18 @@
                   <node concept="3clFbS" id="5UYwY$H7d7s" role="2VODD2">
                     <node concept="3clFbF" id="5UYwY$H7def" role="3cqZAp">
                       <node concept="2OqwBi" id="5UYwY$H7e5G" role="3clFbG">
-                        <node concept="2OqwBi" id="5UYwY$H7dr1" role="2Oq$k0">
-                          <node concept="30H73N" id="5UYwY$H7dee" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="5UYwY$H7dFC" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
+                        <node concept="2OqwBi" id="4MEOIDFWm7y" role="2Oq$k0">
+                          <node concept="2OqwBi" id="5UYwY$H7dr1" role="2Oq$k0">
+                            <node concept="30H73N" id="5UYwY$H7dee" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="4MEOIDFWlCS" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                            </node>
+                          </node>
+                          <node concept="3TrEf2" id="4MEOIDFWmSe" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
                           </node>
                         </node>
-                        <node concept="3Tsc0h" id="5UYwY$H7elj" role="2OqNvi">
+                        <node concept="3Tsc0h" id="4MEOIDFWnGH" role="2OqNvi">
                           <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
                         </node>
                       </node>
@@ -19638,10 +19726,15 @@
                     <node concept="3NFfHV" id="2V8TwD0sIhp" role="1sPUBK">
                       <node concept="3clFbS" id="2V8TwD0sIhq" role="2VODD2">
                         <node concept="3clFbF" id="2V8TwD0sJhI" role="3cqZAp">
-                          <node concept="2OqwBi" id="2V8TwD0sJx2" role="3clFbG">
-                            <node concept="30H73N" id="2V8TwD0sJhH" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="2V8TwD0sJLV" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
+                          <node concept="2OqwBi" id="4MEOIDFWpTf" role="3clFbG">
+                            <node concept="2OqwBi" id="2V8TwD0sJx2" role="2Oq$k0">
+                              <node concept="30H73N" id="2V8TwD0sJhH" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="4MEOIDFWptx" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="4MEOIDFWqkM" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
                             </node>
                           </node>
                         </node>
@@ -19717,6 +19810,391 @@
         </node>
       </node>
       <node concept="2tJIrI" id="1GNw78$HcHg" role="jymVt" />
+      <node concept="312cEu" id="4MEOIDFCzbt" role="jymVt">
+        <property role="2bfB8j" value="false" />
+        <property role="TrG5h" value="_Term" />
+        <node concept="2tJIrI" id="4MEOIDFHEHB" role="jymVt" />
+        <node concept="3clFbW" id="4MEOIDG7PYF" role="jymVt">
+          <node concept="37vLTG" id="4MEOIDGdr2b" role="3clF46">
+            <property role="TrG5h" value="pattern" />
+            <node concept="10P_77" id="4MEOIDGdr_a" role="1tU5fm" />
+          </node>
+          <node concept="37vLTG" id="4MEOIDG7PYI" role="3clF46">
+            <property role="TrG5h" value="param" />
+            <node concept="1WS0z7" id="4MEOIDG7PYJ" role="lGtFl">
+              <node concept="3JmXsc" id="4MEOIDG7PYK" role="3Jn$fo">
+                <node concept="3clFbS" id="4MEOIDG7PYL" role="2VODD2">
+                  <node concept="3clFbF" id="4MEOIDG7PYM" role="3cqZAp">
+                    <node concept="2OqwBi" id="4MEOIDG7PYN" role="3clFbG">
+                      <node concept="3Tsc0h" id="4MEOIDG7PYO" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                      </node>
+                      <node concept="30H73N" id="4MEOIDG7PYP" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="4MEOIDG7PYQ" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              <node concept="29HgVG" id="4MEOIDG7PYR" role="lGtFl">
+                <node concept="3NFfHV" id="4MEOIDG7PYS" role="3NFExx">
+                  <node concept="3clFbS" id="4MEOIDG7PYT" role="2VODD2">
+                    <node concept="3clFbF" id="4MEOIDG7PYU" role="3cqZAp">
+                      <node concept="2OqwBi" id="4MEOIDG7PYV" role="3clFbG">
+                        <node concept="3TrEf2" id="4MEOIDG7PYW" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
+                        </node>
+                        <node concept="30H73N" id="4MEOIDG7PYX" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cqZAl" id="4MEOIDG7PYY" role="3clF45" />
+          <node concept="3Tm1VV" id="4MEOIDG7PYZ" role="1B3o_S" />
+          <node concept="3clFbS" id="4MEOIDG7PZ0" role="3clF47">
+            <node concept="3clFbF" id="4MEOIDG7PZ1" role="3cqZAp">
+              <node concept="37vLTI" id="4MEOIDG7PZ2" role="3clFbG">
+                <node concept="37vLTw" id="4MEOIDGdrDF" role="37vLTx">
+                  <ref role="3cqZAo" node="4MEOIDGdr2b" resolve="pattern" />
+                </node>
+                <node concept="2OqwBi" id="4MEOIDG7PZ4" role="37vLTJ">
+                  <node concept="Xjq3P" id="4MEOIDG7PZ5" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="4MEOIDG7PZ6" role="2OqNvi">
+                    <ref role="2Oxat5" node="4MEOIDFKfTT" resolve="pattern" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4MEOIDG7PZ7" role="3cqZAp">
+              <node concept="37vLTI" id="4MEOIDG7PZ8" role="3clFbG">
+                <node concept="37vLTw" id="4MEOIDG7PZ9" role="37vLTx">
+                  <ref role="3cqZAo" node="4MEOIDG7PYI" resolve="param" />
+                </node>
+                <node concept="2OqwBi" id="4MEOIDG7PZa" role="37vLTJ">
+                  <node concept="Xjq3P" id="4MEOIDG7PZb" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="4MEOIDG7PZc" role="2OqNvi">
+                    <ref role="2Oxat5" node="4MEOIDFH_Un" resolve="param" />
+                    <node concept="1ZhdrF" id="4MEOIDG7PZd" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                      <property role="2qtEX8" value="fieldDeclaration" />
+                      <node concept="3$xsQk" id="4MEOIDG7PZe" role="3$ytzL">
+                        <node concept="3clFbS" id="4MEOIDG7PZf" role="2VODD2">
+                          <node concept="3clFbF" id="4MEOIDG7PZg" role="3cqZAp">
+                            <node concept="2OqwBi" id="4MEOIDG7PZh" role="3clFbG">
+                              <node concept="1iwH7S" id="4MEOIDG7PZi" role="2Oq$k0" />
+                              <node concept="1iwH70" id="4MEOIDG7PZj" role="2OqNvi">
+                                <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+                                <node concept="30H73N" id="4MEOIDG7PZk" role="1iwH7V" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="4MEOIDG7PZl" role="lGtFl">
+                <node concept="3JmXsc" id="4MEOIDG7PZm" role="3Jn$fo">
+                  <node concept="3clFbS" id="4MEOIDG7PZn" role="2VODD2">
+                    <node concept="3clFbF" id="4MEOIDG7PZo" role="3cqZAp">
+                      <node concept="2OqwBi" id="4MEOIDG7PZp" role="3clFbG">
+                        <node concept="3Tsc0h" id="4MEOIDG7PZq" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                        </node>
+                        <node concept="30H73N" id="4MEOIDG7PZr" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="4MEOIDFK68H" role="jymVt" />
+        <node concept="312cEg" id="4MEOIDFKfTT" role="jymVt">
+          <property role="TrG5h" value="pattern" />
+          <node concept="3Tm6S6" id="4MEOIDFKfTU" role="1B3o_S" />
+          <node concept="10P_77" id="4MEOIDFKgNd" role="1tU5fm" />
+        </node>
+        <node concept="312cEg" id="4MEOIDFH_Un" role="jymVt">
+          <property role="TrG5h" value="param" />
+          <node concept="3Tmbuc" id="4MEOIDFH_Uo" role="1B3o_S" />
+          <node concept="3uibUv" id="4MEOIDFH_Up" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            <node concept="29HgVG" id="4MEOIDFH_Uq" role="lGtFl">
+              <node concept="3NFfHV" id="4MEOIDFH_Ur" role="3NFExx">
+                <node concept="3clFbS" id="4MEOIDFH_Us" role="2VODD2">
+                  <node concept="3clFbF" id="4MEOIDFH_Ut" role="3cqZAp">
+                    <node concept="2OqwBi" id="4MEOIDFH_Uu" role="3clFbG">
+                      <node concept="3TrEf2" id="4MEOIDFH_Uv" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
+                      </node>
+                      <node concept="30H73N" id="4MEOIDFH_Uw" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1WS0z7" id="4MEOIDFH_Ux" role="lGtFl">
+            <ref role="2rW$FS" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+            <node concept="3JmXsc" id="4MEOIDFH_Uy" role="3Jn$fo">
+              <node concept="3clFbS" id="4MEOIDFH_Uz" role="2VODD2">
+                <node concept="3clFbF" id="4MEOIDFH_U$" role="3cqZAp">
+                  <node concept="2OqwBi" id="4MEOIDFH_U_" role="3clFbG">
+                    <node concept="3Tsc0h" id="4MEOIDFHDXt" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                    </node>
+                    <node concept="30H73N" id="4MEOIDFH_UB" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="17Uvod" id="4MEOIDFH_UC" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="4MEOIDFH_UD" role="3zH0cK">
+              <node concept="3clFbS" id="4MEOIDFH_UE" role="2VODD2">
+                <node concept="3clFbF" id="4MEOIDFH_UF" role="3cqZAp">
+                  <node concept="2OqwBi" id="4MEOIDFH_UG" role="3clFbG">
+                    <node concept="3TrcHB" id="4MEOIDFH_UH" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="30H73N" id="4MEOIDFH_UI" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="4MEOIDFCzkm" role="jymVt" />
+        <node concept="3clFb_" id="4MEOIDFFfNi" role="jymVt">
+          <property role="TrG5h" value="feature" />
+          <node concept="3uibUv" id="4MEOIDFFfNj" role="3clF45">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+          </node>
+          <node concept="3Tmbuc" id="4MEOIDFFfNk" role="1B3o_S" />
+          <node concept="3clFbS" id="4MEOIDFFfNl" role="3clF47">
+            <node concept="3clFbJ" id="4MEOIDFFfNm" role="3cqZAp">
+              <node concept="3clFbS" id="4MEOIDFFfNn" role="3clFbx">
+                <node concept="3cpWs6" id="4MEOIDFFfNo" role="3cqZAp">
+                  <node concept="10Nm6u" id="4MEOIDFFfNp" role="3cqZAk">
+                    <node concept="1sPUBX" id="4MEOIDFFfNq" role="lGtFl">
+                      <ref role="v9R2y" node="1L74NXFaLHB" resolve="type_term_pattern" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="4MEOIDFFfNr" role="3cqZAp" />
+              </node>
+              <node concept="37vLTw" id="4MEOIDFKiX5" role="3clFbw">
+                <ref role="3cqZAo" node="4MEOIDFKfTT" resolve="pattern" />
+              </node>
+              <node concept="9aQIb" id="4MEOIDFFfNt" role="9aQIa">
+                <node concept="3clFbS" id="4MEOIDFFfNu" role="9aQI4">
+                  <node concept="3cpWs6" id="4MEOIDFFfNv" role="3cqZAp">
+                    <node concept="10Nm6u" id="4MEOIDFFfNw" role="3cqZAk">
+                      <node concept="1sPUBX" id="4MEOIDFFfNx" role="lGtFl">
+                        <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1WS0z7" id="4MEOIDFFfNy" role="lGtFl">
+            <ref role="2rW$FS" node="1L74NXG7ihq" resolve="typeFeature_method" />
+            <node concept="3JmXsc" id="4MEOIDFFfNz" role="3Jn$fo">
+              <node concept="3clFbS" id="4MEOIDFFfN$" role="2VODD2">
+                <node concept="3clFbF" id="4MEOIDFFfN_" role="3cqZAp">
+                  <node concept="2OqwBi" id="4MEOIDFFfNA" role="3clFbG">
+                    <node concept="3Tsc0h" id="4MEOIDFFlb9" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
+                    </node>
+                    <node concept="2OqwBi" id="4MEOIDFFk3f" role="2Oq$k0">
+                      <node concept="30H73N" id="4MEOIDFFjkD" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="4MEOIDFFktE" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="17Uvod" id="4MEOIDFFfNF" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="4MEOIDFFfNG" role="3zH0cK">
+              <node concept="3clFbS" id="4MEOIDFFfNH" role="2VODD2">
+                <node concept="3clFbF" id="4MEOIDFFfNI" role="3cqZAp">
+                  <node concept="2OqwBi" id="4MEOIDFFfNJ" role="3clFbG">
+                    <node concept="30H73N" id="4MEOIDFFfNK" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="4MEOIDFFfNL" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="4MEOIDFCLHR" role="jymVt" />
+        <node concept="3clFb_" id="4MEOIDFNm77" role="jymVt">
+          <property role="TrG5h" value="typeTerm" />
+          <property role="1EzhhJ" value="false" />
+          <node concept="3uibUv" id="4MEOIDFNm78" role="3clF45">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+          </node>
+          <node concept="3Tm1VV" id="4MEOIDFNm79" role="1B3o_S" />
+          <node concept="3clFbS" id="4MEOIDFNm7b" role="3clF47">
+            <node concept="3cpWs6" id="4MEOIDFNoCC" role="3cqZAp">
+              <node concept="1oi1Uc" id="4MEOIDFNoCD" role="3cqZAk">
+                <node concept="1oi5UN" id="4MEOIDFNoCE" role="1oi0x0">
+                  <node concept="1oi5Wm" id="4MEOIDFNoCF" role="1ojpOf">
+                    <property role="TrG5h" value="name" />
+                    <node concept="1WS0z7" id="4MEOIDFNoCG" role="lGtFl">
+                      <node concept="3JmXsc" id="4MEOIDFNoCH" role="3Jn$fo">
+                        <node concept="3clFbS" id="4MEOIDFNoCI" role="2VODD2">
+                          <node concept="3clFbF" id="4MEOIDFNoCJ" role="3cqZAp">
+                            <node concept="2OqwBi" id="4MEOIDFNoCK" role="3clFbG">
+                              <node concept="2OqwBi" id="4MEOIDFNuZ8" role="2Oq$k0">
+                                <node concept="30H73N" id="4MEOIDFNoCM" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDFNvjU" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                                </node>
+                              </node>
+                              <node concept="2qgKlT" id="4MEOIDFNoCO" role="2OqNvi">
+                                <ref role="37wK5l" to="x5bw:5UYwY$H7MGm" resolve="valueFeatures" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="22Ky0T" id="4MEOIDFNoCP" role="lGtFl">
+                      <node concept="2OqwBi" id="4MEOIDFNoCQ" role="22Ky0K">
+                        <node concept="Xjq3P" id="4MEOIDFNw2I" role="2Oq$k0" />
+                        <node concept="liA8E" id="4MEOIDFNoCS" role="2OqNvi">
+                          <ref role="37wK5l" node="4MEOIDFFfNi" resolve="feature" />
+                          <node concept="1ZhdrF" id="4MEOIDFNoCT" role="lGtFl">
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <node concept="3$xsQk" id="4MEOIDFNoCU" role="3$ytzL">
+                              <node concept="3clFbS" id="4MEOIDFNoCV" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDFNoCW" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDFNoCX" role="3clFbG">
+                                    <node concept="1iwH7S" id="4MEOIDFNoCY" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4MEOIDFNoCZ" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
+                                      <node concept="30H73N" id="4MEOIDFNoD0" role="1iwH7V" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1oi5ST" id="4MEOIDFNoD1" role="1ojpOf">
+                    <property role="TrG5h" value="name" />
+                    <node concept="1WS0z7" id="4MEOIDFNoD2" role="lGtFl">
+                      <node concept="3JmXsc" id="4MEOIDFNoD3" role="3Jn$fo">
+                        <node concept="3clFbS" id="4MEOIDFNoD4" role="2VODD2">
+                          <node concept="3clFbF" id="4MEOIDFNoD5" role="3cqZAp">
+                            <node concept="2OqwBi" id="4MEOIDFNoD6" role="3clFbG">
+                              <node concept="2OqwBi" id="4MEOIDFNoD7" role="2Oq$k0">
+                                <node concept="30H73N" id="4MEOIDFNoD8" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDFNBi7" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                                </node>
+                              </node>
+                              <node concept="2qgKlT" id="4MEOIDFNoDa" role="2OqNvi">
+                                <ref role="37wK5l" to="x5bw:5UYwY$H7TrL" resolve="childFeatures" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="22Ky0T" id="4MEOIDFNoDb" role="lGtFl">
+                      <node concept="2OqwBi" id="4MEOIDFNoDc" role="22Ky0K">
+                        <node concept="Xjq3P" id="4MEOIDFNBBN" role="2Oq$k0" />
+                        <node concept="liA8E" id="4MEOIDFNoDe" role="2OqNvi">
+                          <ref role="37wK5l" node="4MEOIDFFfNi" resolve="feature" />
+                          <node concept="1ZhdrF" id="4MEOIDFNoDf" role="lGtFl">
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <node concept="3$xsQk" id="4MEOIDFNoDg" role="3$ytzL">
+                              <node concept="3clFbS" id="4MEOIDFNoDh" role="2VODD2">
+                                <node concept="3clFbF" id="4MEOIDFNoDi" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4MEOIDFNoDj" role="3clFbG">
+                                    <node concept="1iwH7S" id="4MEOIDFNoDk" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4MEOIDFNoDl" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
+                                      <node concept="30H73N" id="4MEOIDFNoDm" role="1iwH7V" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2AHcQZ" id="4MEOIDFNm7c" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4MEOIDFCzbu" role="1B3o_S" />
+        <node concept="raruj" id="4MEOIDFCAlP" role="lGtFl" />
+        <node concept="1WS0z7" id="4MEOIDFCAm3" role="lGtFl">
+          <node concept="3JmXsc" id="4MEOIDFCAm5" role="3Jn$fo">
+            <node concept="3clFbS" id="4MEOIDFCAm7" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDFCArL" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDFCACu" role="3clFbG">
+                  <node concept="30H73N" id="4MEOIDFCArK" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4MEOIDFCAY0" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4MEOIDFttPg" resolve="termDeclaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="4MEOIDFCHBm" role="1zkMxy">
+          <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+        </node>
+        <node concept="17Uvod" id="4MEOIDFCHMU" role="lGtFl">
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <property role="2qtEX9" value="name" />
+          <node concept="3zFVjK" id="4MEOIDFCHMV" role="3zH0cK">
+            <node concept="3clFbS" id="4MEOIDFCHMW" role="2VODD2">
+              <node concept="3clFbF" id="4MEOIDG8ucM" role="3cqZAp">
+                <node concept="2OqwBi" id="4MEOIDG8urI" role="3clFbG">
+                  <node concept="30H73N" id="4MEOIDG8ucL" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="4MEOIDG8uPr" role="2OqNvi">
+                    <ref role="37wK5l" to="x5bw:4MEOIDG83_h" resolve="runtimeClassName" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="3Tm1VV" id="1GNw78$HcGO" role="1B3o_S" />
     </node>
   </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 321dcee1..4b46f583 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -31,6 +31,7 @@
       </dependencies>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
+        <usedDevKit>a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)</usedDevKit>
       </usedDevKits>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
@@ -42,6 +43,7 @@
         <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
         <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
index 56a3b73e..b08342ca 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
@@ -87,7 +87,6 @@
         <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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -104,7 +103,6 @@
       </concept>
     </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
       <concept id="1196433923911" name="jetbrains.mps.lang.actions.structure.SideTransform_SimpleString" flags="nn" index="2h1dTh">
         <property id="1196433942569" name="text" index="2h1i$Z" />
       </concept>
@@ -987,138 +985,6 @@
       </node>
     </node>
   </node>
-  <node concept="3FK_9_" id="2N2MQGCIMbe">
-    <property role="TrG5h" value="Expression_subst_Type" />
-    <node concept="1X3_iC" id="4hPXq9JmepN" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="2N2MQGCIMbf" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="tYCnQ" id="2N2MQGCIMsI" role="tZc4B">
-          <ref role="uz4UX" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-          <node concept="uMFAO" id="2N2MQGCIMsK" role="uz6Si">
-            <node concept="3Tqbb2" id="2N2MQGCJ4jR" role="uMOYW">
-              <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-            </node>
-            <node concept="uSIkt" id="2N2MQGCIMsM" role="uTubQ">
-              <node concept="3clFbS" id="2N2MQGCIMsN" role="2VODD2">
-                <node concept="3cpWs8" id="2CEQDIDTvVJ" role="3cqZAp">
-                  <node concept="3cpWsn" id="2CEQDIDTvVK" role="3cpWs9">
-                    <property role="TrG5h" value="term" />
-                    <node concept="3Tqbb2" id="2CEQDIDTvVH" role="1tU5fm">
-                      <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-                    </node>
-                    <node concept="2ShNRf" id="2CEQDIDTvVL" role="33vP2m">
-                      <node concept="2fJWfE" id="2CEQDIDTvVM" role="2ShVmc">
-                        <node concept="3Tqbb2" id="2CEQDIDTvVN" role="3zrR0E">
-                          <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2CEQDIDTuFk" role="3cqZAp">
-                  <node concept="2OqwBi" id="2CEQDIDTwBj" role="3clFbG">
-                    <node concept="2OqwBi" id="2CEQDIDTw3H" role="2Oq$k0">
-                      <node concept="37vLTw" id="2CEQDIDTvVO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
-                      </node>
-                      <node concept="3TrEf2" id="2CEQDIDTwfa" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="2CEQDIDTwWx" role="2OqNvi">
-                      <node concept="uNquD" id="2CEQDIDTwZR" role="2oxUTC" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2N2MQGCKo7N" role="3cqZAp">
-                  <node concept="2OqwBi" id="2N2MQGCKoHZ" role="3clFbG">
-                    <node concept="2OqwBi" id="2N2MQGCKoqB" role="2Oq$k0">
-                      <node concept="37vLTw" id="2CEQDIDTx34" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
-                      </node>
-                      <node concept="3TrEf2" id="2N2MQGCKo$4" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="2N2MQGCKoWy" role="2OqNvi">
-                      <node concept="2YIFZM" id="2N2MQGCKnCn" role="2oxUTC">
-                        <ref role="37wK5l" to="hy7p:2N2MQGCJu99" resolve="createFromTemplate" />
-                        <ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
-                        <node concept="2OqwBi" id="2N2MQGCKsEz" role="37wK5m">
-                          <node concept="uNquD" id="2N2MQGCKnGg" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="2N2MQGCKsQ9" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2CEQDIDTxpb" role="3cqZAp">
-                  <node concept="37vLTw" id="2CEQDIDTxp9" role="3clFbG">
-                    <ref role="3cqZAo" node="2CEQDIDTvVK" resolve="term" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uNCsQ" id="2N2MQGCIMsO" role="uO7ob">
-              <node concept="3clFbS" id="2N2MQGCIMsP" role="2VODD2">
-                <node concept="3clFbF" id="2N2MQGCJdfQ" role="3cqZAp">
-                  <node concept="10QFUN" id="2N2MQGCJfFl" role="3clFbG">
-                    <node concept="2OqwBi" id="2N2MQGCJfFd" role="10QFUP">
-                      <node concept="2ShNRf" id="2N2MQGCJfFe" role="2Oq$k0">
-                        <node concept="1pGfFk" id="2N2MQGCJfFf" role="2ShVmc">
-                          <ref role="37wK5l" to="35tq:~ModelPlusImportedScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel,boolean,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="ModelPlusImportedScope" />
-                          <node concept="1Q6Npb" id="2N2MQGCJfFg" role="37wK5m" />
-                          <node concept="3clFbT" id="2N2MQGCJfFh" role="37wK5m">
-                            <property role="3clFbU" value="false" />
-                          </node>
-                          <node concept="35c_gC" id="2N2MQGCJfFi" role="37wK5m">
-                            <ref role="35c_gD" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="2N2MQGCJfFj" role="2OqNvi">
-                        <ref role="37wK5l" to="35tq:~ModelsScope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
-                        <node concept="Xl_RD" id="2N2MQGCJfFk" role="37wK5m">
-                          <property role="Xl_RC" value="" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="A3Dl8" id="2N2MQGCJfNn" role="10QFUM">
-                      <node concept="3Tqbb2" id="2N2MQGCJfVa" role="A3Ik2">
-                        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uSjag" id="2N2MQGCJgjn" role="uSyvl">
-              <node concept="3clFbS" id="2N2MQGCJgjo" role="2VODD2">
-                <node concept="3clFbF" id="2N2MQGCJgwV" role="3cqZAp">
-                  <node concept="2OqwBi" id="2N2MQGCJg_O" role="3clFbG">
-                    <node concept="uNquD" id="2N2MQGCJgwU" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="2N2MQGCJgNO" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9JmepM" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9JmenH" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmenG" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmenD" resolve="Expression_Contribution" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3FK_9_" id="1hX44vMLjek">
     <property role="3GE5qa" value="type.code" />
     <property role="TrG5h" value="TypeNode_Expression" />
@@ -1228,203 +1094,6 @@
       </node>
     </node>
   </node>
-  <node concept="3UOs0u" id="18kNIl0OXSX">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="TrG5h" value="NewTypeConstraint_substitution" />
-    <node concept="1X3_iC" id="4hPXq9Jmeic" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="18kNIl0OXSY" role="8Wnug">
-        <property role="2uHTBK" value="ext_2_RTransform" />
-        <ref role="3UNGvu" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-        <node concept="3kRJcU" id="18kNIl0OXU_" role="3kShCk">
-          <node concept="3clFbS" id="18kNIl0OXUA" role="2VODD2">
-            <node concept="3clFbF" id="18kNIl0OY1J" role="3cqZAp">
-              <node concept="2OqwBi" id="18kNIl0P01v" role="3clFbG">
-                <node concept="2OqwBi" id="18kNIl0OYhF" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="18kNIl0OY1I" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="18kNIl0OZB6" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="18kNIl0P0pj" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="18kNIl0P0_g" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-          <node concept="Cmt7Y" id="18kNIl0P0Vs" role="uz6Si">
-            <node concept="Cnhdc" id="18kNIl0P0Vu" role="Cncma">
-              <node concept="3clFbS" id="18kNIl0P0Vw" role="2VODD2">
-                <node concept="3clFbF" id="18kNIl0P0YV" role="3cqZAp">
-                  <node concept="2OqwBi" id="18kNIl0P20F" role="3clFbG">
-                    <node concept="2OqwBi" id="18kNIl0P1hZ" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="18kNIl0P0YU" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="18kNIl0P1A1" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="18kNIl0P2kI" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="18kNIl0P2yE" role="3cqZAp">
-                  <node concept="Cj7Ep" id="18kNIl0P2yC" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="18kNIl0P0YQ" role="Cn2iK">
-              <property role="2h1i$Z" value="[" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jmeib" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9JmehO" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmehD" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmehE" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="18kNIl0PReP">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="TrG5h" value="AsTypeConstraint_substitution" />
-    <node concept="1X3_iC" id="4hPXq9JmeiT" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="18kNIl0PReQ" role="8Wnug">
-        <ref role="3UNGvu" to="wq2x:18kNIl0jL2T" resolve="AsTypeConstraint" />
-        <node concept="tYCnQ" id="18kNIl0PT4H" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:18kNIl0jL2T" resolve="AsTypeConstraint" />
-          <node concept="Cmt7Y" id="18kNIl0PTqU" role="uz6Si">
-            <node concept="Cnhdc" id="18kNIl0PTqW" role="Cncma">
-              <node concept="3clFbS" id="18kNIl0PTqY" role="2VODD2">
-                <node concept="3clFbF" id="18kNIl0PTup" role="3cqZAp">
-                  <node concept="2OqwBi" id="18kNIl0PU8m" role="3clFbG">
-                    <node concept="2OqwBi" id="18kNIl0PTCU" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="18kNIl0PTuo" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="18kNIl0PTOL" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="18kNIl0PUsp" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="18kNIl0PUCG" role="3cqZAp">
-                  <node concept="Cj7Ep" id="18kNIl0PUCE" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="18kNIl0PTuk" role="Cn2iK">
-              <property role="2h1i$Z" value="[" />
-            </node>
-            <node concept="xBawi" id="4hPXq9JmeiS" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmeix" />
-            </node>
-          </node>
-        </node>
-        <node concept="3kRJcU" id="18kNIl0PReR" role="3kShCk">
-          <node concept="3clFbS" id="18kNIl0PReS" role="2VODD2">
-            <node concept="3clFbF" id="18kNIl0PRm1" role="3cqZAp">
-              <node concept="2OqwBi" id="18kNIl0PSmz" role="3clFbG">
-                <node concept="2OqwBi" id="18kNIl0PR_X" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="18kNIl0PRm0" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="18kNIl0PRXN" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="18kNIl0PSBk" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmeim" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmein" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="7IysFeA3quv">
-    <property role="3GE5qa" value="type.decl" />
-    <property role="TrG5h" value="TypeDeclaration_parameter" />
-    <node concept="1X3_iC" id="4hPXq9Jmetg" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="7IysFeA3quw" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="3buRE8" id="7IysFeA3qJp" role="3bvWUf">
-          <node concept="3clFbS" id="7IysFeA3qJq" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA3qQz" role="3cqZAp">
-              <node concept="2OqwBi" id="7IysFeA3s14" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA3r4i" role="2Oq$k0">
-                  <node concept="3bvxqY" id="7IysFeA3qQy" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="7IysFeA3rk_" role="2OqNvi">
-                    <node concept="1xMEDy" id="7IysFeA3rkB" role="1xVPHs">
-                      <node concept="chp4Y" id="7IysFeA3rtB" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="7IysFeA3rL1" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="7IysFeA3sqf" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="35xCft" id="7IysFeA3szP" role="tZc4B">
-          <ref role="35y72J" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
-          <node concept="xBawi" id="4hPXq9Jmetf" role="lGtFl">
-            <ref role="xBaxx" to="vxmb:4hPXq9Jmete" />
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmesA" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmesB" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="7IysFeA80Ug">
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="TypeConcept_Expression" />
-    <node concept="1X3_iC" id="4hPXq9JmeBb" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="7IysFeA80Uh" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="3buRE8" id="7IysFeA80Uj" role="3bvWUf">
-          <node concept="3clFbS" id="7IysFeA80Uk" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA811t" role="3cqZAp">
-              <node concept="2OqwBi" id="7IysFeA82bY" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA81fc" role="2Oq$k0">
-                  <node concept="3bvxqY" id="7IysFeA811s" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="7IysFeA81vv" role="2OqNvi">
-                    <node concept="1xMEDy" id="7IysFeA81vx" role="1xVPHs">
-                      <node concept="chp4Y" id="7IysFeA81Cx" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="7IysFeA81VV" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="7IysFeA82_6" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="35xCft" id="7IysFeA82J4" role="tZc4B">
-          <ref role="35y72J" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-          <node concept="xBawi" id="4hPXq9JmeBa" role="lGtFl">
-            <ref role="xBaxx" to="vxmb:4hPXq9JmeB9" />
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmeAx" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmeAy" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3FK_9_" id="7IysFeA99pw">
     <property role="3GE5qa" value="type.code" />
     <property role="TrG5h" value="TypeLogical_Expression" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 22b6c0a7..7e6a70cf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -20,6 +20,7 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -115,6 +116,9 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -174,6 +178,7 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
+      <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
@@ -188,9 +193,6 @@
       <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="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
       <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
         <child id="5944356402132808753" name="case" index="1_3QMm" />
         <child id="5944356402132808752" name="expression" index="1_3QMn" />
@@ -969,9 +971,11 @@
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
       <node concept="3clFbS" id="1hX44vMIPYN" role="3clF47">
-        <node concept="3clFbF" id="1hX44vMF8LA" role="3cqZAp">
-          <node concept="2c44tf" id="1hX44vMF8L$" role="3clFbG">
-            <node concept="17QB3L" id="1hX44vMF8MG" role="2c44tc" />
+        <node concept="3clFbF" id="4MEOIDFBumR" role="3cqZAp">
+          <node concept="2c44tf" id="4MEOIDFBumP" role="3clFbG">
+            <node concept="3uibUv" id="4MEOIDFBupb" role="2c44tc">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
           </node>
         </node>
       </node>
@@ -1169,35 +1173,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="7IysFeA9Chl">
-    <property role="3GE5qa" value="type.code" />
-    <ref role="13h7C2" to="wq2x:7IysFeA9CgT" resolve="AltBlock" />
-    <node concept="13hLZK" id="7IysFeA9Chm" role="13h7CW">
-      <node concept="3clFbS" id="7IysFeA9Chn" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7IysFeA9Chw" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getExpectedRetType" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-      <node concept="3Tm1VV" id="7IysFeA9Chx" role="1B3o_S" />
-      <node concept="2AHcQZ" id="7IysFeA9Ch$" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-      </node>
-      <node concept="3clFbS" id="7IysFeA9ChB" role="3clF47">
-        <node concept="3clFbF" id="7IysFeA9Ciy" role="3cqZAp">
-          <node concept="2ShNRf" id="7IysFeA9Ciw" role="3clFbG">
-            <node concept="3zrR0B" id="7IysFeA9Cq7" role="2ShVmc">
-              <node concept="3Tqbb2" id="7IysFeA9Cq9" role="3zrR0E">
-                <ref role="ehGHo" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="7IysFeA9ChC" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="3TnYLtqflZe">
     <property role="3GE5qa" value="type.code.with" />
     <ref role="13h7C2" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
@@ -1303,33 +1278,6 @@
       <node concept="3clFbS" id="1L74NXEmFab" role="3clF47" />
     </node>
   </node>
-  <node concept="13h7C7" id="1L74NXEmFeh">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="13h7C2" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-    <node concept="13hLZK" id="1L74NXEmFei" role="13h7CW">
-      <node concept="3clFbS" id="1L74NXEmFej" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="1L74NXEmFes" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getTypeDeclaration" />
-      <ref role="13i0hy" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
-      <node concept="3Tm1VV" id="1L74NXEmFet" role="1B3o_S" />
-      <node concept="3clFbS" id="1L74NXEmFew" role="3clF47">
-        <node concept="3clFbF" id="1L74NXEmFeR" role="3cqZAp">
-          <node concept="2OqwBi" id="1L74NXEmFnN" role="3clFbG">
-            <node concept="13iPFW" id="1L74NXEmFeQ" role="2Oq$k0" />
-            <node concept="3TrEf2" id="1L74NXEmFFe" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="1L74NXEmFex" role="3clF45">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="1L74NXEmHzJ">
     <property role="3GE5qa" value="type.term" />
     <ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
@@ -1634,5 +1582,176 @@
       <node concept="3Tqbb2" id="2V8TwD0$YKe" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="4MEOIDFxxVo">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <node concept="13hLZK" id="4MEOIDFxxVp" role="13h7CW">
+      <node concept="3clFbS" id="4MEOIDFxxVq" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="4MEOIDFxxVz" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="TrG5h" value="getVariable" />
+      <property role="13i0it" value="false" />
+      <ref role="13i0hy" to="tpek:SORzhOpB6t" resolve="getVariable" />
+      <node concept="3Tm1VV" id="4MEOIDFxxV$" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDFxxVB" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDFxxVT" role="3cqZAp">
+          <node concept="2OqwBi" id="4MEOIDFxy9Z" role="3clFbG">
+            <node concept="13iPFW" id="4MEOIDFxxVS" role="2Oq$k0" />
+            <node concept="3TrEf2" id="4MEOIDFxyiL" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="4MEOIDFxxVC" role="3clF45">
+        <ref role="ehGHo" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="4MEOIDG83_6">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    <node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassName" />
+      <node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG83_x" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG83_k" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8lha" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG8moh" role="3clFbG">
+            <node concept="Xl_RD" id="4MEOIDG8mok" role="3uHU7w">
+              <property role="Xl_RC" value="_Term" />
+            </node>
+            <node concept="2OqwBi" id="4MEOIDG8lrk" role="3uHU7B">
+              <node concept="13iPFW" id="4MEOIDG8lh8" role="2Oq$k0" />
+              <node concept="3TrcHB" id="4MEOIDG8lzW" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="4MEOIDG8lgz" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassFqName" />
+      <node concept="3Tm1VV" id="4MEOIDG8lg$" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG8lg_" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG8lgA" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8mMv" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG8po4" role="3clFbG">
+            <node concept="BsUDl" id="4MEOIDG8pxn" role="3uHU7w">
+              <ref role="37wK5l" node="4MEOIDG83_h" resolve="runtimeClassName" />
+            </node>
+            <node concept="3cpWs3" id="4MEOIDG8oGY" role="3uHU7B">
+              <node concept="2OqwBi" id="4MEOIDG8nA1" role="3uHU7B">
+                <node concept="2OqwBi" id="4MEOIDG8mWD" role="2Oq$k0">
+                  <node concept="13iPFW" id="4MEOIDG8mMt" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
+                    <node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
+                      <node concept="chp4Y" id="4MEOIDG8nri" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="4MEOIDG8nRC" role="2OqNvi">
+                  <ref role="37wK5l" node="4MEOIDG83X7" resolve="runtimeClassFqName" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4MEOIDG8oH1" role="3uHU7w">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="4MEOIDG83_7" role="13h7CW">
+      <node concept="3clFbS" id="4MEOIDG83_8" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="4MEOIDG83WW">
+    <property role="3GE5qa" value="type" />
+    <ref role="13h7C2" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
+    <node concept="13i0hz" id="4MEOIDG8goY" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassName" />
+      <node concept="3Tm1VV" id="4MEOIDG8goZ" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG8g$K" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG8gp1" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8g_k" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG8hGp" role="3clFbG">
+            <node concept="Xl_RD" id="4MEOIDG8hIU" role="3uHU7w">
+              <property role="Xl_RC" value="_TypeTable" />
+            </node>
+            <node concept="2OqwBi" id="4MEOIDG8gJs" role="3uHU7B">
+              <node concept="13iPFW" id="4MEOIDG8g_j" role="2Oq$k0" />
+              <node concept="3TrcHB" id="4MEOIDG8gS4" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="4MEOIDG83X7" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassFqName" />
+      <node concept="3Tm1VV" id="4MEOIDG83X8" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG83Xn" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG83Xa" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG83Ye" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG86UL" role="3clFbG">
+            <node concept="3cpWs3" id="4MEOIDG8603" role="3uHU7B">
+              <node concept="2OqwBi" id="4MEOIDGcdul" role="3uHU7B">
+                <node concept="2OqwBi" id="4MEOIDG848m" role="2Oq$k0">
+                  <node concept="13iPFW" id="4MEOIDG83Yc" role="2Oq$k0" />
+                  <node concept="I4A8Y" id="4MEOIDG84gY" role="2OqNvi" />
+                </node>
+                <node concept="LkI2h" id="4MEOIDGcdB4" role="2OqNvi" />
+              </node>
+              <node concept="Xl_RD" id="4MEOIDG8606" role="3uHU7w">
+                <property role="Xl_RC" value="!" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4MEOIDG8iCA" role="3uHU7w">
+              <node concept="13iPFW" id="4MEOIDG879_" role="2Oq$k0" />
+              <node concept="2qgKlT" id="4MEOIDG8j4c" role="2OqNvi">
+                <ref role="37wK5l" node="4MEOIDG8goY" resolve="runtimeClassName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="4MEOIDG83WX" role="13h7CW">
+      <node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1L74NXEmFeh">
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <ref role="13h7C2" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
+    <node concept="13hLZK" id="1L74NXEmFei" role="13h7CW">
+      <node concept="3clFbS" id="1L74NXEmFej" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1L74NXEmFes" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getTypeDeclaration" />
+      <ref role="13i0hy" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
+      <node concept="3Tm1VV" id="1L74NXEmFet" role="1B3o_S" />
+      <node concept="3clFbS" id="1L74NXEmFew" role="3clF47">
+        <node concept="3clFbF" id="1L74NXEmFeR" role="3cqZAp">
+          <node concept="2OqwBi" id="1L74NXEmFnN" role="3clFbG">
+            <node concept="13iPFW" id="1L74NXEmFeQ" role="2Oq$k0" />
+            <node concept="3TrEf2" id="1L74NXEmFFe" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="1L74NXEmFex" role="3clF45">
+        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index d2004262..7dbfd49f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -925,15 +925,20 @@
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                   <node concept="2OqwBi" id="1L74NXFMAdz" role="37wK5m">
-                    <node concept="2OqwBi" id="1L74NXFM_uv" role="2Oq$k0">
-                      <node concept="37vLTw" id="1L74NXFM_eO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1L74NXFM$r4" resolve="td" />
+                    <node concept="2OqwBi" id="4MEOIDFRjcb" role="2Oq$k0">
+                      <node concept="2OqwBi" id="1L74NXFM_uv" role="2Oq$k0">
+                        <node concept="37vLTw" id="1L74NXFM_eO" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1L74NXFM$r4" resolve="td" />
+                        </node>
+                        <node concept="3TrEf2" id="4MEOIDFRiG4" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                        </node>
                       </node>
-                      <node concept="3TrEf2" id="1L74NXFM_Ln" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
+                      <node concept="3TrEf2" id="4MEOIDFRjF4" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="1L74NXFMAA_" role="2OqNvi">
+                    <node concept="3Tsc0h" id="4MEOIDFRjYI" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
                     </node>
                   </node>
@@ -986,23 +991,28 @@
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="2V8TwD0EcWX" role="37wK5m">
-                    <node concept="2OqwBi" id="2V8TwD0EcWY" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2V8TwD0EcWZ" role="2Oq$k0">
-                        <node concept="2rP1CM" id="2V8TwD0EcX0" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="2V8TwD0EcX1" role="2OqNvi">
-                          <node concept="1xMEDy" id="2V8TwD0EcX2" role="1xVPHs">
-                            <node concept="chp4Y" id="2V8TwD0EcX3" role="ri$Ld">
-                              <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+                  <node concept="2OqwBi" id="4MEOIDFR9my" role="37wK5m">
+                    <node concept="2OqwBi" id="2V8TwD0EcWX" role="2Oq$k0">
+                      <node concept="2OqwBi" id="2V8TwD0EcWY" role="2Oq$k0">
+                        <node concept="2OqwBi" id="2V8TwD0EcWZ" role="2Oq$k0">
+                          <node concept="2rP1CM" id="2V8TwD0EcX0" role="2Oq$k0" />
+                          <node concept="2Xjw5R" id="2V8TwD0EcX1" role="2OqNvi">
+                            <node concept="1xMEDy" id="2V8TwD0EcX2" role="1xVPHs">
+                              <node concept="chp4Y" id="2V8TwD0EcX3" role="ri$Ld">
+                                <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+                              </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3TrEf2" id="4MEOIDFR86r" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                        </node>
                       </node>
-                      <node concept="3TrEf2" id="2V8TwD0EcX4" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
+                      <node concept="3TrEf2" id="4MEOIDFR8Uw" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="2V8TwD0EcX5" role="2OqNvi">
+                    <node concept="3Tsc0h" id="4MEOIDFR9Mh" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
                     </node>
                   </node>
@@ -1099,5 +1109,70 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4MEOIDFxysn">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+      <node concept="13QW63" id="4MEOIDFxyEi" role="1N6uqs">
+        <node concept="3clFbS" id="4MEOIDFxyEj" role="2VODD2">
+          <node concept="3clFbF" id="4MEOIDFxyEk" role="3cqZAp">
+            <node concept="2ShNRf" id="4MEOIDFxyEl" role="3clFbG">
+              <node concept="YeOm9" id="4MEOIDFxyEm" role="2ShVmc">
+                <node concept="1Y3b0j" id="4MEOIDFxyEn" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                  <node concept="2OqwBi" id="4MEOIDFxyEo" role="37wK5m">
+                    <node concept="2OqwBi" id="4MEOIDFxyEp" role="2Oq$k0">
+                      <node concept="2rP1CM" id="4MEOIDFxyEq" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="4MEOIDFxyEr" role="2OqNvi">
+                        <node concept="1xMEDy" id="4MEOIDFxyEs" role="1xVPHs">
+                          <node concept="chp4Y" id="4MEOIDFxz12" role="ri$Ld">
+                            <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+                          </node>
+                        </node>
+                        <node concept="1xIGOp" id="4MEOIDFxyEu" role="1xVPHs" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="4MEOIDFxzkz" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3Tm1VV" id="4MEOIDFxyEw" role="1B3o_S" />
+                  <node concept="3clFb_" id="4MEOIDFxyEx" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="4MEOIDFxyEy" role="3clF45" />
+                    <node concept="3Tm1VV" id="4MEOIDFxyEz" role="1B3o_S" />
+                    <node concept="37vLTG" id="4MEOIDFxyE$" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="4MEOIDFxyE_" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="4MEOIDFxyEA" role="3clF47">
+                      <node concept="3clFbF" id="4MEOIDFxyEB" role="3cqZAp">
+                        <node concept="2OqwBi" id="4MEOIDFxyEC" role="3clFbG">
+                          <node concept="1PxgMI" id="4MEOIDFxyED" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            <node concept="37vLTw" id="4MEOIDFxyEE" role="1m5AlR">
+                              <ref role="3cqZAo" node="4MEOIDFxyE$" resolve="child" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="4MEOIDFxyEF" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 5ef626e5..4dae0b9e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -94,7 +94,6 @@
         <child id="8371900013785948359" name="part" index="2$S_pN" />
         <child id="8371900013785948365" name="parameterQuery" index="2$S_pT" />
       </concept>
-      <concept id="6150987479542522273" name="jetbrains.mps.lang.editor.structure.QueryHintsSpecification" flags="ig" index="2Hnlc$" />
       <concept id="1638911550608571617" name="jetbrains.mps.lang.editor.structure.TransformationMenu_Default" flags="ng" index="IW6AY" />
       <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
       <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
@@ -195,6 +194,7 @@
       <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
+      <concept id="1223386653097" name="jetbrains.mps.lang.editor.structure.StrikeOutStyleSheet" flags="ln" index="3nxI2P" />
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
       <concept id="1165424453110" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Item" flags="ng" index="1oHujT">
         <property id="1165424453111" name="matchingText" index="1oHujS" />
@@ -242,7 +242,6 @@
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <property id="1160590353935" name="usesFolding" index="S$Qs1" />
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
-        <child id="4242538589862653897" name="addHints" index="2whIAn" />
         <child id="7723470090030138869" name="foldedCellModel" index="AHCbl" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
       </concept>
@@ -348,7 +347,6 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -376,9 +374,6 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
-        <child id="1154542793668" name="componentType" index="3g7fb8" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -422,7 +417,6 @@
       </concept>
     </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
       <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
       <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
       <concept id="5480835971642155304" name="jetbrains.mps.lang.actions.structure.NF_Model_CreateNewNodeOperation" flags="nn" index="15TzpJ" />
@@ -514,7 +508,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -1365,105 +1358,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="6p0DfM0g5pD">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1XX52x" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-    <node concept="3EZMnI" id="6p0DfM0g5sd" role="2wV5jI">
-      <node concept="3F1sOY" id="6p0DfM0geOX" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6p0DfM0gdsG" resolve="typeVar" />
-      </node>
-      <node concept="3F0ifn" id="6p0DfM0geHd" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;-" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
-      </node>
-      <node concept="3F0ifn" id="6p0DfM0g5uQ" role="3EZMnx">
-        <property role="3F0ifm" value="new" />
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-      </node>
-      <node concept="1iCGBv" id="YGS68N6UWi" role="3EZMnx">
-        <property role="1$x2rV" value="&lt;no type declaration&gt;" />
-        <ref role="1NtTu8" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
-        <node concept="1X3_iC" id="4hPXq9JmfbL" role="lGtFl">
-          <property role="3V$3am" value="styleItem" />
-          <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-          <node concept="2V7CMv" id="7IysFeA3Ois" role="8Wnug">
-            <property role="2V7CMs" value="ext_1_RTransform" />
-            <node concept="xG$WE" id="4hPXq9JmfbK" role="lGtFl" />
-          </node>
-        </node>
-        <node concept="1sVBvm" id="YGS68N6UWk" role="1sWHZn">
-          <node concept="3F0A7n" id="YGS68N73HK" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="7km57Pk7sC0" resolve="TypeTerm" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="18kNIl0iqmD" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F2HdR" id="7IysFeA3P8t" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <property role="Q2I2d" value="punctuation" />
-        <ref role="1NtTu8" to="wq2x:6p0DfM0gSN1" resolve="argument" />
-        <node concept="l2Vlx" id="7IysFeA3P8v" role="2czzBx" />
-        <node concept="3F0ifn" id="7IysFeA3PjZ" role="2czzBI">
-          <property role="3F0ifm" value="" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="18kNIl0iqN7" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-        <node concept="1X3_iC" id="4hPXq9JmfbD" role="lGtFl">
-          <property role="3V$3am" value="styleItem" />
-          <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-          <node concept="2V7CMv" id="18kNIl0OYIk" role="8Wnug">
-            <property role="2V7CMs" value="ext_2_RTransform" />
-            <node concept="xBawi" id="4hPXq9JmfbC" role="lGtFl">
-              <ref role="xBaxx" node="4hPXq9Jmeh$" resolve="NewTypeConstraint_substitution" />
-            </node>
-          </node>
-        </node>
-        <node concept="A1WHu" id="4hPXq9JmfbB" role="3vIgyS">
-          <ref role="A1WHt" node="4hPXq9Jmeh$" resolve="NewTypeConstraint_substitution" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="18kNIl0OZ61" role="3EZMnx">
-        <node concept="VPM3Z" id="18kNIl0OZ63" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="18kNIl0OZhN" role="3EZMnx">
-          <property role="3F0ifm" value="[" />
-          <ref role="1k5W1q" to="tpen:hXb$RYA" resolve="LeftBracket" />
-        </node>
-        <node concept="3F1sOY" id="18kNIl0OZi1" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-        </node>
-        <node concept="3F0ifn" id="18kNIl0OZhT" role="3EZMnx">
-          <property role="3F0ifm" value="]" />
-          <ref role="1k5W1q" to="tpen:hXb$V4T" resolve="RightBracket" />
-        </node>
-        <node concept="l2Vlx" id="18kNIl0PNWI" role="2iSdaV" />
-        <node concept="pkWqt" id="18kNIl0P$lD" role="pqm2j">
-          <node concept="3clFbS" id="18kNIl0P$lE" role="2VODD2">
-            <node concept="3clFbF" id="18kNIl0P$xo" role="3cqZAp">
-              <node concept="2OqwBi" id="18kNIl0P_zd" role="3clFbG">
-                <node concept="2OqwBi" id="18kNIl0P$Hh" role="2Oq$k0">
-                  <node concept="pncrf" id="18kNIl0P$xn" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="18kNIl0P_8R" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="18kNIl0P_Yd" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="6p0DfM0g5sg" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="6p0DfM0ibrF">
     <property role="3GE5qa" value="rule.input" />
     <ref role="1XX52x" to="wq2x:6p0DfM0ia8T" resolve="RuleInputDeclaration" />
@@ -2811,6 +2705,19 @@
           </node>
         </node>
       </node>
+      <node concept="3EZMnI" id="4MEOIDFttPT" role="3EZMnx">
+        <node concept="VPM3Z" id="4MEOIDFttPV" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F2HdR" id="4MEOIDFttQ$" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:4MEOIDFttPg" resolve="termDeclaration" />
+          <node concept="pj6Ft" id="4MEOIDFttQD" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="l2Vlx" id="4MEOIDFttQA" role="2czzBx" />
+        </node>
+        <node concept="l2Vlx" id="4MEOIDFttPY" role="2iSdaV" />
+      </node>
       <node concept="l2Vlx" id="1pPth$m5B5h" role="2iSdaV" />
     </node>
   </node>
@@ -2824,6 +2731,18 @@
       <node concept="3F0A7n" id="1pPth$m609g" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
+        <node concept="3nxI2P" id="4MEOIDFQk8l" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="1iCGBv" id="4MEOIDFQk5Z" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+        <node concept="1sVBvm" id="4MEOIDFQk60" role="1sWHZn">
+          <node concept="3F0A7n" id="4MEOIDFQk61" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
       </node>
       <node concept="3F0ifn" id="7IysFeA6Upz" role="3EZMnx">
         <property role="3F0ifm" value="for concept" />
@@ -2880,10 +2799,10 @@
       </node>
       <node concept="3F1sOY" id="7IysFe_ZQch" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:7IysFe_ZQc2" resolve="init" />
-        <node concept="lj46D" id="7IysFe_ZQhw" role="3F10Kt">
+        <node concept="lj46D" id="4MEOIDF_LeC" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="pVoyu" id="7IysFe_ZQe5" role="3F10Kt">
+        <node concept="pVoyu" id="4MEOIDF_LeD" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
@@ -2913,7 +2832,7 @@
     <ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
     <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
       <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
+        <property role="3F0ifm" value="[" />
       </node>
       <node concept="3F2HdR" id="1pPth$m6c09" role="3EZMnx">
         <property role="2czwfO" value=" " />
@@ -2922,6 +2841,12 @@
         <node concept="1Bsynf" id="1pPth$m6ptC" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
+        <node concept="lj46D" id="4MEOIDFC6i4" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="4MEOIDFC6kS" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
         <node concept="tppnM" id="1pPth$m6pwx" role="sWeuL">
           <node concept="ljvvj" id="1pPth$m6pwB" role="3F10Kt">
             <property role="VOm3f" value="true" />
@@ -2929,7 +2854,10 @@
         </node>
       </node>
       <node concept="3F0ifn" id="1pPth$m6c01" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
+        <property role="3F0ifm" value="]" />
+        <node concept="pVoyu" id="4MEOIDFC6ny" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="1pPth$m6bZR" role="2iSdaV" />
     </node>
@@ -3041,67 +2969,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="2CEQDIDTdJz">
-    <property role="3GE5qa" value="type.term" />
-    <ref role="1XX52x" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-    <node concept="3EZMnI" id="1pt0VTMv4B6" role="2wV5jI">
-      <node concept="1iCGBv" id="6SKZg6H4nse" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:2CEQDIDTdBu" resolve="template" />
-        <node concept="1sVBvm" id="6SKZg6H4nsg" role="1sWHZn">
-          <node concept="3F0ifn" id="6SKZg6H4nsJ" role="2wV5jI">
-            <property role="3F0ifm" value="◊" />
-          </node>
-        </node>
-      </node>
-      <node concept="3EZMnI" id="2CEQDIE0VTa" role="3EZMnx">
-        <ref role="1k5W1q" node="1iWwVK2DSoW" resolve="Term" />
-        <node concept="3Xmtl4" id="6SKZg6H4k8p" role="3F10Kt">
-          <node concept="1wgc9g" id="1iWwVK2DUSa" role="3XvnJa">
-            <ref role="1wgcnl" node="1iWwVK2DU4l" resolve="TermBrackets" />
-          </node>
-        </node>
-        <node concept="lj46D" id="2CEQDIE0W1v" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bsynf" id="6SKZg6H3wnF" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="2CEQDIE0VTf" role="2iSdaV" />
-        <node concept="3F0ifn" id="35Lj3TiZA7X" role="3EZMnx">
-          <node concept="VPM3Z" id="6p0DfM0p$QV" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="3F1sOY" id="1pt0VTMv4Bd" role="3EZMnx">
-          <ref role="1NtTu8" to="5j4j:6$jH9oLmVNm" resolve="root" />
-        </node>
-        <node concept="3F0ifn" id="35Lj3TiZAUr" role="3EZMnx">
-          <property role="3F0ifm" value="" />
-          <node concept="VPM3Z" id="6p0DfM0p_6F" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="2Hnlc$" id="6SKZg6H33aY" role="2whIAn">
-          <node concept="3clFbS" id="6SKZg6H33aZ" role="2VODD2">
-            <node concept="3clFbF" id="6SKZg6H33b0" role="3cqZAp">
-              <node concept="2OqwBi" id="6SKZg6H33b1" role="3clFbG">
-                <node concept="2ShNRf" id="6SKZg6H33b2" role="2Oq$k0">
-                  <node concept="3g6Rrh" id="6SKZg6H33b3" role="2ShVmc">
-                    <node concept="17QB3L" id="6SKZg6H33b4" role="3g7fb8" />
-                  </node>
-                </node>
-                <node concept="39bAoz" id="6SKZg6H33b5" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="35Lj3TiUy$d" role="2iSdaV" />
-      <node concept="VPM3Z" id="2CEQDIE0W4u" role="3F10Kt">
-        <property role="VOm3f" value="false" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="6wQEDbCHtaR">
     <property role="3GE5qa" value="rule" />
     <ref role="1XX52x" to="wq2x:6wQEDbCHt15" resolve="Fragment" />
@@ -3623,38 +3490,6 @@
         <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
       </node>
       <node concept="l2Vlx" id="18kNIl0jL8a" role="2iSdaV" />
-      <node concept="3EZMnI" id="18kNIl0PNVx" role="3EZMnx">
-        <node concept="VPM3Z" id="18kNIl0PNVz" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="18kNIl0PPZS" role="3EZMnx">
-          <property role="3F0ifm" value="[" />
-          <ref role="1k5W1q" to="tpen:hXb$RYA" resolve="LeftBracket" />
-        </node>
-        <node concept="3F1sOY" id="18kNIl0PR2y" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-        </node>
-        <node concept="3F0ifn" id="18kNIl0PQm8" role="3EZMnx">
-          <property role="3F0ifm" value="]" />
-          <ref role="1k5W1q" to="tpen:hXb$V4T" resolve="RightBracket" />
-        </node>
-        <node concept="l2Vlx" id="18kNIl0PNVA" role="2iSdaV" />
-        <node concept="pkWqt" id="18kNIl0PO8B" role="pqm2j">
-          <node concept="3clFbS" id="18kNIl0PO8C" role="2VODD2">
-            <node concept="3clFbF" id="18kNIl0POfQ" role="3cqZAp">
-              <node concept="2OqwBi" id="18kNIl0PPhF" role="3clFbG">
-                <node concept="2OqwBi" id="18kNIl0POrJ" role="2Oq$k0">
-                  <node concept="pncrf" id="18kNIl0POfP" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="18kNIl0PORl" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="18kNIl0PPGF" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
   </node>
   <node concept="24kQdi" id="18kNIl0F1yM">
@@ -3823,15 +3658,6 @@
         <property role="3F0ifm" value="}" />
         <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
       </node>
-      <node concept="3F0ifn" id="7IysFeA9D7I" role="3EZMnx">
-        <property role="3F0ifm" value="alt" />
-        <node concept="pVoyu" id="7IysFeA9D9H" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="7IysFeA9Da7" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7IysFeA9D7k" resolve="altBlock" />
-      </node>
       <node concept="l2Vlx" id="7IysFe_ZQ6f" role="2iSdaV" />
     </node>
   </node>
@@ -4070,20 +3896,6 @@
       <node concept="l2Vlx" id="7IysFeA5LzV" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7IysFeA83m7">
-    <property role="3GE5qa" value="type.code" />
-    <ref role="1XX52x" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-    <node concept="3EZMnI" id="7IysFeA83m9" role="2wV5jI">
-      <node concept="PMmxH" id="7IysFeA83mi" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="tpch:24YP6ZDyde4" resolve="Keyword" />
-        <node concept="Vb9p2" id="1iWwVK2AkH5" role="3F10Kt">
-          <property role="Vbekb" value="ITALIC" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA83mc" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7IysFeA99pm">
     <property role="3GE5qa" value="type.code" />
     <ref role="1XX52x" to="wq2x:7IysFeA99oR" resolve="TypeLogicalExpression" />
@@ -4098,160 +3910,6 @@
       <node concept="l2Vlx" id="7IysFeA99pr" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7IysFeA9Crk">
-    <property role="3GE5qa" value="type.code" />
-    <ref role="1XX52x" to="wq2x:7IysFeA9CgT" resolve="AltBlock" />
-    <node concept="3EZMnI" id="7IysFeA9Crm" role="2wV5jI">
-      <node concept="3F0ifn" id="7IysFeA9Crn" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-        <node concept="lj46D" id="7IysFeA9Cro" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pkWqt" id="7IysFeA9Crp" role="pqm2j">
-          <node concept="3clFbS" id="7IysFeA9Crq" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA9Crr" role="3cqZAp">
-              <node concept="3fqX7Q" id="7IysFeA9Crs" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA9Crt" role="3fr31v">
-                  <node concept="2OqwBi" id="7IysFeA9Cru" role="2Oq$k0">
-                    <node concept="pncrf" id="7IysFeA9Crv" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="7IysFeA9Crw" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeA9Crx" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="ljvvj" id="7IysFeA9Cry" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="7IysFeA9Crz" role="3EZMnx">
-        <node concept="VPM3Z" id="7IysFeA9Cr$" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="lj46D" id="7IysFeA9Cr_" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="7IysFeA9CrA" role="2iSdaV" />
-        <node concept="3EZMnI" id="7IysFeA9CrB" role="3EZMnx">
-          <property role="S$Qs1" value="true" />
-          <node concept="VPM3Z" id="7IysFeA9CrC" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="pVoyu" id="7IysFeA9CrD" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA9CrE" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA9CrF" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA9CrG" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA9CrH" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA9CrI" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA9CrJ" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA9CrK" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA9CrL" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA9CrM" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="lj46D" id="7IysFeA9CrN" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA9CrO" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA9CrP" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA9CrQ" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA9CrR" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA9CrS" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA9CrT" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA9CrU" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA9CrV" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA9CrW" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="ljvvj" id="7IysFeA9CrX" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA9CrY" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA9CrZ" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA9Cs0" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA9Cs1" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA9Cs2" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA9Cs3" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA9Cs4" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA9Cs5" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA9Cs6" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="l2Vlx" id="7IysFeA9Cs7" role="2iSdaV" />
-          <node concept="3F1sOY" id="7IysFeA9Cs8" role="3EZMnx">
-            <ref role="1NtTu8" to="wq2x:tIwzd1_VRv" resolve="code" />
-          </node>
-          <node concept="3F0ifn" id="7IysFeA9Cs9" role="AHCbl">
-            <property role="3F0ifm" value="{...}" />
-            <ref role="1k5W1q" to="tpen:4vxLnq9T43C" resolve="FoldedCell" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="7IysFeA9Csa" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        <node concept="pkWqt" id="7IysFeA9Csb" role="pqm2j">
-          <node concept="3clFbS" id="7IysFeA9Csc" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA9Csd" role="3cqZAp">
-              <node concept="3fqX7Q" id="7IysFeA9Cse" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA9Csf" role="3fr31v">
-                  <node concept="2OqwBi" id="7IysFeA9Csg" role="2Oq$k0">
-                    <node concept="pncrf" id="7IysFeA9Csh" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="7IysFeA9Csi" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeA9Csj" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="lj46D" id="7IysFeA9Csk" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7IysFeA9Csl" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA9Csm" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="3TnYLtqfh$h">
     <property role="3GE5qa" value="type.code.with" />
     <ref role="1XX52x" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
@@ -4673,155 +4331,6 @@
       </node>
     </node>
   </node>
-  <node concept="3ICXOK" id="4hPXq9Jmeh$">
-    <property role="TrG5h" value="NewTypeConstraint_substitution" />
-    <ref role="aqKnT" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-    <node concept="yp4Wq" id="4hPXq9Jmeh_" role="lGtFl">
-      <property role="yp4Ub" value="ext_2_RTransform" />
-    </node>
-    <node concept="1Qtc8_" id="4hPXq9JmehC" role="IW6Ez">
-      <node concept="3cWJ9i" id="4hPXq9JmehA" role="1Qtc8$">
-        <node concept="CtIbL" id="4hPXq9JmehB" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
-        </node>
-      </node>
-      <node concept="aenpk" id="4hPXq9JmehE" role="1Qtc8A">
-        <node concept="27VH4U" id="4hPXq9JmehF" role="aenpu">
-          <node concept="3clFbS" id="4hPXq9JmehG" role="2VODD2">
-            <node concept="3clFbF" id="4hPXq9JmehH" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9JmehI" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9JmehJ" role="2Oq$k0">
-                  <node concept="7Obwk" id="4hPXq9JmehN" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="4hPXq9JmehL" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="4hPXq9JmehM" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWgqT" id="4hPXq9JmehO" role="aenpr">
-          <node concept="1hCUdq" id="4hPXq9JmehP" role="1hCUd6">
-            <node concept="3clFbS" id="4hPXq9JmehQ" role="2VODD2">
-              <node concept="3clFbF" id="4hPXq9JmehR" role="3cqZAp">
-                <node concept="Xl_RD" id="4hPXq9JmehS" role="3clFbG">
-                  <property role="Xl_RC" value="[" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="IWg2L" id="4hPXq9JmehT" role="IWgqQ">
-            <node concept="3clFbS" id="4hPXq9JmehU" role="2VODD2">
-              <node concept="3clFbF" id="4hPXq9JmehV" role="3cqZAp">
-                <node concept="2OqwBi" id="4hPXq9JmehW" role="3clFbG">
-                  <node concept="2OqwBi" id="4hPXq9JmehX" role="2Oq$k0">
-                    <node concept="7Obwk" id="4hPXq9Jmei3" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="4hPXq9JmehZ" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:18kNIl0OYEq" resolve="substitution" />
-                    </node>
-                  </node>
-                  <node concept="2DeJnY" id="4hPXq9Jmei0" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="3clFbF" id="4hPXq9Jmeia" role="3cqZAp">
-                <node concept="2OqwBi" id="4hPXq9Jmei5" role="3clFbG">
-                  <node concept="7Obwk" id="4hPXq9Jmei4" role="2Oq$k0" />
-                  <node concept="1OKiuA" id="4hPXq9Jmei6" role="2OqNvi">
-                    <node concept="1Q80Hx" id="4hPXq9Jmei7" role="lBI5i" />
-                    <node concept="2B6iha" id="4hPXq9Jmei8" role="lGT1i">
-                      <property role="1lyBwo" value="mostRelevant" />
-                    </node>
-                    <node concept="3cmrfG" id="4hPXq9Jmei9" role="3dN3m$">
-                      <property role="3cmrfH" value="-1" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="IW6AY" id="4hPXq9Jmeid">
-    <ref role="aqKnT" to="wq2x:18kNIl0jL2T" resolve="AsTypeConstraint" />
-    <node concept="1Qtc8_" id="4hPXq9Jmeie" role="IW6Ez">
-      <node concept="3cWJ9i" id="4hPXq9Jmeif" role="1Qtc8$">
-        <node concept="CtIbL" id="4hPXq9Jmeig" role="CtIbM">
-          <property role="CtIbK" value="LEFT" />
-        </node>
-        <node concept="CtIbL" id="4hPXq9Jmeih" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
-        </node>
-      </node>
-      <node concept="L$LW2" id="4hPXq9Jmeii" role="1Qtc8A" />
-    </node>
-    <node concept="1Qtc8_" id="4hPXq9Jmeil" role="IW6Ez">
-      <node concept="3cWJ9i" id="4hPXq9Jmeij" role="1Qtc8$">
-        <node concept="CtIbL" id="4hPXq9Jmeik" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
-        </node>
-      </node>
-      <node concept="aenpk" id="4hPXq9Jmein" role="1Qtc8A">
-        <node concept="27VH4U" id="4hPXq9Jmeio" role="aenpu">
-          <node concept="3clFbS" id="4hPXq9Jmeip" role="2VODD2">
-            <node concept="3clFbF" id="4hPXq9Jmeiq" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmeir" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9Jmeis" role="2Oq$k0">
-                  <node concept="7Obwk" id="4hPXq9Jmeiw" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="4hPXq9Jmeiu" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="4hPXq9Jmeiv" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWgqT" id="4hPXq9Jmeix" role="aenpr">
-          <node concept="1hCUdq" id="4hPXq9Jmeiy" role="1hCUd6">
-            <node concept="3clFbS" id="4hPXq9Jmeiz" role="2VODD2">
-              <node concept="3clFbF" id="4hPXq9Jmei$" role="3cqZAp">
-                <node concept="Xl_RD" id="4hPXq9Jmei_" role="3clFbG">
-                  <property role="Xl_RC" value="[" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="IWg2L" id="4hPXq9JmeiA" role="IWgqQ">
-            <node concept="3clFbS" id="4hPXq9JmeiB" role="2VODD2">
-              <node concept="3clFbF" id="4hPXq9JmeiC" role="3cqZAp">
-                <node concept="2OqwBi" id="4hPXq9JmeiD" role="3clFbG">
-                  <node concept="2OqwBi" id="4hPXq9JmeiE" role="2Oq$k0">
-                    <node concept="7Obwk" id="4hPXq9JmeiK" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="4hPXq9JmeiG" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:18kNIl0PNUA" resolve="substitution" />
-                    </node>
-                  </node>
-                  <node concept="2DeJnY" id="4hPXq9JmeiH" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="3clFbF" id="4hPXq9JmeiR" role="3cqZAp">
-                <node concept="2OqwBi" id="4hPXq9JmeiM" role="3clFbG">
-                  <node concept="7Obwk" id="4hPXq9JmeiL" role="2Oq$k0" />
-                  <node concept="1OKiuA" id="4hPXq9JmeiN" role="2OqNvi">
-                    <node concept="1Q80Hx" id="4hPXq9JmeiO" role="lBI5i" />
-                    <node concept="2B6iha" id="4hPXq9JmeiP" role="lGT1i">
-                      <property role="1lyBwo" value="mostRelevant" />
-                    </node>
-                    <node concept="3cmrfG" id="4hPXq9JmeiQ" role="3dN3m$">
-                      <property role="3cmrfH" value="-1" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="IW6AY" id="4hPXq9JmeiU">
     <ref role="aqKnT" to="wq2x:2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
     <node concept="1Qtc8_" id="4hPXq9JmeiV" role="IW6Ez">
@@ -5233,11 +4742,6 @@
     <node concept="2kknPJ" id="4hPXq9JmenE" role="1IG6uw">
       <ref role="2ZyFGn" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
-    <node concept="1s_PAr" id="4hPXq9JmepO" role="3ft7WO">
-      <node concept="2kknPI" id="4hPXq9JmepP" role="1s_PAo">
-        <ref role="2kkw0f" node="4hPXq9JmenF" resolve="Expression_subst_Type" />
-      </node>
-    </node>
     <node concept="1s_PAr" id="4hPXq9JmerP" role="3ft7WO">
       <node concept="2kknPI" id="4hPXq9JmerQ" role="1s_PAo">
         <ref role="2kkw0f" node="4hPXq9JmepQ" resolve="TypeNode_Expression" />
@@ -5263,133 +4767,6 @@
         <ref role="2kkw0f" node="4hPXq9JmezX" resolve="ContextParameter_Expression" />
       </node>
     </node>
-    <node concept="1s_PAr" id="4hPXq9JmeBc" role="3ft7WO">
-      <node concept="2kknPI" id="4hPXq9JmeBd" role="1s_PAo">
-        <ref role="2kkw0f" node="4hPXq9JmeAw" resolve="TypeConcept_Expression" />
-      </node>
-    </node>
-  </node>
-  <node concept="Q6S24" id="4hPXq9JmenF">
-    <property role="TrG5h" value="Expression_subst_Type" />
-    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="2F$Pav" id="4hPXq9JmenH" role="3ft7WO">
-      <node concept="3Tqbb2" id="4hPXq9JmenI" role="2ZBHrp">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-      </node>
-      <node concept="2$S_p_" id="4hPXq9JmenJ" role="2$S_pT">
-        <node concept="3clFbS" id="4hPXq9JmenK" role="2VODD2">
-          <node concept="3clFbF" id="4hPXq9JmenL" role="3cqZAp">
-            <node concept="10QFUN" id="4hPXq9JmenM" role="3clFbG">
-              <node concept="2OqwBi" id="4hPXq9JmenN" role="10QFUP">
-                <node concept="2ShNRf" id="4hPXq9JmenO" role="2Oq$k0">
-                  <node concept="1pGfFk" id="4hPXq9JmenP" role="2ShVmc">
-                    <ref role="37wK5l" to="35tq:~ModelPlusImportedScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel,boolean,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="ModelPlusImportedScope" />
-                    <node concept="1rpKSd" id="4hPXq9JmenX" role="37wK5m" />
-                    <node concept="3clFbT" id="4hPXq9JmenR" role="37wK5m">
-                      <property role="3clFbU" value="false" />
-                    </node>
-                    <node concept="35c_gC" id="4hPXq9JmenS" role="37wK5m">
-                      <ref role="35c_gD" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="4hPXq9JmenT" role="2OqNvi">
-                  <ref role="37wK5l" to="35tq:~ModelsScope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
-                  <node concept="Xl_RD" id="4hPXq9JmenU" role="37wK5m">
-                    <property role="Xl_RC" value="" />
-                  </node>
-                </node>
-              </node>
-              <node concept="A3Dl8" id="4hPXq9JmenV" role="10QFUM">
-                <node concept="3Tqbb2" id="4hPXq9JmenW" role="A3Ik2">
-                  <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3eGOop" id="4hPXq9Jmeoo" role="2$S_pN">
-        <ref role="3EoQqy" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-        <node concept="16NfWO" id="4hPXq9Jmeop" role="upBLP">
-          <node concept="uGdhv" id="4hPXq9Jmeoq" role="16NeZM">
-            <node concept="3clFbS" id="4hPXq9Jmeor" role="2VODD2">
-              <node concept="3clFbF" id="4hPXq9Jmeos" role="3cqZAp">
-                <node concept="2OqwBi" id="4hPXq9Jmeot" role="3clFbG">
-                  <node concept="2ZBlsa" id="4hPXq9Jmeow" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="4hPXq9Jmeov" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="ucgPf" id="4hPXq9JmeoV" role="3aKz83">
-          <node concept="3clFbS" id="4hPXq9JmeoW" role="2VODD2">
-            <node concept="3cpWs8" id="4hPXq9JmeoX" role="3cqZAp">
-              <node concept="3cpWsn" id="4hPXq9JmeoY" role="3cpWs9">
-                <property role="TrG5h" value="term" />
-                <node concept="3Tqbb2" id="4hPXq9JmeoZ" role="1tU5fm">
-                  <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-                </node>
-                <node concept="2ShNRf" id="4hPXq9Jmep0" role="33vP2m">
-                  <node concept="2fJWfE" id="4hPXq9Jmep1" role="2ShVmc">
-                    <node concept="3Tqbb2" id="4hPXq9Jmep2" role="3zrR0E">
-                      <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmep3" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmep4" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9Jmep5" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9Jmep6" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9JmeoY" resolve="term" />
-                  </node>
-                  <node concept="3TrEf2" id="4hPXq9Jmep7" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="4hPXq9Jmep8" role="2OqNvi">
-                  <node concept="2ZBlsa" id="4hPXq9Jmepm" role="2oxUTC" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmepa" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmepb" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9Jmepc" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9Jmepd" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9JmeoY" resolve="term" />
-                  </node>
-                  <node concept="3TrEf2" id="4hPXq9Jmepe" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="4hPXq9Jmepf" role="2OqNvi">
-                  <node concept="2YIFZM" id="4hPXq9Jmepg" role="2oxUTC">
-                    <ref role="37wK5l" to="hy7p:2N2MQGCJu99" resolve="createFromTemplate" />
-                    <ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
-                    <node concept="2OqwBi" id="4hPXq9Jmeph" role="37wK5m">
-                      <node concept="2ZBlsa" id="4hPXq9Jmepn" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="4hPXq9Jmepj" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmepk" role="3cqZAp">
-              <node concept="37vLTw" id="4hPXq9Jmepl" role="3clFbG">
-                <ref role="3cqZAo" node="4hPXq9JmeoY" resolve="term" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="Q6S24" id="4hPXq9JmepQ">
     <property role="TrG5h" value="TypeNode_Expression" />
@@ -5546,6 +4923,31 @@
         <ref role="4PJHt" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
       </node>
     </node>
+    <node concept="3ft6gV" id="4MEOIDFzaBu" role="3ft7WO">
+      <node concept="3ft6gW" id="4MEOIDFzaFK" role="3ft5RY">
+        <node concept="3clFbS" id="4MEOIDFzaFL" role="2VODD2">
+          <node concept="3clFbF" id="4MEOIDFzaMT" role="3cqZAp">
+            <node concept="2OqwBi" id="4MEOIDFzaMU" role="3clFbG">
+              <node concept="2OqwBi" id="4MEOIDFzaMV" role="2Oq$k0">
+                <node concept="3bvxqY" id="4MEOIDFzaMW" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4MEOIDFzaMX" role="2OqNvi">
+                  <node concept="1xMEDy" id="4MEOIDFzaMY" role="1xVPHs">
+                    <node concept="chp4Y" id="4MEOIDFzb0R" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="4MEOIDFzaN0" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4MEOIDFzaN1" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3ft5Ry" id="4MEOIDFzaXh" role="3ft5RZ">
+        <ref role="4PJHt" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+      </node>
+    </node>
   </node>
   <node concept="3p309x" id="4hPXq9Jmetj">
     <property role="TrG5h" value="Statement_Contribution" />
@@ -6031,38 +5433,6 @@
       </node>
     </node>
   </node>
-  <node concept="Q6S24" id="4hPXq9JmeAw">
-    <property role="TrG5h" value="TypeConcept_Expression" />
-    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="3ft6gV" id="4hPXq9JmeAy" role="3ft7WO">
-      <node concept="3ft6gW" id="4hPXq9JmeAz" role="3ft5RY">
-        <node concept="3clFbS" id="4hPXq9JmeA$" role="2VODD2">
-          <node concept="3clFbF" id="4hPXq9JmeA_" role="3cqZAp">
-            <node concept="2OqwBi" id="4hPXq9JmeAA" role="3clFbG">
-              <node concept="2OqwBi" id="4hPXq9JmeAB" role="2Oq$k0">
-                <node concept="3bvxqY" id="4hPXq9JmeAI" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="4hPXq9JmeAD" role="2OqNvi">
-                  <node concept="1xMEDy" id="4hPXq9JmeAE" role="1xVPHs">
-                    <node concept="chp4Y" id="4hPXq9JmeAF" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="4hPXq9JmeAG" role="1xVPHs" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="4hPXq9JmeAH" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3ft5Ry" id="4hPXq9JmeB9" role="3ft5RZ">
-        <ref role="4PJHt" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-      </node>
-    </node>
-  </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBg">
-    <ref role="aqKnT" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-  </node>
   <node concept="3p36aQ" id="4hPXq9JmeBh">
     <ref role="aqKnT" to="wq2x:7IysFeA99oR" resolve="TypeLogicalExpression" />
   </node>
@@ -6081,9 +5451,6 @@
   <node concept="3p36aQ" id="4hPXq9JmeBm">
     <ref role="aqKnT" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
   </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBn">
-    <ref role="aqKnT" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-  </node>
   <node concept="24kQdi" id="2V8TwD0$Ydv">
     <property role="3GE5qa" value="type.code" />
     <ref role="1XX52x" to="wq2x:2V8TwD0$Yds" resolve="RecoveryBlock" />
@@ -6179,5 +5546,149 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="4MEOIDFfpTe">
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFfpSk" resolve="NewTypePseudoConstraint" />
+    <node concept="3EZMnI" id="4MEOIDFfpTg" role="2wV5jI">
+      <node concept="3F1sOY" id="4MEOIDFfpTn" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDFfpT9" resolve="typeVar" />
+      </node>
+      <node concept="3F0ifn" id="4MEOIDFfpTt" role="3EZMnx">
+        <property role="3F0ifm" value="&lt;-" />
+      </node>
+      <node concept="3F0ifn" id="4MEOIDFfpT_" role="3EZMnx">
+        <property role="3F0ifm" value="newType" />
+        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+      </node>
+      <node concept="3F1sOY" id="4MEOIDFfpTJ" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+      </node>
+      <node concept="l2Vlx" id="4MEOIDFfpTj" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4MEOIDFttNn">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
+      <node concept="3F0ifn" id="4MEOIDFttNw" role="3EZMnx">
+        <property role="3F0ifm" value="term" />
+      </node>
+      <node concept="3F0A7n" id="4MEOIDFttNA" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="3F0ifn" id="4MEOIDFBNXJ" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F2HdR" id="4MEOIDFBNYz" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <ref role="1NtTu8" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+        <node concept="l2Vlx" id="4MEOIDFBNY_" role="2czzBx" />
+      </node>
+      <node concept="3F0ifn" id="4MEOIDFBNYh" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="3F1sOY" id="4MEOIDFttOZ" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDFttNk" resolve="template" />
+        <node concept="lj46D" id="4MEOIDFttPc" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="4MEOIDFttPd" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="4MEOIDFttNs" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4MEOIDFwTyh">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+    <node concept="3EZMnI" id="4MEOIDFwTyj" role="2wV5jI">
+      <node concept="3F1sOY" id="4MEOIDFwTyq" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDFwTy3" resolve="type" />
+      </node>
+      <node concept="3F0A7n" id="4MEOIDFwTyr" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
+      </node>
+      <node concept="l2Vlx" id="4MEOIDFwTym" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4MEOIDFxyqZ">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <node concept="3EZMnI" id="4MEOIDFxyr4" role="2wV5jI">
+      <node concept="1iCGBv" id="4MEOIDFxyre" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+        <node concept="1sVBvm" id="4MEOIDFxyrg" role="1sWHZn">
+          <node concept="3F0A7n" id="4MEOIDFxyrq" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="4MEOIDFxyr7" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="4MEOIDFxyrS">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+  </node>
+  <node concept="24kQdi" id="6p0DfM0g5pD">
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <ref role="1XX52x" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
+    <node concept="3EZMnI" id="6p0DfM0g5sd" role="2wV5jI">
+      <node concept="3F1sOY" id="6p0DfM0geOX" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6p0DfM0gdsG" resolve="typeVar" />
+      </node>
+      <node concept="3F0ifn" id="6p0DfM0geHd" role="3EZMnx">
+        <property role="3F0ifm" value="&lt;-" />
+        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
+      </node>
+      <node concept="3F0ifn" id="6p0DfM0g5uQ" role="3EZMnx">
+        <property role="3F0ifm" value="new" />
+        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+      </node>
+      <node concept="1iCGBv" id="YGS68N6UWi" role="3EZMnx">
+        <property role="1$x2rV" value="&lt;no type declaration&gt;" />
+        <ref role="1NtTu8" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
+        <node concept="1X3_iC" id="4hPXq9JmfbL" role="lGtFl">
+          <property role="3V$3am" value="styleItem" />
+          <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
+          <node concept="2V7CMv" id="7IysFeA3Ois" role="8Wnug">
+            <property role="2V7CMs" value="ext_1_RTransform" />
+            <node concept="xG$WE" id="4hPXq9JmfbK" role="lGtFl" />
+          </node>
+        </node>
+        <node concept="1sVBvm" id="YGS68N6UWk" role="1sWHZn">
+          <node concept="3F0A7n" id="YGS68N73HK" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <ref role="1k5W1q" node="7km57Pk7sC0" resolve="TypeTerm" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="18kNIl0iqmD" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F2HdR" id="7IysFeA3P8t" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <property role="Q2I2d" value="punctuation" />
+        <ref role="1NtTu8" to="wq2x:6p0DfM0gSN1" resolve="argument" />
+        <node concept="l2Vlx" id="7IysFeA3P8v" role="2czzBx" />
+        <node concept="3F0ifn" id="7IysFeA3PjZ" role="2czzBI">
+          <property role="3F0ifm" value="" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="18kNIl0iqN7" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="6p0DfM0g5sg" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 3c9805a8..5fa3972e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -17,7 +17,6 @@
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
-    <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">
@@ -25,7 +24,6 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -39,13 +37,6 @@
       <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="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -62,22 +53,10 @@
       <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="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <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="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <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" />
@@ -97,23 +76,14 @@
       <concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
       <concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
       <concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
-        <property id="2522969319638091386" name="isAvailableInChildNodes" index="2ZfUl0" />
         <reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
         <child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
         <child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
         <child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
       </concept>
-      <concept id="1240316299033" name="jetbrains.mps.lang.intentions.structure.QueryBlock" flags="in" index="38BcoT">
-        <child id="1240393479918" name="paramType" index="3ddBve" />
-      </concept>
-      <concept id="1240322627579" name="jetbrains.mps.lang.intentions.structure.IntentionParameter" flags="nn" index="38Zlrr" />
-      <concept id="1240395258925" name="jetbrains.mps.lang.intentions.structure.ParameterizedIntentionDeclaration" flags="ig" index="3dkpOd">
-        <child id="1240395532443" name="queryBlock" index="3dlsAV" />
-      </concept>
     </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
-      <concept id="767145758118872828" name="jetbrains.mps.lang.actions.structure.NF_Node_ReplaceWithNewOperation" flags="nn" index="2DeJnW" />
     </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">
@@ -122,18 +92,11 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
-        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
-      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
       </concept>
-      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <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="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -146,9 +109,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
-        <reference id="1139867957129" name="concept" index="1_rbq0" />
-      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -164,9 +124,6 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </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>
@@ -180,12 +137,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
-        <child id="1151689745422" name="elementType" index="A3Ik2" />
-      </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-    </language>
   </registry>
   <node concept="2S6QgY" id="1CgWc1TyAgc">
     <property role="TrG5h" value="AddComment" />
@@ -241,179 +192,6 @@
       </node>
     </node>
   </node>
-  <node concept="3dkpOd" id="2CEQDIE0t1p">
-    <property role="TrG5h" value="Ast_replaceWith_TypeTerm" />
-    <property role="2ZfUl0" value="true" />
-    <ref role="2ZfgGC" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
-    <node concept="2S6ZIM" id="2CEQDIE0t1q" role="2ZfVej">
-      <node concept="3clFbS" id="2CEQDIE0t1r" role="2VODD2">
-        <node concept="3clFbF" id="2CEQDIE0Eqx" role="3cqZAp">
-          <node concept="3cpWs3" id="2CEQDIE0Fhc" role="3clFbG">
-            <node concept="2OqwBi" id="2CEQDIE0Ftg" role="3uHU7w">
-              <node concept="38Zlrr" id="2CEQDIE0Fmp" role="2Oq$k0" />
-              <node concept="3TrcHB" id="2CEQDIE0FCR" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
-            </node>
-            <node concept="Xl_RD" id="2CEQDIE0Eqw" role="3uHU7B">
-              <property role="Xl_RC" value="Replace with " />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="2CEQDIE0t1s" role="2ZfgGD">
-      <node concept="3clFbS" id="2CEQDIE0t1t" role="2VODD2">
-        <node concept="3cpWs8" id="2CEQDIE0GfW" role="3cqZAp">
-          <node concept="3cpWsn" id="2CEQDIE0GfX" role="3cpWs9">
-            <property role="TrG5h" value="ast" />
-            <node concept="3Tqbb2" id="2CEQDIE0Gf$" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
-            </node>
-            <node concept="2Sf5sV" id="2CEQDIE0GfY" role="33vP2m" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2CEQDIE2KNK" role="3cqZAp">
-          <node concept="3cpWsn" id="2CEQDIE2KNL" role="3cpWs9">
-            <property role="TrG5h" value="cpd" />
-            <node concept="3Tqbb2" id="2CEQDIE2KNC" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-            </node>
-            <node concept="2YIFZM" id="2CEQDIE2KNM" role="33vP2m">
-              <ref role="37wK5l" to="hy7p:2CEQDIE2hE2" resolve="createFromTemplateAndPrototype" />
-              <ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
-              <node concept="2OqwBi" id="2CEQDIE2KNN" role="37wK5m">
-                <node concept="38Zlrr" id="2CEQDIE2KNO" role="2Oq$k0" />
-                <node concept="3TrEf2" id="2CEQDIE2KNP" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                </node>
-              </node>
-              <node concept="1PxgMI" id="2CEQDIE2Mno" role="37wK5m">
-                <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                <node concept="2OqwBi" id="2CEQDIE2KNQ" role="1m5AlR">
-                  <node concept="37vLTw" id="2CEQDIE2KNR" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2CEQDIE0GfX" resolve="ast" />
-                  </node>
-                  <node concept="3TrEf2" id="2CEQDIE2KNS" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2CEQDIE0GdA" role="3cqZAp">
-          <node concept="3cpWsn" id="2CEQDIE0GdB" role="3cpWs9">
-            <property role="TrG5h" value="tterm" />
-            <node concept="3Tqbb2" id="2CEQDIE0Gd_" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-            </node>
-            <node concept="2OqwBi" id="2CEQDIE0GdC" role="33vP2m">
-              <node concept="2Sf5sV" id="2CEQDIE0GdD" role="2Oq$k0" />
-              <node concept="2DeJnW" id="2CEQDIE0GdE" role="2OqNvi">
-                <ref role="1_rbq0" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2CEQDIE0FNt" role="3cqZAp">
-          <node concept="2OqwBi" id="2CEQDIE0GGQ" role="3clFbG">
-            <node concept="2OqwBi" id="2CEQDIE0Glf" role="2Oq$k0">
-              <node concept="37vLTw" id="2CEQDIE0GdF" role="2Oq$k0">
-                <ref role="3cqZAo" node="2CEQDIE0GdB" resolve="tterm" />
-              </node>
-              <node concept="3TrEf2" id="2CEQDIE0GvX" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
-              </node>
-            </node>
-            <node concept="2oxUTD" id="2CEQDIE0GZT" role="2OqNvi">
-              <node concept="38Zlrr" id="2CEQDIE0H0S" role="2oxUTC" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2CEQDIE0H3k" role="3cqZAp">
-          <node concept="2OqwBi" id="2CEQDIE0HEj" role="3clFbG">
-            <node concept="2OqwBi" id="2CEQDIE0H9O" role="2Oq$k0">
-              <node concept="37vLTw" id="2CEQDIE0H3i" role="2Oq$k0">
-                <ref role="3cqZAo" node="2CEQDIE0GdB" resolve="tterm" />
-              </node>
-              <node concept="3TrEf2" id="2CEQDIE0HuN" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-              </node>
-            </node>
-            <node concept="2oxUTD" id="2CEQDIE0HRa" role="2OqNvi">
-              <node concept="37vLTw" id="2CEQDIE2MIE" role="2oxUTC">
-                <ref role="3cqZAo" node="2CEQDIE2KNL" resolve="cpd" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="38BcoT" id="2CEQDIE0tgl" role="3dlsAV">
-      <node concept="3clFbS" id="2CEQDIE0tgm" role="2VODD2">
-        <node concept="3clFbF" id="2CEQDIE0v$3" role="3cqZAp">
-          <node concept="2OqwBi" id="2CEQDIE0zUW" role="3clFbG">
-            <node concept="1eOMI4" id="2CEQDIE0y0B" role="2Oq$k0">
-              <node concept="10QFUN" id="2CEQDIE0y0$" role="1eOMHV">
-                <node concept="A3Dl8" id="2CEQDIE0ytM" role="10QFUM">
-                  <node concept="3Tqbb2" id="2CEQDIE0yUe" role="A3Ik2">
-                    <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="2CEQDIE0y0D" role="10QFUP">
-                  <node concept="2ShNRf" id="2CEQDIE0y0E" role="2Oq$k0">
-                    <node concept="1pGfFk" id="2CEQDIE0y0F" role="2ShVmc">
-                      <ref role="37wK5l" to="35tq:~ModelPlusImportedScope.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModel,boolean,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="ModelPlusImportedScope" />
-                      <node concept="2OqwBi" id="2CEQDIE0_Kw" role="37wK5m">
-                        <node concept="2Sf5sV" id="2CEQDIE0_wx" role="2Oq$k0" />
-                        <node concept="I4A8Y" id="2CEQDIE0A6K" role="2OqNvi" />
-                      </node>
-                      <node concept="3clFbT" id="2CEQDIE0y0H" role="37wK5m">
-                        <property role="3clFbU" value="false" />
-                      </node>
-                      <node concept="35c_gC" id="2CEQDIE0y0I" role="37wK5m">
-                        <ref role="35c_gD" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="2CEQDIE0y0J" role="2OqNvi">
-                    <ref role="37wK5l" to="35tq:~ModelsScope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
-                    <node concept="Xl_RD" id="2CEQDIE0y0K" role="37wK5m">
-                      <property role="Xl_RC" value="" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="2CEQDIE0$Fa" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2CEQDIE0tpn" role="3ddBve">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-      </node>
-    </node>
-    <node concept="2SaL7w" id="2CEQDIE34ld" role="2ZfVeh">
-      <node concept="3clFbS" id="2CEQDIE34le" role="2VODD2">
-        <node concept="3clFbF" id="2CEQDIE34ZN" role="3cqZAp">
-          <node concept="2OqwBi" id="2CEQDIE35so" role="3clFbG">
-            <node concept="2OqwBi" id="2CEQDIE354c" role="2Oq$k0">
-              <node concept="2Sf5sV" id="2CEQDIE34ZM" role="2Oq$k0" />
-              <node concept="3TrEf2" id="2CEQDIE35ef" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-              </node>
-            </node>
-            <node concept="1mIQ4w" id="2CEQDIE35EY" role="2OqNvi">
-              <node concept="chp4Y" id="2CEQDIE35PP" role="cj9EA">
-                <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="2S6QgY" id="4sSe4$p4oTF">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="LogicalVariable_specifyValue" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index bf9a8ad2..f1490ca8 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -92,44 +92,6 @@
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7eGEHDlgPU1">
-    <property role="TrG5h" value="NewTypeConstraint" />
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="34LRSv" value="new type" />
-    <property role="EcuMT" value="8335224865066016385" />
-    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
-    <node concept="1TJgyj" id="YGS68N6UU4" role="1TKVEi">
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="typeDeclaration" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="1129524318932020868" />
-      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="typeVar" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="7368070394768578348" />
-      <ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
-    </node>
-    <node concept="1TJgyj" id="6p0DfM0gSN1" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="argument" />
-      <property role="20lbJX" value="0..n" />
-      <property role="IQ2ns" value="7368070394768755905" />
-      <ref role="20lvS9" node="7IysFeA4qCy" resolve="NewTypeParameterBinding" />
-    </node>
-    <node concept="1TJgyj" id="18kNIl0OYEq" role="1TKVEi">
-      <property role="IQ2ns" value="1302893676247378586" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="substitution" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-      <node concept="asaX9" id="1L74NXEmA16" role="lGtFl" />
-    </node>
-    <node concept="PrWs8" id="1L74NXEmF9w" role="PzmwI">
-      <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="7eGEHDlgPU4">
     <property role="TrG5h" value="Rule" />
     <property role="R5$K7" value="false" />
@@ -782,6 +744,13 @@
       <property role="IQ2ns" value="1618328391714763070" />
       <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
     </node>
+    <node concept="1TJgyj" id="4MEOIDFttPg" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797190401360" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="termDeclaration" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    </node>
     <node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
@@ -810,12 +779,20 @@
       <property role="IQ2ns" value="6677504323281689839" />
       <ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
     </node>
+    <node concept="1TJgyj" id="4MEOIDF_kTL" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797192461937" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="termDecl" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    </node>
     <node concept="1TJgyj" id="1pPth$m5BbA" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="term" />
-      <property role="20lbJX" value="1" />
+      <property role="20lbJX" value="0..1" />
       <property role="IQ2ns" value="1618328391714763494" />
       <ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
+      <node concept="asaX9" id="4MEOIDFRaM8" role="lGtFl" />
     </node>
     <node concept="1TJgyj" id="2V8TwD0$Z8f" role="1TKVEi">
       <property role="IQ2ns" value="3371197252794315279" />
@@ -834,22 +811,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="2CEQDIDRX6M">
-    <property role="3GE5qa" value="type.term" />
-    <property role="TrG5h" value="TypeTermExpression" />
-    <property role="EcuMT" value="3038481260719624626" />
-    <ref role="1TJDcQ" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
-    <node concept="1TJgyj" id="2CEQDIDTdBu" role="1TKVEi">
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="3038481260719954398" />
-      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
-    </node>
-    <node concept="PrWs8" id="2CEQDIDXzlI" role="PzmwI">
-      <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="6wQEDbCL4Fi">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="IncludeFragmentClause" />
@@ -942,13 +903,6 @@
       <property role="20kJfa" value="origin" />
       <ref role="20lvS9" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
     </node>
-    <node concept="1TJgyj" id="18kNIl0PNUA" role="1TKVEi">
-      <property role="IQ2ns" value="1302893676247596710" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="substitution" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-      <node concept="asaX9" id="1L74NXEmA18" role="lGtFl" />
-    </node>
   </node>
   <node concept="1TIwiD" id="18kNIl0mxXI">
     <property role="EcuMT" value="1302893676239396718" />
@@ -984,12 +938,6 @@
     <property role="3GE5qa" value="type.decl" />
     <property role="TrG5h" value="TypeInitializer" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7IysFeA9D7k" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128804520404" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="altBlock" />
-      <ref role="20lvS9" node="7IysFeA9CgT" resolve="AltBlock" />
-    </node>
     <node concept="1TJgyj" id="7IysFe_ZPXC" role="1TKVEi">
       <property role="IQ2ns" value="8908809128801951592" />
       <property role="20lmBu" value="aggregation" />
@@ -1082,6 +1030,7 @@
       <property role="20kJfa" value="parameter" />
       <ref role="20lvS9" node="7IysFeA0yb0" resolve="TypeDeclarationParameter" />
     </node>
+    <node concept="asaX9" id="4MEOIDFsyAO" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="7IysFeA5Lco">
     <property role="EcuMT" value="8908809128803504920" />
@@ -1089,16 +1038,6 @@
     <property role="TrG5h" value="InitBlock" />
     <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
   </node>
-  <node concept="1TIwiD" id="7IysFeA7WUr">
-    <property role="EcuMT" value="8908809128804077211" />
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="TypeConceptExpression" />
-    <property role="34LRSv" value="typeConcept" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="PrWs8" id="7IysFeA7WUs" role="PzmwI">
-      <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="7IysFeA99oR">
     <property role="EcuMT" value="8908809128804390455" />
     <property role="3GE5qa" value="type.code" />
@@ -1109,12 +1048,6 @@
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7IysFeA9CgT">
-    <property role="EcuMT" value="8908809128804516921" />
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="AltBlock" />
-    <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
-  </node>
   <node concept="PlHQZ" id="7IysFeBd3kI">
     <property role="EcuMT" value="8908809128822191406" />
     <property role="TrG5h" value="ApplicationSessionParticipant" />
@@ -1348,5 +1281,119 @@
       <ref role="20lvS9" node="6p0DfM0asBO" resolve="ConstraintDeclaration" />
     </node>
   </node>
+  <node concept="1TIwiD" id="4MEOIDFfpSk">
+    <property role="EcuMT" value="5524459797186715156" />
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <property role="TrG5h" value="NewTypePseudoConstraint" />
+    <property role="34LRSv" value="new type" />
+    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
+    <node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797186715209" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="typeVar" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
+    </node>
+    <node concept="1TJgyj" id="4MEOIDFfpTb" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797186715211" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="typeTerm" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4MEOIDFttoe">
+    <property role="EcuMT" value="5524459797190399502" />
+    <property role="3GE5qa" value="type.term" />
+    <property role="TrG5h" value="TypeTermDeclaration" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="4MEOIDFttNi" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797190401234" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="parameter" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+    </node>
+    <node concept="1TJgyj" id="4MEOIDFttNk" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797190401236" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="template" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDFttNg" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4MEOIDFwTxW">
+    <property role="EcuMT" value="5524459797191301244" />
+    <property role="3GE5qa" value="type.term" />
+    <property role="TrG5h" value="TypeTermDeclarationParameter" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="4MEOIDFwTy3" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797191301251" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="type" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDFwTxX" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDFwTxY" role="PzmwI">
+      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDFwTxZ" role="PzmwI">
+      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4MEOIDFxxDM">
+    <property role="EcuMT" value="5524459797191465586" />
+    <property role="3GE5qa" value="type.term" />
+    <property role="TrG5h" value="TypeTermDeclarationParameterReference" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="4MEOIDFxxDY" role="1TKVEi">
+      <property role="IQ2ns" value="5524459797191465598" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="parameter" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDFxxDW" role="PzmwI">
+      <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7eGEHDlgPU1">
+    <property role="TrG5h" value="NewTypeConstraint" />
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <property role="34LRSv" value="new type (deprecated)" />
+    <property role="EcuMT" value="8335224865066016385" />
+    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
+    <node concept="1TJgyj" id="YGS68N6UU4" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="typeDeclaration" />
+      <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="1129524318932020868" />
+      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
+    </node>
+    <node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="typeVar" />
+      <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="7368070394768578348" />
+      <ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
+    </node>
+    <node concept="1TJgyj" id="6p0DfM0gSN1" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="argument" />
+      <property role="20lbJX" value="0..n" />
+      <property role="IQ2ns" value="7368070394768755905" />
+      <ref role="20lvS9" node="7IysFeA4qCy" resolve="NewTypeParameterBinding" />
+    </node>
+    <node concept="PrWs8" id="4MEOIDGwNay" role="PzmwI">
+      <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
+    </node>
+    <node concept="asaX9" id="4MEOIDFfpT7" role="lGtFl" />
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 4f7f59d2..606ff606 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -45,10 +45,6 @@
       <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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -81,7 +77,6 @@
       <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="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -184,9 +179,6 @@
       </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
-        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
-      </concept>
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
         <child id="1154546920563" name="concept" index="3gmYPZ" />
       </concept>
@@ -202,7 +194,6 @@
         <child id="6039268229364358387" name="concept" index="1pnPq6" />
       </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
@@ -232,9 +223,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -1002,129 +990,6 @@
       <ref role="1YaFvo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
     </node>
   </node>
-  <node concept="18kY7G" id="67SsWaEdTGN">
-    <property role="TrG5h" value="check_TypeTerm" />
-    <property role="3GE5qa" value="type.term" />
-    <node concept="3clFbS" id="67SsWaEdTGO" role="18ibNy">
-      <node concept="3clFbJ" id="67SsWaEeEwV" role="3cqZAp">
-        <node concept="3clFbS" id="67SsWaEeEwX" role="3clFbx">
-          <node concept="2MkqsV" id="67SsWaEeFu9" role="3cqZAp">
-            <node concept="3cpWs3" id="67SsWaEeGfN" role="2MkJ7o">
-              <node concept="Xl_RD" id="67SsWaEeGjb" role="3uHU7w">
-                <property role="Xl_RC" value=" is expected" />
-              </node>
-              <node concept="3cpWs3" id="67SsWaEeFEP" role="3uHU7B">
-                <node concept="Xl_RD" id="67SsWaEeFuo" role="3uHU7B">
-                  <property role="Xl_RC" value="an instance of " />
-                </node>
-                <node concept="2OqwBi" id="67SsWaEeFOv" role="3uHU7w">
-                  <node concept="3TUQnm" id="67SsWaEeFF7" role="2Oq$k0">
-                    <ref role="3TV0OU" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                  </node>
-                  <node concept="3TrcHB" id="67SsWaEeIeC" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1YBJjd" id="67SsWaEeGy4" role="2OEOjV">
-              <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-            </node>
-          </node>
-          <node concept="3clFbH" id="67SsWaEeGIS" role="3cqZAp" />
-        </node>
-        <node concept="3fqX7Q" id="67SsWaEeFqc" role="3clFbw">
-          <node concept="2OqwBi" id="67SsWaEeFqe" role="3fr31v">
-            <node concept="2OqwBi" id="67SsWaEeFqf" role="2Oq$k0">
-              <node concept="1YBJjd" id="67SsWaEeFqg" role="2Oq$k0">
-                <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-              </node>
-              <node concept="3TrEf2" id="67SsWaEeFqh" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-              </node>
-            </node>
-            <node concept="1mIQ4w" id="67SsWaEeFqi" role="2OqNvi">
-              <node concept="chp4Y" id="67SsWaEeFqj" role="cj9EA">
-                <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3eNFk2" id="67SsWaEeG_m" role="3eNLev">
-          <node concept="3clFbS" id="67SsWaEeG_o" role="3eOfB_">
-            <node concept="3cpWs8" id="67SsWaEfmC5" role="3cqZAp">
-              <node concept="3cpWsn" id="67SsWaEfmC6" role="3cpWs9">
-                <property role="TrG5h" value="msg" />
-                <node concept="17QB3L" id="67SsWaEfmC4" role="1tU5fm" />
-                <node concept="2YIFZM" id="67SsWaEfmC7" role="33vP2m">
-                  <ref role="37wK5l" to="hy7p:67SsWaEdYHz" resolve="validateWithTemplate" />
-                  <ref role="1Pybhc" to="hy7p:2N2MQGCJu8I" resolve="TypeTermUtil" />
-                  <node concept="1PxgMI" id="67SsWaEfmC8" role="37wK5m">
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                    <node concept="2OqwBi" id="67SsWaEfmC9" role="1m5AlR">
-                      <node concept="1YBJjd" id="67SsWaEfmCa" role="2Oq$k0">
-                        <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-                      </node>
-                      <node concept="3TrEf2" id="67SsWaEfmCb" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="67SsWaEfmCc" role="37wK5m">
-                    <node concept="2OqwBi" id="67SsWaEfmCd" role="2Oq$k0">
-                      <node concept="1YBJjd" id="67SsWaEfmCe" role="2Oq$k0">
-                        <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-                      </node>
-                      <node concept="3TrEf2" id="67SsWaEfmCf" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="67SsWaEfmCg" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1pPth$m5BbA" resolve="term" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="67SsWaEeD_k" role="3cqZAp">
-              <node concept="3clFbS" id="67SsWaEeD_m" role="3clFbx">
-                <node concept="2MkqsV" id="67SsWaEeIhW" role="3cqZAp">
-                  <node concept="37vLTw" id="67SsWaEfncz" role="2MkJ7o">
-                    <ref role="3cqZAo" node="67SsWaEfmC6" resolve="msg" />
-                  </node>
-                  <node concept="1YBJjd" id="67SsWaEeIyz" role="2OEOjV">
-                    <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-                  </node>
-                </node>
-                <node concept="3clFbH" id="67SsWaEeIzu" role="3cqZAp" />
-              </node>
-              <node concept="3y3z36" id="67SsWaEfn77" role="3clFbw">
-                <node concept="10Nm6u" id="67SsWaEfn7e" role="3uHU7w" />
-                <node concept="37vLTw" id="67SsWaEfmYo" role="3uHU7B">
-                  <ref role="3cqZAo" node="67SsWaEfmC6" resolve="msg" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="67SsWaEeBK6" role="3eO9$A">
-            <node concept="2OqwBi" id="67SsWaEeBog" role="2Oq$k0">
-              <node concept="1YBJjd" id="67SsWaEeBlA" role="2Oq$k0">
-                <ref role="1YBMHb" node="67SsWaEdTGQ" resolve="typeTerm" />
-              </node>
-              <node concept="3TrEf2" id="67SsWaEeByV" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:2CEQDIDTdBu" resolve="template" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="67SsWaEeC2w" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="67SsWaEdTGQ" role="1YuTPh">
-      <property role="TrG5h" value="typeTerm" />
-      <ref role="1YaFvo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7feMCq_1rI_">
     <property role="TrG5h" value="typeof_CodeBlock" />
     <property role="3GE5qa" value="" />
@@ -1472,89 +1337,6 @@
       <ref role="1YaFvo" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7IysFeA7WUT">
-    <property role="TrG5h" value="typeof_TypeConceptExpression" />
-    <property role="3GE5qa" value="type.code" />
-    <node concept="3clFbS" id="7IysFeA7WUU" role="18ibNy">
-      <node concept="3cpWs8" id="7IysFeA7YtX" role="3cqZAp">
-        <node concept="3cpWsn" id="7IysFeA7YtY" role="3cpWs9">
-          <property role="TrG5h" value="tcd" />
-          <node concept="3Tqbb2" id="7IysFeA7YtT" role="1tU5fm">
-            <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-          </node>
-          <node concept="2OqwBi" id="7IysFeA7YtZ" role="33vP2m">
-            <node concept="1YBJjd" id="7IysFeA7Yu0" role="2Oq$k0">
-              <ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
-            </node>
-            <node concept="2Xjw5R" id="7IysFeA7Yu1" role="2OqNvi">
-              <node concept="1xMEDy" id="7IysFeA7Yu2" role="1xVPHs">
-                <node concept="chp4Y" id="7IysFeA7Yu3" role="ri$Ld">
-                  <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                </node>
-              </node>
-              <node concept="1xIGOp" id="7IysFeA7Yu4" role="1xVPHs" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2Mj0R9" id="7IysFeA7Zcb" role="3cqZAp">
-        <node concept="2OqwBi" id="7IysFeA7ZkQ" role="2MkoU_">
-          <node concept="37vLTw" id="7IysFeA7Zcv" role="2Oq$k0">
-            <ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
-          </node>
-          <node concept="3x8VRR" id="7IysFeA7Z_I" role="2OqNvi" />
-        </node>
-        <node concept="Xl_RD" id="7IysFeA7ZBX" role="2MkJ7o">
-          <property role="Xl_RC" value="not applicable here" />
-        </node>
-        <node concept="1YBJjd" id="7IysFeA7ZEJ" role="2OEOjV">
-          <ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
-        </node>
-      </node>
-      <node concept="3clFbJ" id="7IysFeA7YwW" role="3cqZAp">
-        <node concept="3clFbS" id="7IysFeA7YwY" role="3clFbx">
-          <node concept="1Z5TYs" id="7IysFeA7X6C" role="3cqZAp">
-            <node concept="mw_s8" id="7IysFeA7X6F" role="1ZfhK$">
-              <node concept="1Z2H0r" id="7IysFeA7WV6" role="mwGJk">
-                <node concept="1YBJjd" id="7IysFeA7WWQ" role="1Z2MuG">
-                  <ref role="1YBMHb" node="7IysFeA7WUW" resolve="tce" />
-                </node>
-              </node>
-            </node>
-            <node concept="mw_s8" id="7IysFeA7XSJ" role="1ZfhKB">
-              <node concept="2c44tf" id="7IysFeA7XSF" role="mwGJk">
-                <node concept="3bZ5Sz" id="7IysFeA7XT5" role="2c44tc">
-                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                  <node concept="2c44tb" id="7IysFeA7XUV" role="lGtFl">
-                    <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/6677504323281689838/6677504323281689839" />
-                    <property role="2qtEX8" value="conceptDeclaraton" />
-                    <node concept="2OqwBi" id="7IysFeA80Fx" role="2c44t1">
-                      <node concept="37vLTw" id="7IysFeA80zR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
-                      </node>
-                      <node concept="3TrEf2" id="7IysFeA80Rk" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2OqwBi" id="7IysFeA7YME" role="3clFbw">
-          <node concept="37vLTw" id="7IysFeA7Yxt" role="2Oq$k0">
-            <ref role="3cqZAo" node="7IysFeA7YtY" resolve="tcd" />
-          </node>
-          <node concept="3x8VRR" id="7IysFeA7Z3s" role="2OqNvi" />
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7IysFeA7WUW" role="1YuTPh">
-      <property role="TrG5h" value="tce" />
-      <ref role="1YaFvo" to="wq2x:7IysFeA7WUr" resolve="TypeConceptExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7IysFeA9bof">
     <property role="TrG5h" value="typeof_TypeLogicalExpression" />
     <property role="3GE5qa" value="type.code" />
@@ -1767,5 +1549,39 @@
       <ref role="1YaFvo" to="wq2x:2V8TwD148$8" resolve="RecoverOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="4MEOIDFzuUN">
+    <property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
+    <property role="3GE5qa" value="type.term" />
+    <node concept="3clFbS" id="4MEOIDFzuUO" role="18ibNy">
+      <node concept="1Z5TYs" id="4MEOIDFzv5A" role="3cqZAp">
+        <node concept="mw_s8" id="4MEOIDFzv5S" role="1ZfhKB">
+          <node concept="2OqwBi" id="4MEOIDFzvH_" role="mwGJk">
+            <node concept="2OqwBi" id="4MEOIDFzvf3" role="2Oq$k0">
+              <node concept="1YBJjd" id="4MEOIDFzv5Q" role="2Oq$k0">
+                <ref role="1YBMHb" node="4MEOIDFzuUQ" resolve="ttdpr" />
+              </node>
+              <node concept="3TrEf2" id="4MEOIDFzvoH" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="4MEOIDFzwap" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="4MEOIDFzv5D" role="1ZfhK$">
+          <node concept="1Z2H0r" id="4MEOIDFzuV6" role="mwGJk">
+            <node concept="1YBJjd" id="4MEOIDFzuWQ" role="1Z2MuG">
+              <ref role="1YBMHb" node="4MEOIDFzuUQ" resolve="ttdpr" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="4MEOIDFzuUQ" role="1YuTPh">
+      <property role="TrG5h" value="ttdpr" />
+      <ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index 37f1ed21..937dfbb2 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -3018,98 +3018,100 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1eKXYsjvS86" role="jymVt" />
-    <node concept="3clFb_" id="7IysFeAaLtH" role="jymVt">
+    <node concept="2tJIrI" id="4MEOIDFgTKR" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDFgV3a" role="jymVt">
       <property role="TrG5h" value="newType" />
-      <node concept="37vLTG" id="7IysFeAaLtI" role="3clF46">
+      <node concept="37vLTG" id="4MEOIDFgV3b" role="3clF46">
         <property role="TrG5h" value="typevar" />
         <property role="3TUv4t" value="true" />
-        <node concept="26uTi9" id="7IysFeAaLtJ" role="1tU5fm" />
+        <node concept="26uTi9" id="4MEOIDFgV3c" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="7IysFeAaLx9" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="7IysFeAaLxa" role="1tU5fm" />
+      <node concept="37vLTG" id="4MEOIDFgZnJ" role="3clF46">
+        <property role="TrG5h" value="typeTplId" />
+        <node concept="3uibUv" id="4MEOIDFgZnK" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
       </node>
-      <node concept="37vLTG" id="7IysFeAaLxb" role="3clF46">
+      <node concept="37vLTG" id="4MEOIDFgV3f" role="3clF46">
         <property role="TrG5h" value="args" />
         <property role="3TUv4t" value="true" />
-        <node concept="8X2XB" id="7IysFeAaLxc" role="1tU5fm">
-          <node concept="3uibUv" id="7IysFeAaLxd" role="8Xvag">
+        <node concept="8X2XB" id="4MEOIDFgV3g" role="1tU5fm">
+          <node concept="3uibUv" id="4MEOIDFgV3h" role="8Xvag">
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="4JJCDImUuo7" role="3clF45">
+      <node concept="3uibUv" id="4MEOIDFgV3i" role="3clF45">
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
-      <node concept="3Tm1VV" id="7IysFeAaLtN" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeAaLtO" role="3clF47">
-        <node concept="3clFbF" id="1eKXYsjwI5T" role="3cqZAp">
-          <node concept="1rXfSq" id="1eKXYsjwI5U" role="3clFbG">
-            <ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
-            <node concept="37vLTw" id="1eKXYsjwJDF" role="37wK5m">
-              <ref role="3cqZAo" node="7IysFeAaLx9" resolve="typeConcept" />
+      <node concept="3Tm1VV" id="4MEOIDFgV3j" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDFgV3k" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDFgV3l" role="3cqZAp">
+          <node concept="1rXfSq" id="4MEOIDFgV3m" role="3clFbG">
+            <ref role="37wK5l" node="4MEOIDEfToN" resolve="withTypeTemplate" />
+            <node concept="37vLTw" id="4MEOIDFh09X" role="37wK5m">
+              <ref role="3cqZAo" node="4MEOIDFgZnJ" resolve="typeTplId" />
             </node>
-            <node concept="2ShNRf" id="1eKXYsjwI5Y" role="37wK5m">
-              <node concept="YeOm9" id="1eKXYsjwI5Z" role="2ShVmc">
-                <node concept="1Y3b0j" id="1eKXYsjwI60" role="YeSDq">
+            <node concept="2ShNRf" id="4MEOIDFgV3o" role="37wK5m">
+              <node concept="YeOm9" id="4MEOIDFgV3p" role="2ShVmc">
+                <node concept="1Y3b0j" id="4MEOIDFgV3q" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                   <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
-                  <node concept="3Tm1VV" id="1eKXYsjwI61" role="1B3o_S" />
-                  <node concept="3clFb_" id="1eKXYsjwI62" role="jymVt">
+                  <node concept="3Tm1VV" id="4MEOIDFgV3r" role="1B3o_S" />
+                  <node concept="3clFb_" id="4MEOIDFgV3s" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="1eKXYsjwI63" role="3clF46">
+                    <node concept="37vLTG" id="4MEOIDFgV3t" role="3clF46">
                       <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="1eKXYsjwI64" role="1tU5fm">
+                      <node concept="3uibUv" id="4MEOIDFgV3u" role="1tU5fm">
                         <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                        <node concept="16syzq" id="1eKXYsjwI65" role="11_B2D">
-                          <ref role="16sUi3" node="1eKXYsjwI6j" resolve="Cfg" />
+                        <node concept="16syzq" id="4MEOIDFgV3v" role="11_B2D">
+                          <ref role="16sUi3" node="4MEOIDFgV3H" resolve="Cfg" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3uibUv" id="1eKXYsjwI66" role="3clF45">
+                    <node concept="3uibUv" id="4MEOIDFgV3w" role="3clF45">
                       <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
-                    <node concept="3Tm1VV" id="1eKXYsjwI67" role="1B3o_S" />
-                    <node concept="3clFbS" id="1eKXYsjwI68" role="3clF47">
-                      <node concept="3clFbF" id="4KRwoelDUAi" role="3cqZAp">
-                        <node concept="2OqwBi" id="4KRwoelDUAj" role="3clFbG">
-                          <node concept="37vLTw" id="4KRwoelDUAk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1eKXYsjwI63" resolve="typeTemplate" />
+                    <node concept="3Tm1VV" id="4MEOIDFgV3x" role="1B3o_S" />
+                    <node concept="3clFbS" id="4MEOIDFgV3y" role="3clF47">
+                      <node concept="3clFbF" id="4MEOIDFgV3z" role="3cqZAp">
+                        <node concept="2OqwBi" id="4MEOIDFgV3$" role="3clFbG">
+                          <node concept="37vLTw" id="4MEOIDFgV3_" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4MEOIDFgV3t" resolve="typeTemplate" />
                           </node>
-                          <node concept="liA8E" id="4KRwoelDUAl" role="2OqNvi">
+                          <node concept="liA8E" id="4MEOIDFgV3A" role="2OqNvi">
                             <ref role="37wK5l" to="psr6:1eKXYsjvsWF" resolve="bindType" />
-                            <node concept="2OqwBi" id="4KRwoelDUAm" role="37wK5m">
-                              <node concept="37vLTw" id="4KRwoelDUAn" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1eKXYsjwI63" resolve="typeTemplate" />
+                            <node concept="2OqwBi" id="4MEOIDFgV3B" role="37wK5m">
+                              <node concept="37vLTw" id="4MEOIDFgV3C" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4MEOIDFgV3t" resolve="typeTemplate" />
                               </node>
-                              <node concept="liA8E" id="4KRwoelDUAo" role="2OqNvi">
+                              <node concept="liA8E" id="4MEOIDFgV3D" role="2OqNvi">
                                 <ref role="37wK5l" to="psr6:1eKXYsjvsWn" resolve="withArgs" />
-                                <node concept="37vLTw" id="4KRwoelDX7G" role="37wK5m">
-                                  <ref role="3cqZAo" node="7IysFeAaLxb" resolve="args" />
+                                <node concept="37vLTw" id="4MEOIDFgV3E" role="37wK5m">
+                                  <ref role="3cqZAo" node="4MEOIDFgV3f" resolve="args" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="37vLTw" id="4KRwoelDUAq" role="37wK5m">
-                              <ref role="3cqZAo" node="7IysFeAaLtI" resolve="typevar" />
+                            <node concept="37vLTw" id="4MEOIDFgV3F" role="37wK5m">
+                              <ref role="3cqZAo" node="4MEOIDFgV3b" resolve="typevar" />
                             </node>
-                            <node concept="Xjq3P" id="4KRwoelDUAr" role="37wK5m">
+                            <node concept="Xjq3P" id="4MEOIDFgV3G" role="37wK5m">
                               <ref role="1HBi2w" node="18kNIl1vDPZ" resolve="ApplicationSession" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="16euLQ" id="1eKXYsjwI6j" role="16eVyc">
+                    <node concept="16euLQ" id="4MEOIDFgV3H" role="16eVyc">
                       <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="1eKXYsjwI6k" role="3ztrMU">
+                      <node concept="3uibUv" id="4MEOIDFgV3I" role="3ztrMU">
                         <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="1eKXYsjwI6l" role="2Ghqu4">
+                  <node concept="3uibUv" id="4MEOIDFgV3J" role="2Ghqu4">
                     <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                 </node>
@@ -3120,251 +3122,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1L74NXEx6$J" role="jymVt" />
-    <node concept="3clFb_" id="1L74NXEx75v" role="jymVt">
-      <property role="TrG5h" value="typeTerm" />
-      <node concept="37vLTG" id="1L74NXEx75y" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="1L74NXEx75z" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1L74NXEx75$" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <property role="3TUv4t" value="true" />
-        <node concept="8X2XB" id="1L74NXEx75_" role="1tU5fm">
-          <node concept="3uibUv" id="1L74NXEx75A" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="4gW0vesTseu" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1L74NXEx75C" role="1B3o_S" />
-      <node concept="3clFbS" id="1L74NXEx75D" role="3clF47">
-        <node concept="3clFbF" id="1eKXYsjwS$a" role="3cqZAp">
-          <node concept="1rXfSq" id="1eKXYsjwS$b" role="3clFbG">
-            <ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
-            <node concept="37vLTw" id="1eKXYsjwS$c" role="37wK5m">
-              <ref role="3cqZAo" node="1L74NXEx75y" resolve="typeConcept" />
-            </node>
-            <node concept="2ShNRf" id="1eKXYsjwS$d" role="37wK5m">
-              <node concept="YeOm9" id="1eKXYsjwS$e" role="2ShVmc">
-                <node concept="1Y3b0j" id="1eKXYsjwS$f" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
-                  <node concept="3Tm1VV" id="1eKXYsjwS$g" role="1B3o_S" />
-                  <node concept="3clFb_" id="1eKXYsjwS$h" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="1eKXYsjwS$i" role="3clF46">
-                      <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="1eKXYsjwS$j" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                        <node concept="16syzq" id="1eKXYsjwS$k" role="11_B2D">
-                          <ref role="16sUi3" node="1eKXYsjwS$y" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="1eKXYsjwU6m" role="3clF45">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                    </node>
-                    <node concept="3Tm1VV" id="1eKXYsjwS$m" role="1B3o_S" />
-                    <node concept="3clFbS" id="1eKXYsjwS$n" role="3clF47">
-                      <node concept="3clFbF" id="4KRwoelE0VR" role="3cqZAp">
-                        <node concept="2OqwBi" id="4KRwoelE1ck" role="3clFbG">
-                          <node concept="37vLTw" id="4KRwoelE0VP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1eKXYsjwS$i" resolve="typeTemplate" />
-                          </node>
-                          <node concept="liA8E" id="4KRwoelE1w4" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:1eKXYsjvsW$" resolve="typeTerm" />
-                            <node concept="2OqwBi" id="4KRwoelE1J1" role="37wK5m">
-                              <node concept="37vLTw" id="4KRwoelE1J2" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1eKXYsjwS$i" resolve="typeTemplate" />
-                              </node>
-                              <node concept="liA8E" id="4KRwoelE1J3" role="2OqNvi">
-                                <ref role="37wK5l" to="psr6:1eKXYsjvsWn" resolve="withArgs" />
-                                <node concept="37vLTw" id="4KRwoelE1J4" role="37wK5m">
-                                  <ref role="3cqZAo" node="1L74NXEx75$" resolve="args" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="1eKXYsjwS$y" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="1eKXYsjwS$z" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="1eKXYsjwT46" role="2Ghqu4">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1eKXYsjwR_Y" role="jymVt" />
-    <node concept="3clFb_" id="1L74NXGis3$" role="jymVt">
-      <property role="TrG5h" value="typeTermOverriding" />
-      <node concept="37vLTG" id="1L74NXGis3_" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="1L74NXGis3A" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1L74NXGit9e" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="1eKXYsjLDox" role="1tU5fm">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="4gW0vesTEXg" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1L74NXGis3F" role="1B3o_S" />
-      <node concept="3clFbS" id="1L74NXGis3G" role="3clF47">
-        <node concept="3clFbF" id="1eKXYsjwXOg" role="3cqZAp">
-          <node concept="1rXfSq" id="1eKXYsjwXOh" role="3clFbG">
-            <ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
-            <node concept="37vLTw" id="1eKXYsjwXOi" role="37wK5m">
-              <ref role="3cqZAo" node="1L74NXGis3_" resolve="typeConcept" />
-            </node>
-            <node concept="2ShNRf" id="1eKXYsjwXOj" role="37wK5m">
-              <node concept="YeOm9" id="1eKXYsjwXOk" role="2ShVmc">
-                <node concept="1Y3b0j" id="1eKXYsjwXOl" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
-                  <node concept="3Tm1VV" id="1eKXYsjwXOm" role="1B3o_S" />
-                  <node concept="3clFb_" id="1eKXYsjwXOn" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="1eKXYsjwXOo" role="3clF46">
-                      <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="1eKXYsjwXOp" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                        <node concept="16syzq" id="1eKXYsjwXOq" role="11_B2D">
-                          <ref role="16sUi3" node="1eKXYsjwXOA" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="1eKXYsjwXOr" role="3clF45">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                    </node>
-                    <node concept="3Tm1VV" id="1eKXYsjwXOs" role="1B3o_S" />
-                    <node concept="3clFbS" id="1eKXYsjwXOt" role="3clF47">
-                      <node concept="3clFbF" id="4KRwoelGtnV" role="3cqZAp">
-                        <node concept="2OqwBi" id="4KRwoelGtnW" role="3clFbG">
-                          <node concept="37vLTw" id="4KRwoelGtnX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1eKXYsjwXOo" resolve="typeTemplate" />
-                          </node>
-                          <node concept="liA8E" id="4KRwoelGtnY" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:1eKXYsjvsW$" resolve="typeTerm" />
-                            <node concept="10QFUN" id="1eKXYsjxhwb" role="37wK5m">
-                              <node concept="16syzq" id="1eKXYsjxh$S" role="10QFUM">
-                                <ref role="16sUi3" node="1eKXYsjwXOA" resolve="Cfg" />
-                              </node>
-                              <node concept="37vLTw" id="4KRwoelGuUy" role="10QFUP">
-                                <ref role="3cqZAo" node="1L74NXGit9e" resolve="config" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="1eKXYsjwXOA" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="1eKXYsjwXOB" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="1eKXYsjwXOC" role="2Ghqu4">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="60NbDCXJZ2H" role="jymVt" />
-    <node concept="3clFb_" id="1L74NXF7OB0" role="jymVt">
-      <property role="TrG5h" value="typePattern" />
-      <node concept="37vLTG" id="1L74NXF7OB1" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="1L74NXF7OB2" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4gW0vesTFpY" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1L74NXF7OB7" role="1B3o_S" />
-      <node concept="3clFbS" id="1L74NXF7OB8" role="3clF47">
-        <node concept="3clFbF" id="1eKXYsjxbaz" role="3cqZAp">
-          <node concept="1rXfSq" id="1eKXYsjxba$" role="3clFbG">
-            <ref role="37wK5l" node="1eKXYsjx_2N" resolve="withTypeTemplate" />
-            <node concept="37vLTw" id="1eKXYsjxba_" role="37wK5m">
-              <ref role="3cqZAo" node="1L74NXF7OB1" resolve="typeConcept" />
-            </node>
-            <node concept="2ShNRf" id="1eKXYsjxbaA" role="37wK5m">
-              <node concept="YeOm9" id="1eKXYsjxbaB" role="2ShVmc">
-                <node concept="1Y3b0j" id="1eKXYsjxbaC" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
-                  <node concept="3Tm1VV" id="1eKXYsjxbaD" role="1B3o_S" />
-                  <node concept="3clFb_" id="1eKXYsjxbaE" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="1eKXYsjxbaF" role="3clF46">
-                      <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="1eKXYsjxbaG" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                        <node concept="16syzq" id="1eKXYsjLyJe" role="11_B2D">
-                          <ref role="16sUi3" node="1eKXYsjxbaT" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="1eKXYsjxbaI" role="3clF45">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                    </node>
-                    <node concept="3Tm1VV" id="1eKXYsjxbaJ" role="1B3o_S" />
-                    <node concept="3clFbS" id="1eKXYsjxbaK" role="3clF47">
-                      <node concept="3clFbF" id="1eKXYsjLwJX" role="3cqZAp">
-                        <node concept="2OqwBi" id="1eKXYsjLwUb" role="3clFbG">
-                          <node concept="37vLTw" id="1eKXYsjLwJV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1eKXYsjxbaF" resolve="typeTemplate" />
-                          </node>
-                          <node concept="liA8E" id="1eKXYsjLx5F" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:1eKXYsjIChF" resolve="patternTypeTerm" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="1eKXYsjxbaT" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="1eKXYsjxbaU" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="1eKXYsjxbaV" role="2Ghqu4">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1L74NXF7OAZ" role="jymVt" />
     <node concept="3clFb_" id="3TnYLtqf9a6" role="jymVt">
       <property role="TrG5h" value="putParameter" />
       <node concept="37vLTG" id="3TnYLtqf9RL" role="3clF46">
@@ -3563,6 +3320,89 @@
       </node>
       <node concept="3Tm6S6" id="Ya9Z$kToDB" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="4MEOIDEfH8j" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEfToN" role="jymVt">
+      <property role="TrG5h" value="withTypeTemplate" />
+      <node concept="37vLTG" id="4MEOIDEhFiE" role="3clF46">
+        <property role="TrG5h" value="typeTplID" />
+        <node concept="3uibUv" id="4MEOIDEhG7B" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4MEOIDEfYmf" role="3clF46">
+        <property role="TrG5h" value="action" />
+        <node concept="3uibUv" id="4MEOIDEfYmg" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:1eKXYsjvSZy" resolve="AbstractTypeTemplate.TypeTemplateAction" />
+          <node concept="16syzq" id="4MEOIDEg1Fm" role="11_B2D">
+            <ref role="16sUi3" node="4MEOIDEfZxF" resolve="R" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="4MEOIDEfZUq" role="3clF45">
+        <ref role="16sUi3" node="4MEOIDEfZxF" resolve="R" />
+      </node>
+      <node concept="3Tm6S6" id="4MEOIDEfU24" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEfToR" role="3clF47">
+        <node concept="3SKdUt" id="4MEOIDEhHdh" role="3cqZAp">
+          <node concept="3SKdUq" id="4MEOIDEhHdi" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: load the correct typetable!!!" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4MEOIDEhHdj" role="3cqZAp">
+          <node concept="3cpWsn" id="4MEOIDEhHdk" role="3cpWs9">
+            <property role="TrG5h" value="typeTemplate" />
+            <node concept="3uibUv" id="4MEOIDEhHdl" role="1tU5fm">
+              <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
+              <node concept="16syzq" id="4MEOIDEhHdm" role="11_B2D">
+                <ref role="16sUi3" node="4MEOIDEfWXj" resolve="Cfg" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4MEOIDEhHdn" role="33vP2m">
+              <node concept="2OqwBi" id="4MEOIDEhHdo" role="2Oq$k0">
+                <node concept="2OqwBi" id="4MEOIDEhHdp" role="2Oq$k0">
+                  <node concept="37vLTw" id="4MEOIDEhHdq" role="2Oq$k0">
+                    <ref role="3cqZAo" node="Ya9Z$kQMM0" resolve="typeTemplates" />
+                  </node>
+                  <node concept="liA8E" id="4MEOIDEhHdr" role="2OqNvi">
+                    <ref role="37wK5l" to="fqlx:4JJCDIn5F0n" resolve="typeTables" />
+                  </node>
+                </node>
+                <node concept="1uHKPH" id="4MEOIDEhHds" role="2OqNvi" />
+              </node>
+              <node concept="liA8E" id="4MEOIDEhHdt" role="2OqNvi">
+                <ref role="37wK5l" to="psr6:4MEOIDEgpuf" resolve="typeTemplate" />
+                <node concept="37vLTw" id="4MEOIDEi5Ck" role="37wK5m">
+                  <ref role="3cqZAo" node="4MEOIDEhFiE" resolve="typeTplID" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4MEOIDEhHck" role="3cqZAp" />
+        <node concept="3clFbF" id="4MEOIDEg0wF" role="3cqZAp">
+          <node concept="2OqwBi" id="4MEOIDEg0G3" role="3clFbG">
+            <node concept="37vLTw" id="4MEOIDEg0wE" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MEOIDEfYmf" resolve="action" />
+            </node>
+            <node concept="liA8E" id="4MEOIDEg0Yc" role="2OqNvi">
+              <ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
+              <node concept="37vLTw" id="4MEOIDEhHCs" role="37wK5m">
+                <ref role="3cqZAo" node="4MEOIDEhHdk" resolve="typeTemplate" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="4MEOIDEfWXj" role="16eVyc">
+        <property role="TrG5h" value="Cfg" />
+        <node concept="3uibUv" id="4MEOIDEfXxU" role="3ztrMU">
+          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="TypeTemplate.Config" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="4MEOIDEfZxF" role="16eVyc">
+        <property role="TrG5h" value="R" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="3TnYLtqf8Zx" role="jymVt" />
     <node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
     <node concept="312cEg" id="Ya9Z$kQMM0" role="jymVt">
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
index 3623b282..01fde157 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
@@ -5,6 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
@@ -107,9 +108,6 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -186,10 +184,6 @@
       </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
-        <child id="1197932505799" name="map" index="3ElQJh" />
-        <child id="1197932525128" name="key" index="3ElVtu" />
-      </concept>
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
         <child id="5686963296372573084" name="elementType" index="3O5elw" />
       </concept>
@@ -619,9 +613,9 @@
                       <ref role="3cqZAo" node="4nxCIBqsydV" resolve="typeTable" />
                     </node>
                     <node concept="liA8E" id="1eKXYsjJ8_l" role="2OqNvi">
-                      <ref role="37wK5l" to="psr6:4KRwoelAtxl" resolve="typeTemplate" />
+                      <ref role="37wK5l" to="psr6:4MEOIDEgpuf" resolve="typeTemplate" />
                       <node concept="37vLTw" id="1eKXYsjJ8_m" role="37wK5m">
-                        <ref role="3cqZAo" node="4nxCIBqqpIA" resolve="typeConcept" />
+                        <ref role="3cqZAo" node="4nxCIBqqpIA" resolve="id" />
                       </node>
                     </node>
                   </node>
@@ -655,15 +649,17 @@
               </node>
             </node>
             <node concept="3cpWsn" id="4nxCIBqqpIA" role="1Duv9x">
-              <property role="TrG5h" value="typeConcept" />
-              <node concept="3bZ5Sz" id="4nxCIBqqpIE" role="1tU5fm" />
+              <property role="TrG5h" value="id" />
+              <node concept="3uibUv" id="4MEOIDEXv7_" role="1tU5fm">
+                <ref role="3uigEE" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+              </node>
             </node>
             <node concept="2OqwBi" id="4nxCIBqqpIF" role="1DdaDG">
               <node concept="37vLTw" id="4nxCIBqqpIG" role="2Oq$k0">
                 <ref role="3cqZAo" node="4nxCIBqsydV" resolve="typeTable" />
               </node>
               <node concept="liA8E" id="4nxCIBqqpIH" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:4nxCIBqorn9" resolve="allTypeConcepts" />
+                <ref role="37wK5l" to="psr6:4MEOIDEWLkY" resolve="allTypeTemplateIds" />
               </node>
             </node>
           </node>
@@ -676,97 +672,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="4JJCDImP6ss" role="jymVt" />
-      <node concept="3clFb_" id="1hX44vNlSTQ" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="addType" />
-        <node concept="37vLTG" id="1hX44vNlSTR" role="3clF46">
-          <property role="TrG5h" value="typeTemplate" />
-          <node concept="3uibUv" id="1hX44vNnnG6" role="1tU5fm">
-            <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1hX44vNlSTT" role="3clF45" />
-        <node concept="3Tm6S6" id="4nxCIBqoqWH" role="1B3o_S" />
-        <node concept="3clFbS" id="1hX44vNlSTW" role="3clF47">
-          <node concept="3cpWs8" id="1hX44vNnkeg" role="3cqZAp">
-            <node concept="3cpWsn" id="1hX44vNnkeh" role="3cpWs9">
-              <property role="TrG5h" value="templates" />
-              <node concept="3vKaQO" id="1hX44vNnkei" role="1tU5fm">
-                <node concept="3uibUv" id="1hX44vNpejD" role="3O5elw">
-                  <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                </node>
-              </node>
-              <node concept="3EllGN" id="1hX44vNnkek" role="33vP2m">
-                <node concept="2OqwBi" id="1hX44vNnkel" role="3ElVtu">
-                  <node concept="37vLTw" id="1hX44vNnkvd" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
-                  </node>
-                  <node concept="liA8E" id="1hX44vNnken" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:1hX44vNnkNu" resolve="typeConcept" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="1hX44vNnkeo" role="3ElQJh">
-                  <ref role="3cqZAo" node="1hX44vNnj_J" resolve="typeTemplates" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="1hX44vNnkep" role="3cqZAp">
-            <node concept="3clFbS" id="1hX44vNnkeq" role="3clFbx">
-              <node concept="3clFbF" id="1hX44vNnker" role="3cqZAp">
-                <node concept="37vLTI" id="1hX44vNnkes" role="3clFbG">
-                  <node concept="1eOMI4" id="1hX44vNnket" role="37vLTx">
-                    <node concept="37vLTI" id="1hX44vNnkeu" role="1eOMHV">
-                      <node concept="2ShNRf" id="1hX44vNnkev" role="37vLTx">
-                        <node concept="Tc6Ow" id="1hX44vNnkew" role="2ShVmc">
-                          <node concept="3uibUv" id="1hX44vNpcBp" role="HW$YZ">
-                            <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="TypeTemplate" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="1hX44vNpdac" role="37vLTJ">
-                        <ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3EllGN" id="1hX44vNnkez" role="37vLTJ">
-                    <node concept="2OqwBi" id="1hX44vNnke$" role="3ElVtu">
-                      <node concept="37vLTw" id="1hX44vNnoT5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
-                      </node>
-                      <node concept="liA8E" id="1hX44vNnkeA" role="2OqNvi">
-                        <ref role="37wK5l" to="psr6:1hX44vNnkNu" resolve="typeConcept" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="1hX44vNnkeB" role="3ElQJh">
-                      <ref role="3cqZAo" node="1hX44vNnj_J" resolve="typeTemplates" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbC" id="1hX44vNnkeC" role="3clFbw">
-              <node concept="10Nm6u" id="1hX44vNnkeD" role="3uHU7w" />
-              <node concept="37vLTw" id="1hX44vNnkeE" role="3uHU7B">
-                <ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1hX44vNnkeF" role="3cqZAp">
-            <node concept="2OqwBi" id="1hX44vNnkeG" role="3clFbG">
-              <node concept="37vLTw" id="1hX44vNnkeH" role="2Oq$k0">
-                <ref role="3cqZAo" node="1hX44vNnkeh" resolve="templates" />
-              </node>
-              <node concept="TSZUe" id="1hX44vNnkeI" role="2OqNvi">
-                <node concept="37vLTw" id="1hX44vNnp6Z" role="25WWJ7">
-                  <ref role="3cqZAo" node="1hX44vNlSTR" resolve="typeTemplate" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4nxCIBqumqZ" role="jymVt" />
     </node>
     <node concept="2tJIrI" id="1hX44vNnjF5" role="jymVt" />
     <node concept="312cEg" id="4JJCDImRYzW" role="jymVt">
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
index 1eb735a5..fcb2391b 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
@@ -14,6 +14,7 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -86,6 +87,7 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
         <property id="1181808852946" name="isFinal" index="DiZV1" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
@@ -140,6 +142,9 @@
       <concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
@@ -906,15 +911,42 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4nxCIBqordD" role="jymVt" />
-    <node concept="3clFb_" id="4nxCIBqorn9" role="jymVt">
-      <property role="TrG5h" value="allTypeConcepts" />
+    <node concept="2tJIrI" id="4MEOIDEgpw7" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEgpuf" role="jymVt">
       <property role="1EzhhJ" value="true" />
-      <node concept="3vKaQO" id="4nxCIBqorx6" role="3clF45">
-        <node concept="3bZ5Sz" id="4nxCIBqoryQ" role="3O5elw" />
+      <property role="TrG5h" value="typeTemplate" />
+      <node concept="3uibUv" id="4MEOIDEgpug" role="3clF45">
+        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="TypeTemplate" />
+        <node concept="16syzq" id="4MEOIDEgpuh" role="11_B2D">
+          <ref role="16sUi3" node="4MEOIDEgpum" resolve="Cfg" />
+        </node>
       </node>
-      <node concept="3Tm1VV" id="4nxCIBqornc" role="1B3o_S" />
-      <node concept="3clFbS" id="4nxCIBqornd" role="3clF47" />
+      <node concept="3Tm1VV" id="4MEOIDEgpui" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEgpuj" role="3clF47" />
+      <node concept="16euLQ" id="4MEOIDEgpum" role="16eVyc">
+        <property role="TrG5h" value="Cfg" />
+        <node concept="3uibUv" id="4MEOIDEgpun" role="3ztrMU">
+          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="TypeTemplate.Config" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
+        <property role="TrG5h" value="typeTplId" />
+        <node concept="3uibUv" id="4MEOIDEhHGl" role="1tU5fm">
+          <ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MEOIDEWLmE" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
+      <property role="TrG5h" value="allTypeTemplateIds" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="4MEOIDEWLkZ" role="3clF45">
+        <node concept="3uibUv" id="4MEOIDEWSWB" role="3O5elw">
+          <ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDEWLl1" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEWLl2" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="4KRwoelAvaR" role="jymVt" />
   </node>
@@ -996,66 +1028,6 @@
         <property role="TrG5h" value="R" />
       </node>
     </node>
-    <node concept="2tJIrI" id="1eKXYsjLtzS" role="jymVt" />
-    <node concept="3clFbW" id="7IysFeAhRJB" role="jymVt">
-      <node concept="37vLTG" id="7IysFeAhSr3" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="7IysFeAhStT" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="7IysFeAhRJD" role="3clF45" />
-      <node concept="3Tm1VV" id="7IysFeAhRJE" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeAhRJF" role="3clF47">
-        <node concept="3clFbF" id="7IysFeAhSvh" role="3cqZAp">
-          <node concept="37vLTI" id="7IysFeAhSvj" role="3clFbG">
-            <node concept="2OqwBi" id="7IysFeAhUfK" role="37vLTJ">
-              <node concept="Xjq3P" id="7IysFeAhU5M" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7IysFeAhUE5" role="2OqNvi">
-                <ref role="2Oxat5" node="7IysFeAhSvd" resolve="typeConcept" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7IysFeAhSvn" role="37vLTx">
-              <ref role="3cqZAo" node="7IysFeAhSr3" resolve="typeConcept" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7IysFeAhR3l" role="jymVt" />
-    <node concept="3clFb_" id="1hX44vNnkZK" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="typeConcept" />
-      <node concept="3bZ5Sz" id="1hX44vNnkZL" role="3clF45" />
-      <node concept="3Tm1VV" id="1hX44vNnkZM" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vNnkZO" role="3clF47">
-        <node concept="3clFbF" id="7IysFeAhTW2" role="3cqZAp">
-          <node concept="37vLTw" id="7IysFeAhTW0" role="3clFbG">
-            <ref role="3cqZAo" node="7IysFeAhSvd" resolve="typeConcept" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="60NbDCXFSw$" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjIYqJ" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="patternTypeTerm" />
-      <node concept="3uibUv" id="1eKXYsjIYqK" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1eKXYsjIYqL" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjIYqN" role="3clF47">
-        <node concept="3clFbF" id="1eKXYsjJ2yW" role="3cqZAp">
-          <node concept="1rXfSq" id="1eKXYsjJ2yV" role="3clFbG">
-            <ref role="37wK5l" node="1eKXYsjvsW$" resolve="typeTerm" />
-            <node concept="1rXfSq" id="1eKXYsjJ309" role="37wK5m">
-              <ref role="37wK5l" node="1eKXYsjvsWv" resolve="asPattern" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1eKXYsjIYqO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="60NbDCXFVbR" role="jymVt" />
     <node concept="3clFb_" id="1eKXYsjvsWg" role="jymVt">
       <property role="TrG5h" value="withNode" />
@@ -1070,23 +1042,7 @@
       <node concept="3Tmbuc" id="60NbDCXHdjy" role="1B3o_S" />
       <node concept="3clFbS" id="1eKXYsjvsWl" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="60NbDCXHcPH" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjvsWv" role="jymVt">
-      <property role="TrG5h" value="asPattern" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="16syzq" id="1eKXYsjvtxD" role="3clF45">
-        <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
-      </node>
-      <node concept="3Tmbuc" id="60NbDCXFT0N" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjvsWy" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1eKXYsjJ3o2" role="jymVt" />
-    <node concept="312cEg" id="7IysFeAhSvd" role="jymVt">
-      <property role="TrG5h" value="typeConcept" />
-      <node concept="3Tmbuc" id="1GNw78$TiBT" role="1B3o_S" />
-      <node concept="3bZ5Sz" id="7IysFeAhSvg" role="1tU5fm" />
-    </node>
-    <node concept="2tJIrI" id="1hX44vNnl1G" role="jymVt" />
+    <node concept="2tJIrI" id="4MEOIDG7xoH" role="jymVt" />
     <node concept="3Tm1VV" id="1hX44vNlvEW" role="1B3o_S" />
     <node concept="16euLQ" id="1hX44vNlw2n" role="16eVyc">
       <property role="TrG5h" value="Cfg" />
@@ -1109,15 +1065,135 @@
       <property role="TrG5h" value="Config" />
       <node concept="3Tm1VV" id="1eKXYsjvsOz" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
-    <node concept="3clFb_" id="1hX44vNnkNu" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="typeConcept" />
-      <node concept="3bZ5Sz" id="1hX44vNnkWY" role="3clF45" />
-      <node concept="3Tm1VV" id="1hX44vNnkNx" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vNnkNy" role="3clF47" />
+    <node concept="2tJIrI" id="4MEOIDEhyKf" role="jymVt" />
+    <node concept="312cEu" id="4MEOIDEhyPY" role="jymVt">
+      <property role="TrG5h" value="ID" />
+      <node concept="2tJIrI" id="4MEOIDEhz0j" role="jymVt" />
+      <node concept="2YIFZL" id="4MEOIDEhz4d" role="jymVt">
+        <property role="TrG5h" value="forReference" />
+        <node concept="37vLTG" id="4MEOIDEhznZ" role="3clF46">
+          <property role="TrG5h" value="ref" />
+          <node concept="3uibUv" id="4MEOIDEipRS" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="4MEOIDEhzcj" role="3clF45">
+          <ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+        <node concept="3Tm1VV" id="4MEOIDEhz4g" role="1B3o_S" />
+        <node concept="3clFbS" id="4MEOIDEhz4h" role="3clF47">
+          <node concept="3clFbF" id="4MEOIDEhACe" role="3cqZAp">
+            <node concept="2ShNRf" id="4MEOIDEhACa" role="3clFbG">
+              <node concept="1pGfFk" id="4MEOIDEhARU" role="2ShVmc">
+                <ref role="37wK5l" node="4MEOIDEh_LW" resolve="TypeTemplate.ID" />
+                <node concept="2OqwBi" id="4MEOIDEhAWq" role="37wK5m">
+                  <node concept="37vLTw" id="4MEOIDEhAYV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4MEOIDEhznZ" resolve="ref" />
+                  </node>
+                  <node concept="liA8E" id="4MEOIDEhAWs" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4MEOIDEh$RD" role="jymVt" />
+      <node concept="2YIFZL" id="4MEOIDEip_0" role="jymVt">
+        <property role="TrG5h" value="forNode" />
+        <node concept="37vLTG" id="4MEOIDEip_1" role="3clF46">
+          <property role="TrG5h" value="node" />
+          <node concept="3Tqbb2" id="4MEOIDEip_2" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="4MEOIDEip_3" role="3clF45">
+          <ref role="3uigEE" node="4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+        </node>
+        <node concept="3Tm1VV" id="4MEOIDEip_4" role="1B3o_S" />
+        <node concept="3clFbS" id="4MEOIDEip_5" role="3clF47">
+          <node concept="3clFbF" id="4MEOIDEip_6" role="3cqZAp">
+            <node concept="2ShNRf" id="4MEOIDEip_7" role="3clFbG">
+              <node concept="1pGfFk" id="4MEOIDEip_8" role="2ShVmc">
+                <ref role="37wK5l" node="4MEOIDEh_LW" resolve="TypeTemplate.ID" />
+                <node concept="2OqwBi" id="4MEOIDEip_9" role="37wK5m">
+                  <node concept="2JrnkZ" id="4MEOIDEip_b" role="2Oq$k0">
+                    <node concept="37vLTw" id="4MEOIDEip_c" role="2JrQYb">
+                      <ref role="3cqZAo" node="4MEOIDEip_1" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="4MEOIDEip_e" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4MEOIDEip$Z" role="jymVt" />
+      <node concept="3clFb_" id="4MEOIDEi5VO" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="toString" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="4MEOIDEi5VP" role="1B3o_S" />
+        <node concept="3uibUv" id="4MEOIDEi5VR" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+        <node concept="3clFbS" id="4MEOIDEi5VS" role="3clF47">
+          <node concept="3clFbF" id="4MEOIDEi6jx" role="3cqZAp">
+            <node concept="2OqwBi" id="4MEOIDEi6qK" role="3clFbG">
+              <node concept="37vLTw" id="4MEOIDEi6jw" role="2Oq$k0">
+                <ref role="3cqZAo" node="4MEOIDEh_rV" resolve="nodeId" />
+              </node>
+              <node concept="liA8E" id="4MEOIDEi6Bi" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="4MEOIDEi5VT" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4MEOIDEi65J" role="jymVt" />
+      <node concept="3clFbW" id="4MEOIDEh_LW" role="jymVt">
+        <node concept="37vLTG" id="4MEOIDEh_Rv" role="3clF46">
+          <property role="TrG5h" value="nodeId" />
+          <node concept="3uibUv" id="4MEOIDEh_Tz" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4MEOIDEh_LY" role="3clF45" />
+        <node concept="3Tm6S6" id="4MEOIDEh_Rg" role="1B3o_S" />
+        <node concept="3clFbS" id="4MEOIDEh_M0" role="3clF47">
+          <node concept="3clFbF" id="4MEOIDEhA70" role="3cqZAp">
+            <node concept="37vLTI" id="4MEOIDEhAvZ" role="3clFbG">
+              <node concept="37vLTw" id="4MEOIDEhA$B" role="37vLTx">
+                <ref role="3cqZAo" node="4MEOIDEh_Rv" resolve="nodeId" />
+              </node>
+              <node concept="2OqwBi" id="4MEOIDEhAba" role="37vLTJ">
+                <node concept="Xjq3P" id="4MEOIDEhA6Z" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4MEOIDEhAlD" role="2OqNvi">
+                  <ref role="2Oxat5" node="4MEOIDEh_rV" resolve="nodeId" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4MEOIDEh_GM" role="jymVt" />
+      <node concept="312cEg" id="4MEOIDEh_rV" role="jymVt">
+        <property role="TrG5h" value="nodeId" />
+        <node concept="3Tm6S6" id="4MEOIDEh_rW" role="1B3o_S" />
+        <node concept="3uibUv" id="4MEOIDEh_AW" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4MEOIDEhA0P" role="jymVt" />
+      <node concept="3Tm1VV" id="4MEOIDEhyPZ" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="1hX44vNnkEw" role="jymVt" />
+    <node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
     <node concept="3clFb_" id="1eKXYsjvsWn" role="jymVt">
       <property role="TrG5h" value="withArgs" />
       <property role="1EzhhJ" value="true" />
@@ -1135,22 +1211,6 @@
       <node concept="3Tm1VV" id="1eKXYsjvsWs" role="1B3o_S" />
       <node concept="3clFbS" id="1eKXYsjvsWt" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="1eKXYsjvsWu" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjvsW$" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="typeTerm" />
-      <node concept="3uibUv" id="1eKXYsjvsW_" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1eKXYsjvsWA" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjvsWB" role="3clF47" />
-      <node concept="37vLTG" id="1eKXYsjvsWC" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="16syzq" id="1eKXYsjFglT" role="1tU5fm">
-          <ref role="16sUi3" node="1eKXYsjvsL$" resolve="Cfg" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="60NbDCXGYuS" role="jymVt" />
     <node concept="3clFb_" id="60NbDCXGYgv" role="jymVt">
       <property role="1EzhhJ" value="true" />
@@ -1175,7 +1235,7 @@
       <node concept="3Tm1VV" id="1eKXYsjIChH" role="1B3o_S" />
       <node concept="3clFbS" id="1eKXYsjIChI" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="1eKXYsjvsWE" role="jymVt" />
+    <node concept="2tJIrI" id="4MEOIDG7Abc" role="jymVt" />
     <node concept="3clFb_" id="1eKXYsjvsWF" role="jymVt">
       <property role="TrG5h" value="bindType" />
       <property role="1EzhhJ" value="true" />
@@ -1291,5 +1351,21 @@
     <node concept="2tJIrI" id="4nxCIBqhZxH" role="jymVt" />
     <node concept="3Tm1VV" id="4nxCIBqhYFy" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="4MEOIDFA48I">
+    <property role="TrG5h" value="AbstractTermDeclaration" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="4MEOIDFA4bd" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDFA4bP" role="jymVt">
+      <property role="TrG5h" value="typeTerm" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDFA4bS" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDFA4bT" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="4MEOIDFA4bf" role="jymVt" />
+    <node concept="3Tm1VV" id="4MEOIDFA48J" role="1B3o_S" />
+  </node>
 </model>