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 c6b0304f..116bdff2 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
@@ -165,6 +165,7 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -570,6 +571,7 @@
         <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="7504436213544206332" name="jetbrains.mps.lang.smodel.structure.Node_ContainingLinkOperation" flags="nn" index="2NL2c5" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
@@ -579,6 +581,10 @@
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1171500988903" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenOperation" flags="nn" index="32TBzR" />
+      <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
+        <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
+        <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
+      </concept>
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -9680,207 +9686,90 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4MEOIDG9g91" role="3acgRq">
+    <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
-      <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">
+      <node concept="14YyZ8" id="5hSMZ_lfXvV" role="1lVwrX">
+        <node concept="14ZrTv" id="5hSMZ_ljA5j" role="14ZwWg">
+          <node concept="30G5F_" id="5hSMZ_ljA5k" role="150hEN">
+            <node concept="3clFbS" id="5hSMZ_ljA5l" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_ljA5m" role="3cqZAp">
+                <node concept="1Wc70l" id="5hSMZ_ljA5n" role="3clFbG">
+                  <node concept="2OqwBi" id="5hSMZ_ljXug" role="3uHU7B">
+                    <node concept="2OqwBi" id="5hSMZ_ljXuh" role="2Oq$k0">
+                      <node concept="2OqwBi" id="5hSMZ_ljXui" role="2Oq$k0">
+                        <node concept="30H73N" id="5hSMZ_ljXuj" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="5hSMZ_ljXuk" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="5hSMZ_ljXul" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+                      </node>
+                    </node>
+                    <node concept="1v1jN8" id="5hSMZ_ljXum" role="2OqNvi" />
+                  </node>
+                  <node concept="2OqwBi" id="5hSMZ_ljXun" role="3uHU7w">
+                    <node concept="2OqwBi" id="5hSMZ_ljXuo" role="2Oq$k0">
+                      <node concept="30H73N" id="5hSMZ_ljXup" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="5hSMZ_ljXuq" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                       </node>
                     </node>
-                    <node concept="1v1jN8" id="4MEOIDG9g9c" role="2OqNvi" />
-                  </node>
-                  <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="4MEOIDG9g9j" role="2OqNvi">
-                          <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
-                        </node>
-                      </node>
-                      <node concept="1v1jN8" id="4MEOIDG9g9k" role="2OqNvi" />
-                    </node>
-                    <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="4MEOIDG9g9n" role="3uHU7B">
-                        <node concept="30H73N" id="4MEOIDG9g9o" role="2Oq$k0" />
-                        <node concept="25OxAV" id="4MEOIDG9g9p" role="2OqNvi" />
-                      </node>
-                    </node>
+                    <node concept="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <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="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 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="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>
-                  <node concept="liA8E" id="4MEOIDG9sQ9" role="2OqNvi">
+          <node concept="1Koe21" id="5hSMZ_ljA5E" role="150oIE">
+            <node concept="3clFbS" id="5hSMZ_ljA5F" role="1Koe22">
+              <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
+                  <node concept="liA8E" id="5hSMZ_ljA5I" 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="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>
-              </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">
+                  <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
+                    <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
+                      <node concept="1L3L4E" id="5hSMZ_ljA5L" role="2ShVmc">
+                        <node concept="1L3L4F" id="5hSMZ_ljA5M" role="1L3L0X">
                           <property role="2bfB8j" value="true" />
                           <property role="1L3L77" value="TermDeclaration" />
-                          <node concept="3clFbT" id="4MEOIDGiDYJ" role="1L3L4I">
+                          <node concept="3clFbT" id="5hSMZ_ljA5N" role="1L3L4I">
                             <property role="3clFbU" value="true" />
+                            <node concept="17Uvod" id="5hSMZ_ljI$V" role="lGtFl">
+                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                              <property role="2qtEX9" value="value" />
+                              <node concept="3zFVjK" id="5hSMZ_ljI$W" role="3zH0cK">
+                                <node concept="3clFbS" id="5hSMZ_ljI$X" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljIGf" role="3cqZAp">
+                                    <node concept="17R0WA" id="5hSMZ_ljIGh" role="3clFbG">
+                                      <node concept="2OqwBi" id="5hSMZ_ljIGi" role="3uHU7B">
+                                        <node concept="30H73N" id="5hSMZ_ljIGj" role="2Oq$k0" />
+                                        <node concept="2NL2c5" id="5hSMZ_ljIGk" role="2OqNvi" />
+                                      </node>
+                                      <node concept="359W_D" id="5hSMZ_ljIGl" role="3uHU7w">
+                                        <ref role="359W_E" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                        <ref role="359W_F" to="5j4j:4sSe4$p4oOP" resolve="value" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
-                          <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 concept="10Nm6u" id="5hSMZ_ljA5O" role="1L3L4I">
+                            <node concept="1WS0z7" id="5hSMZ_ljA5P" role="lGtFl">
+                              <node concept="3JmXsc" id="5hSMZ_ljA5Q" role="3Jn$fo">
+                                <node concept="3clFbS" id="5hSMZ_ljA5R" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljA5S" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA5T" role="3clFbG">
+                                      <node concept="2OqwBi" id="5hSMZ_ljA5U" role="2Oq$k0">
+                                        <node concept="30H73N" id="5hSMZ_ljA5V" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="5hSMZ_ljA5W" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                                         </node>
                                       </node>
-                                      <node concept="3Tsc0h" id="4MEOIDGmMfZ" role="2OqNvi">
+                                      <node concept="3Tsc0h" id="5hSMZ_ljA5X" role="2OqNvi">
                                         <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
                                       </node>
                                     </node>
@@ -9889,29 +9778,29 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFb_" id="4MEOIDGiDYK" role="3MN40a">
+                          <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
                             <property role="TrG5h" value="feature" />
-                            <node concept="3uibUv" id="4MEOIDGiDYL" role="3clF45">
+                            <node concept="3uibUv" id="5hSMZ_ljA5Z" 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">
+                            <node concept="3Tmbuc" id="5hSMZ_ljA60" role="1B3o_S" />
+                            <node concept="3clFbS" id="5hSMZ_ljA61" role="3clF47">
+                              <node concept="3clFbF" id="5hSMZ_ljA62" role="3cqZAp">
+                                <node concept="10Nm6u" id="5hSMZ_ljA63" role="3clFbG">
+                                  <node concept="1sPUBX" id="5hSMZ_ljA64" role="lGtFl">
                                     <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature_override" />
-                                    <node concept="2OqwBi" id="4MEOIDGiDYR" role="v9R3O">
-                                      <node concept="30H73N" id="4MEOIDGiDYS" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="4MEOIDGiDYT" role="2OqNvi">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA65" role="v9R3O">
+                                      <node concept="30H73N" id="5hSMZ_ljA66" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5hSMZ_ljA67" role="2OqNvi">
                                         <ref role="3Tt5mk" to="wq2x:1L74NXFMBVS" resolve="term" />
                                       </node>
                                     </node>
-                                    <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">
+                                    <node concept="3NFfHV" id="5hSMZ_ljA68" role="1sPUBK">
+                                      <node concept="3clFbS" id="5hSMZ_ljA69" role="2VODD2">
+                                        <node concept="3clFbF" id="5hSMZ_ljA6a" role="3cqZAp">
+                                          <node concept="2OqwBi" id="5hSMZ_ljA6b" role="3clFbG">
+                                            <node concept="30H73N" id="5hSMZ_ljA6c" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="5hSMZ_ljA6d" role="2OqNvi">
                                               <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                             </node>
                                           </node>
@@ -9922,20 +9811,20 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="17Uvod" id="4MEOIDGiDZ0" role="lGtFl">
+                            <node concept="17Uvod" id="5hSMZ_ljA6e" 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">
+                              <node concept="3zFVjK" id="5hSMZ_ljA6f" role="3zH0cK">
+                                <node concept="3clFbS" id="5hSMZ_ljA6g" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljA6h" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA6i" role="3clFbG">
+                                      <node concept="2OqwBi" id="5hSMZ_ljA6j" role="2Oq$k0">
+                                        <node concept="30H73N" id="5hSMZ_ljA6k" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="5hSMZ_ljA6l" role="2OqNvi">
                                           <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                         </node>
                                       </node>
-                                      <node concept="3TrcHB" id="4MEOIDGiDZ8" role="2OqNvi">
+                                      <node concept="3TrcHB" id="5hSMZ_ljA6m" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                       </node>
                                     </node>
@@ -9943,13 +9832,13 @@
                                 </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">
+                            <node concept="1WS0z7" id="5hSMZ_ljA6n" role="lGtFl">
+                              <node concept="3JmXsc" id="5hSMZ_ljA6o" role="3Jn$fo">
+                                <node concept="3clFbS" id="5hSMZ_ljA6p" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljA6q" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA6r" role="3clFbG">
+                                      <node concept="30H73N" id="5hSMZ_ljA6s" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="5hSMZ_ljA6t" role="2OqNvi">
                                         <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                                       </node>
                                     </node>
@@ -9958,29 +9847,24 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3Tm1VV" id="4MEOIDGiDZg" role="1B3o_S" />
-                          <node concept="3uibUv" id="4MEOIDGiDZh" role="1L3L74">
+                          <node concept="3Tm1VV" id="5hSMZ_ljA6u" role="1B3o_S" />
+                          <node concept="3uibUv" id="5hSMZ_ljA6v" role="1L3L74">
                             <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                           </node>
-                          <node concept="17Uvod" id="4MEOIDGiDZi" role="lGtFl">
+                          <node concept="17Uvod" id="5hSMZ_ljA6w" 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 concept="3zFVjK" id="5hSMZ_ljA6x" role="3zH0cK">
+                              <node concept="3clFbS" id="5hSMZ_ljA6y" role="2VODD2">
+                                <node concept="3clFbF" id="5hSMZ_ljA6z" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5hSMZ_ljA6$" role="3clFbG">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA6_" role="2Oq$k0">
+                                      <node concept="30H73N" id="5hSMZ_ljA6A" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5hSMZ_ljA6B" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4MEOIDGiDZs" role="2OqNvi">
+                                    <node concept="2qgKlT" id="5hSMZ_ljA6C" role="2OqNvi">
                                       <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                                     </node>
                                   </node>
@@ -9992,93 +9876,93 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="raruj" id="4MEOIDGafFN" role="lGtFl" />
+                  <node concept="raruj" id="5hSMZ_ljA6D" role="lGtFl" />
                 </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 concept="14ZrTv" id="5hSMZ_lfXvW" role="14ZwWg">
+          <node concept="30G5F_" id="5hSMZ_lfXvX" role="150hEN">
+            <node concept="3clFbS" id="5hSMZ_lfXvY" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lfXvZ" role="3cqZAp">
+                <node concept="1Wc70l" id="5hSMZ_lfXw0" role="3clFbG">
+                  <node concept="2OqwBi" id="5hSMZ_ljToH" role="3uHU7B">
+                    <node concept="2OqwBi" id="5hSMZ_ljToI" role="2Oq$k0">
+                      <node concept="2OqwBi" id="5hSMZ_ljToJ" role="2Oq$k0">
+                        <node concept="30H73N" id="5hSMZ_ljToK" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="5hSMZ_ljToL" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
                         </node>
                       </node>
-                      <node concept="3Tsc0h" id="4MEOIDGq85i" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                      <node concept="3Tsc0h" id="5hSMZ_ljToM" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
                       </node>
                     </node>
-                    <node concept="3GX2aA" id="4MEOIDGqcoz" role="2OqNvi" />
+                    <node concept="3GX2aA" id="5hSMZ_ljToN" role="2OqNvi" />
                   </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">
+                  <node concept="2OqwBi" id="5hSMZ_ljToO" role="3uHU7w">
+                    <node concept="2OqwBi" id="5hSMZ_ljToP" role="2Oq$k0">
+                      <node concept="30H73N" id="5hSMZ_ljToQ" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="5hSMZ_ljToR" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                       </node>
                     </node>
-                    <node concept="3GX2aA" id="4MEOIDG9gaa" role="2OqNvi" />
+                    <node concept="3GX2aA" id="5hSMZ_ljToS" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
           </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">
+          <node concept="1Koe21" id="5hSMZ_lfXwd" role="150oIE">
+            <node concept="3clFbF" id="5hSMZ_lfXwe" role="1Koe22">
+              <node concept="2OqwBi" id="5hSMZ_lfXwf" role="3clFbG">
+                <node concept="liA8E" id="5hSMZ_lfXwg" 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">
+                <node concept="1eOMI4" id="5hSMZ_lfXwh" role="2Oq$k0">
+                  <node concept="2ShNRf" id="5hSMZ_lfXwi" role="1eOMHV">
+                    <node concept="1L3L4E" id="5hSMZ_lfXwj" role="2ShVmc">
+                      <node concept="1L3L4F" id="5hSMZ_lfXwk" role="1L3L0X">
                         <property role="2bfB8j" value="true" />
                         <property role="1L3L77" value="TermDeclaration" />
-                        <node concept="3clFbT" id="4MEOIDGiEBt" role="1L3L4I">
+                        <node concept="3clFbT" id="5hSMZ_lfXwl" 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 concept="10Nm6u" id="5hSMZ_lfXwm" role="1L3L4I">
+                          <node concept="2b32R4" id="5hSMZ_lfXwn" role="lGtFl">
+                            <node concept="3JmXsc" id="5hSMZ_lfXwo" role="2P8S$">
+                              <node concept="3clFbS" id="5hSMZ_lfXwp" role="2VODD2">
+                                <node concept="3clFbF" id="5hSMZ_lfXwq" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5hSMZ_lfXwr" role="3clFbG">
+                                    <node concept="2OqwBi" id="5hSMZ_lfXws" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="5hSMZ_lfXwt" role="2Oq$k0">
+                                        <node concept="30H73N" id="5hSMZ_lfXwu" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="5hSMZ_lgw$7" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
                                         </node>
                                       </node>
-                                      <node concept="3Tsc0h" id="4MEOIDGiEBC" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                                      <node concept="3Tsc0h" id="5hSMZ_lgwWL" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" 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 concept="3$u5V9" id="5hSMZ_lfXwx" role="2OqNvi">
+                                      <node concept="1bVj0M" id="5hSMZ_lfXwy" role="23t8la">
+                                        <node concept="3clFbS" id="5hSMZ_lfXwz" role="1bW5cS">
+                                          <node concept="3clFbF" id="5hSMZ_lfXw$" role="3cqZAp">
+                                            <node concept="2OqwBi" id="5hSMZ_lfXw_" role="3clFbG">
+                                              <node concept="37vLTw" id="5hSMZ_lfXwA" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="5hSMZ_lfXwC" resolve="it" />
                                               </node>
-                                              <node concept="3TrEf2" id="4MEOIDGiEBJ" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
+                                              <node concept="3TrEf2" id="5hSMZ_lfXwB" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:5hSMZ_ldV8_" resolve="code" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="4MEOIDGiEBK" role="1bW2Oz">
+                                        <node concept="Rh6nW" id="5hSMZ_lfXwC" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="4MEOIDGiEBL" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="5hSMZ_lfXwD" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
@@ -10088,29 +9972,29 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFb_" id="4MEOIDGiEBM" role="3MN40a">
+                        <node concept="3clFb_" id="5hSMZ_lfXwE" role="3MN40a">
                           <property role="TrG5h" value="feature" />
-                          <node concept="3uibUv" id="4MEOIDGiEBN" role="3clF45">
+                          <node concept="3uibUv" id="5hSMZ_lfXwF" 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">
+                          <node concept="3Tmbuc" id="5hSMZ_lfXwG" role="1B3o_S" />
+                          <node concept="3clFbS" id="5hSMZ_lfXwH" role="3clF47">
+                            <node concept="3clFbF" id="5hSMZ_lfXwI" role="3cqZAp">
+                              <node concept="10Nm6u" id="5hSMZ_lfXwJ" role="3clFbG">
+                                <node concept="1sPUBX" id="5hSMZ_lfXwK" role="lGtFl">
                                   <ref role="v9R2y" node="1L74NXGmvsM" resolve="type_term_feature_override" />
-                                  <node concept="2OqwBi" id="4MEOIDGiEBT" role="v9R3O">
-                                    <node concept="30H73N" id="4MEOIDGiEBU" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="4MEOIDGiEBV" role="2OqNvi">
+                                  <node concept="2OqwBi" id="5hSMZ_lfXwL" role="v9R3O">
+                                    <node concept="30H73N" id="5hSMZ_lfXwM" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="5hSMZ_lfXwN" 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">
+                                  <node concept="3NFfHV" id="5hSMZ_lfXwO" role="1sPUBK">
+                                    <node concept="3clFbS" id="5hSMZ_lfXwP" role="2VODD2">
+                                      <node concept="3clFbF" id="5hSMZ_lfXwQ" role="3cqZAp">
+                                        <node concept="2OqwBi" id="5hSMZ_lfXwR" role="3clFbG">
+                                          <node concept="30H73N" id="5hSMZ_lfXwS" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="5hSMZ_lfXwT" role="2OqNvi">
                                             <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                           </node>
                                         </node>
@@ -10121,20 +10005,20 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="17Uvod" id="4MEOIDGiEC2" role="lGtFl">
+                          <node concept="17Uvod" id="5hSMZ_lfXwU" 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">
+                            <node concept="3zFVjK" id="5hSMZ_lfXwV" role="3zH0cK">
+                              <node concept="3clFbS" id="5hSMZ_lfXwW" role="2VODD2">
+                                <node concept="3clFbF" id="5hSMZ_lfXwX" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5hSMZ_lfXwY" role="3clFbG">
+                                    <node concept="2OqwBi" id="5hSMZ_lfXwZ" role="2Oq$k0">
+                                      <node concept="30H73N" id="5hSMZ_lfXx0" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5hSMZ_lfXx1" role="2OqNvi">
                                         <ref role="3Tt5mk" to="wq2x:1L74NXFMz74" resolve="feature" />
                                       </node>
                                     </node>
-                                    <node concept="3TrcHB" id="4MEOIDGiECa" role="2OqNvi">
+                                    <node concept="3TrcHB" id="5hSMZ_lfXx2" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                     </node>
                                   </node>
@@ -10142,13 +10026,13 @@
                               </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">
+                          <node concept="1WS0z7" id="5hSMZ_lfXx3" role="lGtFl">
+                            <node concept="3JmXsc" id="5hSMZ_lfXx4" role="3Jn$fo">
+                              <node concept="3clFbS" id="5hSMZ_lfXx5" role="2VODD2">
+                                <node concept="3clFbF" id="5hSMZ_lfXx6" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5hSMZ_lfXx7" role="3clFbG">
+                                    <node concept="30H73N" id="5hSMZ_lfXx8" role="2Oq$k0" />
+                                    <node concept="3Tsc0h" id="5hSMZ_lfXx9" role="2OqNvi">
                                       <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                                     </node>
                                   </node>
@@ -10157,29 +10041,24 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3Tm1VV" id="4MEOIDGiECi" role="1B3o_S" />
-                        <node concept="3uibUv" id="4MEOIDGiECj" role="1L3L74">
+                        <node concept="3Tm1VV" id="5hSMZ_lfXxa" role="1B3o_S" />
+                        <node concept="3uibUv" id="5hSMZ_lfXxb" role="1L3L74">
                           <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                         </node>
-                        <node concept="17Uvod" id="4MEOIDGiECk" role="lGtFl">
+                        <node concept="17Uvod" id="5hSMZ_lfXxc" 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 concept="3zFVjK" id="5hSMZ_lfXxd" role="3zH0cK">
+                            <node concept="3clFbS" id="5hSMZ_lfXxe" role="2VODD2">
+                              <node concept="3clFbF" id="5hSMZ_lfXxf" role="3cqZAp">
+                                <node concept="2OqwBi" id="5hSMZ_lfXxg" role="3clFbG">
+                                  <node concept="2OqwBi" id="5hSMZ_lfXxh" role="2Oq$k0">
+                                    <node concept="30H73N" id="5hSMZ_lfXxj" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="5hSMZ_lojnm" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="4MEOIDGiECu" role="2OqNvi">
+                                  <node concept="2qgKlT" id="5hSMZ_lfXxm" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                                   </node>
                                 </node>
@@ -10191,177 +10070,87 @@
                     </node>
                   </node>
                 </node>
-                <node concept="raruj" id="4MEOIDGaGP0" role="lGtFl" />
+                <node concept="raruj" id="5hSMZ_lfXxn" 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 concept="14ZrTv" id="5hSMZ_ljLkR" role="14ZwWg">
+          <node concept="30G5F_" id="5hSMZ_ljLkS" role="150hEN">
+            <node concept="3clFbS" id="5hSMZ_ljLkT" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_ljLkU" role="3cqZAp">
+                <node concept="1Wc70l" id="5hSMZ_ljLkV" role="3clFbG">
+                  <node concept="2OqwBi" id="5hSMZ_ljOwA" role="3uHU7B">
+                    <node concept="2OqwBi" id="5hSMZ_ljOwB" role="2Oq$k0">
+                      <node concept="2OqwBi" id="5hSMZ_ljOwC" role="2Oq$k0">
+                        <node concept="30H73N" id="5hSMZ_ljOwD" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="5hSMZ_ljOwE" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
                         </node>
                       </node>
-                      <node concept="3Tsc0h" id="4MEOIDGqcCD" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
+                      <node concept="3Tsc0h" id="5hSMZ_ljOwF" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
                       </node>
                     </node>
-                    <node concept="1v1jN8" id="4MEOIDGqfKs" role="2OqNvi" />
+                    <node concept="3GX2aA" id="5hSMZ_ljOwG" 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">
+                  <node concept="2OqwBi" id="5hSMZ_ljOwH" role="3uHU7w">
+                    <node concept="2OqwBi" id="5hSMZ_ljOwI" role="2Oq$k0">
+                      <node concept="30H73N" id="5hSMZ_ljOwJ" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="5hSMZ_ljOwK" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
                       </node>
                     </node>
-                    <node concept="3GX2aA" id="4MEOIDGqcCJ" role="2OqNvi" />
+                    <node concept="1v1jN8" id="5hSMZ_ljPYJ" 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 concept="1Koe21" id="5hSMZ_ljLl8" role="150oIE">
+            <node concept="3clFbF" id="5hSMZ_ljLl9" role="1Koe22">
+              <node concept="2OqwBi" id="5hSMZ_ljQif" role="3clFbG">
+                <node concept="1eOMI4" id="5hSMZ_ljQig" role="2Oq$k0">
+                  <node concept="1nCR9W" id="5hSMZ_ljQih" role="1eOMHV">
+                    <property role="1nD$Q0" value="TermDeclaration" />
+                    <node concept="3clFbT" id="5hSMZ_ljQii" role="2U2pNA">
+                      <property role="3clFbU" value="false" />
+                    </node>
+                    <node concept="10Nm6u" id="5hSMZ_ljQij" role="2U2pNA">
+                      <node concept="2b32R4" id="5hSMZ_ljQik" role="lGtFl">
+                        <node concept="3JmXsc" id="5hSMZ_ljQil" role="2P8S$">
+                          <node concept="3clFbS" id="5hSMZ_ljQim" role="2VODD2">
+                            <node concept="3clFbF" id="5hSMZ_ljQin" role="3cqZAp">
+                              <node concept="2OqwBi" id="5hSMZ_ljQio" role="3clFbG">
+                                <node concept="2OqwBi" id="5hSMZ_ljQip" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="5hSMZ_ljQiq" role="2Oq$k0">
+                                    <node concept="30H73N" id="5hSMZ_ljQir" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="5hSMZ_ljQis" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
                                     </node>
                                   </node>
+                                  <node concept="3Tsc0h" id="5hSMZ_ljQit" role="2OqNvi">
+                                    <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+                                  </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_override" />
-                                  <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 concept="3$u5V9" id="5hSMZ_ljQiu" role="2OqNvi">
+                                  <node concept="1bVj0M" id="5hSMZ_ljQiv" role="23t8la">
+                                    <node concept="3clFbS" id="5hSMZ_ljQiw" role="1bW5cS">
+                                      <node concept="3clFbF" id="5hSMZ_ljQix" role="3cqZAp">
+                                        <node concept="2OqwBi" id="5hSMZ_ljQiy" role="3clFbG">
+                                          <node concept="37vLTw" id="5hSMZ_ljQiz" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="5hSMZ_ljQi_" resolve="it" />
+                                          </node>
+                                          <node concept="3TrEf2" id="5hSMZ_ljQi$" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:5hSMZ_ldV8_" resolve="code" />
                                           </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 concept="Rh6nW" id="5hSMZ_ljQi_" role="1bW2Oz">
+                                      <property role="TrG5h" value="it" />
+                                      <node concept="2jxLKc" id="5hSMZ_ljQiA" role="1tU5fm" />
                                     </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>
@@ -10370,56 +10159,63 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3uibUv" id="5hSMZ_ljQiB" role="2lIhxL">
+                      <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                    </node>
+                    <node concept="17Uvod" id="5hSMZ_ljQiC" role="lGtFl">
+                      <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                      <property role="2qtEX9" value="fqClassName" />
+                      <node concept="3zFVjK" id="5hSMZ_ljQiD" role="3zH0cK">
+                        <node concept="3clFbS" id="5hSMZ_ljQiE" role="2VODD2">
+                          <node concept="3clFbF" id="5hSMZ_ljQiF" role="3cqZAp">
+                            <node concept="2OqwBi" id="5hSMZ_ljQiG" role="3clFbG">
+                              <node concept="2OqwBi" id="5hSMZ_ljQiH" role="2Oq$k0">
+                                <node concept="30H73N" id="5hSMZ_ljQiJ" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="5hSMZ_ljSUM" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
+                                </node>
+                              </node>
+                              <node concept="2qgKlT" id="5hSMZ_ljQiM" role="2OqNvi">
+                                <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="raruj" id="4MEOIDGqcDU" role="lGtFl" />
+                <node concept="liA8E" id="5hSMZ_ljQiN" role="2OqNvi">
+                  <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                </node>
+                <node concept="raruj" id="5hSMZ_ljQiO" 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 concept="1Koe21" id="5hSMZ_lfXyG" role="14YRTM">
+          <node concept="3clFbF" id="5hSMZ_ljTTK" role="1Koe22">
+            <node concept="2OqwBi" id="5hSMZ_ljTTL" role="3clFbG">
+              <node concept="1eOMI4" id="5hSMZ_ljTTM" role="2Oq$k0">
+                <node concept="1nCR9W" id="5hSMZ_ljTTN" role="1eOMHV">
+                  <property role="1nD$Q0" value="TermDeclaration" />
+                  <node concept="3clFbT" id="5hSMZ_ljTTO" role="2U2pNA">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                  <node concept="10Nm6u" id="5hSMZ_ljTTP" role="2U2pNA">
+                    <node concept="1WS0z7" id="5hSMZ_ljTTQ" role="lGtFl">
+                      <node concept="3JmXsc" id="5hSMZ_ljTTR" role="3Jn$fo">
+                        <node concept="3clFbS" id="5hSMZ_ljTTS" role="2VODD2">
+                          <node concept="3clFbF" id="5hSMZ_ljTTT" role="3cqZAp">
+                            <node concept="2OqwBi" id="5hSMZ_ljTTU" role="3clFbG">
+                              <node concept="2OqwBi" id="5hSMZ_ljTTV" role="2Oq$k0">
+                                <node concept="30H73N" id="5hSMZ_ljTTW" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="5hSMZ_ljTTX" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                                 </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 concept="3Tsc0h" id="5hSMZ_ljTTY" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
                               </node>
                             </node>
                           </node>
@@ -10427,42 +10223,37 @@
                       </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 concept="3uibUv" id="5hSMZ_ljTTZ" role="2lIhxL">
+                    <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                  </node>
+                  <node concept="17Uvod" id="5hSMZ_ljTU0" role="lGtFl">
+                    <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                    <property role="2qtEX9" value="fqClassName" />
+                    <node concept="3zFVjK" id="5hSMZ_ljTU1" role="3zH0cK">
+                      <node concept="3clFbS" id="5hSMZ_ljTU2" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_ljTU3" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_ljTU4" role="3clFbG">
+                            <node concept="2OqwBi" id="5hSMZ_ljTU5" role="2Oq$k0">
+                              <node concept="30H73N" id="5hSMZ_ljTU6" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="5hSMZ_ljTU7" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="4MEOIDGiFpo" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                            <node concept="2qgKlT" id="5hSMZ_ljTU8" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                             </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 concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
+                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+              </node>
+              <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
             </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>
@@ -16279,134 +16070,94 @@
     <node concept="3aamgX" id="4MEOIDFfqT2" role="3aUrZf">
       <property role="36QftV" value="true" />
       <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 concept="1Koe21" id="5hSMZ_lvCD4" role="1lVwrX">
+        <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="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 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 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 concept="30H73N" id="4MEOIDFhlT7" role="2Oq$k0" />
+            </node>
+            <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 concept="30H73N" id="4MEOIDFhlT7" role="2Oq$k0" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <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 concept="2YIFZM" id="4MEOIDFhs3T" role="37wK5m">
+                        <ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="TypeTemplate.ID" />
+                        <ref role="37wK5l" to="psr6:4MEOIDEhz4d" resolve="forReference" />
+                        <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="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
+                                          <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                                        </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="4MEOIDFhuaP" role="2JrQYb">
+                                                <node concept="30H73N" id="4MEOIDFhs48" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="5hSMZ_lte05" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="typeDecl" />
                                                 </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 concept="liA8E" id="4MEOIDFhs4a" role="2OqNvi">
+                                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
                                             </node>
                                           </node>
                                         </node>
@@ -16418,71 +16169,41 @@
                             </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 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="4MEOIDFhlTo" role="2Oq$k0">
+                                      <node concept="30H73N" id="4MEOIDFhlTp" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5hSMZ_lt8zQ" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5hSMZ_lrcKO" resolve="typeArgument" />
                                       </node>
-                                      <node concept="3gn64h" id="4MEOIDFhlTI" role="3gmYPZ">
-                                        <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                    </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>
@@ -16493,23 +16214,23 @@
                         </node>
                       </node>
                     </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 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>
                               </node>
@@ -16520,8 +16241,33 @@
                     </node>
                   </node>
                 </node>
-                <node concept="raruj" id="4MEOIDFhlTU" role="lGtFl" />
+                <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>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
+              <node concept="raruj" id="4MEOIDFhlTU" role="lGtFl" />
             </node>
           </node>
         </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 6655124b..740678b9 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -1706,5 +1706,167 @@
       <node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="5hSMZ_ldW$B">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="13h7C2" to="wq2x:5hSMZ_ldReM" resolve="TermArgumentList" />
+    <node concept="13i0hz" id="5hSMZ_ldW$M" role="13h7CS">
+      <property role="TrG5h" value="getArguments" />
+      <node concept="3Tm1VV" id="5hSMZ_ldW$N" role="1B3o_S" />
+      <node concept="2I9FWS" id="5hSMZ_ldW$O" role="3clF45" />
+      <node concept="3clFbS" id="5hSMZ_ldW$P" role="3clF47">
+        <node concept="3cpWs8" id="5hSMZ_ldW$Q" role="3cqZAp">
+          <node concept="3cpWsn" id="5hSMZ_ldW$R" role="3cpWs9">
+            <property role="TrG5h" value="params" />
+            <node concept="2I9FWS" id="5hSMZ_ldW$S" role="1tU5fm">
+              <ref role="2I9WkF" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_ldW$T" role="33vP2m">
+              <node concept="2OqwBi" id="5hSMZ_ldW$U" role="2Oq$k0">
+                <node concept="2OqwBi" id="5hSMZ_ldW$V" role="2Oq$k0">
+                  <node concept="13iPFW" id="5hSMZ_ldW$W" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="5hSMZ_ldW$X" role="2OqNvi">
+                    <node concept="1xMEDy" id="5hSMZ_ldW$Y" role="1xVPHs">
+                      <node concept="chp4Y" id="5hSMZ_ldZ4J" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="5hSMZ_le0HE" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
+                </node>
+              </node>
+              <node concept="3Tsc0h" id="5hSMZ_le1Cy" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5hSMZ_ldW_2" role="3cqZAp">
+          <node concept="3cpWsn" id="5hSMZ_ldW_3" role="3cpWs9">
+            <property role="TrG5h" value="args" />
+            <node concept="2I9FWS" id="5hSMZ_ldW_4" role="1tU5fm">
+              <ref role="2I9WkF" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_ldW_5" role="33vP2m">
+              <node concept="3Tsc0h" id="5hSMZ_ldW_6" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+              </node>
+              <node concept="13iPFW" id="5hSMZ_ldW_7" role="2Oq$k0" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5hSMZ_ldW_8" role="3cqZAp">
+          <node concept="2OqwBi" id="5hSMZ_ldW_9" role="3clFbG">
+            <node concept="2OqwBi" id="5hSMZ_ldW_a" role="2Oq$k0">
+              <node concept="37vLTw" id="5hSMZ_ldW_b" role="2Oq$k0">
+                <ref role="3cqZAo" node="5hSMZ_ldW$R" resolve="params" />
+              </node>
+              <node concept="3$u5V9" id="5hSMZ_ldW_c" role="2OqNvi">
+                <node concept="1bVj0M" id="5hSMZ_ldW_d" role="23t8la">
+                  <node concept="3clFbS" id="5hSMZ_ldW_e" role="1bW5cS">
+                    <node concept="3cpWs8" id="5hSMZ_ldW_f" role="3cqZAp">
+                      <node concept="3cpWsn" id="5hSMZ_ldW_g" role="3cpWs9">
+                        <property role="TrG5h" value="b" />
+                        <node concept="3Tqbb2" id="5hSMZ_ldW_h" role="1tU5fm">
+                          <ref role="ehGHo" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
+                        </node>
+                        <node concept="2OqwBi" id="5hSMZ_ldW_i" role="33vP2m">
+                          <node concept="37vLTw" id="5hSMZ_ldW_j" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5hSMZ_ldW_3" resolve="args" />
+                          </node>
+                          <node concept="1z4cxt" id="5hSMZ_ldW_k" role="2OqNvi">
+                            <node concept="1bVj0M" id="5hSMZ_ldW_l" role="23t8la">
+                              <node concept="3clFbS" id="5hSMZ_ldW_m" role="1bW5cS">
+                                <node concept="3clFbF" id="5hSMZ_ldW_n" role="3cqZAp">
+                                  <node concept="3clFbC" id="5hSMZ_ldW_o" role="3clFbG">
+                                    <node concept="37vLTw" id="5hSMZ_ldW_p" role="3uHU7w">
+                                      <ref role="3cqZAo" node="5hSMZ_ldW_D" resolve="p" />
+                                    </node>
+                                    <node concept="2OqwBi" id="5hSMZ_ldW_q" role="3uHU7B">
+                                      <node concept="37vLTw" id="5hSMZ_ldW_r" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="5hSMZ_ldW_t" resolve="it" />
+                                      </node>
+                                      <node concept="3TrEf2" id="5hSMZ_le2Gl" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="5hSMZ_ldW_t" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="5hSMZ_ldW_u" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="5hSMZ_ldW_v" role="3cqZAp">
+                      <node concept="3K4zz7" id="5hSMZ_ldW_w" role="3clFbG">
+                        <node concept="2OqwBi" id="5hSMZ_ldW_x" role="3K4E3e">
+                          <node concept="37vLTw" id="5hSMZ_ldW_y" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5hSMZ_ldW_g" resolve="b" />
+                          </node>
+                          <node concept="3TrEf2" id="5hSMZ_ldW_z" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
+                          </node>
+                        </node>
+                        <node concept="2c44tf" id="5hSMZ_ldW_$" role="3K4GZi">
+                          <node concept="10Nm6u" id="5hSMZ_ldW__" role="2c44tc" />
+                        </node>
+                        <node concept="3y3z36" id="5hSMZ_ldW_A" role="3K4Cdx">
+                          <node concept="10Nm6u" id="5hSMZ_ldW_B" role="3uHU7w" />
+                          <node concept="37vLTw" id="5hSMZ_ldW_C" role="3uHU7B">
+                            <ref role="3cqZAo" node="5hSMZ_ldW_g" resolve="b" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="5hSMZ_ldW_D" role="1bW2Oz">
+                    <property role="TrG5h" value="p" />
+                    <node concept="2jxLKc" id="5hSMZ_ldW_E" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="5hSMZ_ldW_F" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="5hSMZ_ldW$C" role="13h7CW">
+      <node concept="3clFbS" id="5hSMZ_ldW$D" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="5hSMZ_ltVxm">
+    <property role="3GE5qa" value="constraint.typespecific" />
+    <ref role="13h7C2" to="wq2x:4MEOIDFfpSk" resolve="NewTypePseudoConstraint" />
+    <node concept="13hLZK" id="5hSMZ_ltVxn" role="13h7CW">
+      <node concept="3clFbS" id="5hSMZ_ltVxo" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5hSMZ_ltVxx" 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="5hSMZ_ltVxy" role="1B3o_S" />
+      <node concept="3clFbS" id="5hSMZ_ltVx_" role="3clF47">
+        <node concept="3clFbF" id="5hSMZ_ltVzJ" role="3cqZAp">
+          <node concept="2OqwBi" id="5hSMZ_ltVID" role="3clFbG">
+            <node concept="13iPFW" id="5hSMZ_ltVzI" role="2Oq$k0" />
+            <node concept="3TrEf2" id="5hSMZ_ltVS$" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="typeDecl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="5hSMZ_ltVxA" 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 ad3240f5..c7f6bb1a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -828,7 +828,7 @@
             <node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
               <property role="TrG5h" value="td" />
               <node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+                <ref role="ehGHo" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
               </node>
               <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
                 <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
@@ -842,8 +842,8 @@
                     <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="6fXjIfxgfUd" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                <node concept="3TrEf2" id="5hSMZ_ln0D$" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
                 </node>
               </node>
             </node>
@@ -857,13 +857,8 @@
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                   <node concept="2OqwBi" id="6fXjIfxgfUi" role="37wK5m">
                     <node concept="2OqwBi" id="6fXjIfxgfUj" role="2Oq$k0">
-                      <node concept="2OqwBi" id="6fXjIfxgfUk" role="2Oq$k0">
-                        <node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="td" />
-                        </node>
-                        <node concept="3TrEf2" id="6fXjIfxgfUm" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                        </node>
+                      <node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="td" />
                       </node>
                       <node concept="3TrEf2" id="6fXjIfxgfUn" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
@@ -1008,5 +1003,77 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="5hSMZ_ldVhx">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1M2myG" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
+    <node concept="1N5Pfh" id="5hSMZ_ldVhy" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
+      <node concept="3dgokm" id="5hSMZ_ldVhA" role="1N6uqs">
+        <node concept="3clFbS" id="5hSMZ_ldVhC" role="2VODD2">
+          <node concept="3clFbF" id="5hSMZ_ldVkx" role="3cqZAp">
+            <node concept="2ShNRf" id="5hSMZ_ldVky" role="3clFbG">
+              <node concept="YeOm9" id="5hSMZ_ldVkz" role="2ShVmc">
+                <node concept="1Y3b0j" id="5hSMZ_ldVk$" 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="3Tm1VV" id="5hSMZ_ldVk_" role="1B3o_S" />
+                  <node concept="3clFb_" id="5hSMZ_ldVkA" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="5hSMZ_ldVkB" role="3clF45" />
+                    <node concept="3Tm1VV" id="5hSMZ_ldVkC" role="1B3o_S" />
+                    <node concept="37vLTG" id="5hSMZ_ldVkD" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="5hSMZ_ldVkE" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="5hSMZ_ldVkF" role="3clF47">
+                      <node concept="3clFbF" id="5hSMZ_ldVkG" role="3cqZAp">
+                        <node concept="2OqwBi" id="5hSMZ_ldVkH" role="3clFbG">
+                          <node concept="1PxgMI" id="5hSMZ_ldVkI" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="37vLTw" id="5hSMZ_ldVkJ" role="1m5AlR">
+                              <ref role="3cqZAo" node="5hSMZ_ldVkD" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="5hSMZ_ldVkK" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="5hSMZ_ldVkL" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5hSMZ_ldVkM" role="37wK5m">
+                    <node concept="2OqwBi" id="5hSMZ_ldVkN" role="2Oq$k0">
+                      <node concept="2OqwBi" id="5hSMZ_ldVkO" role="2Oq$k0">
+                        <node concept="2rP1CM" id="5hSMZ_ldVkP" role="2Oq$k0" />
+                        <node concept="2Xjw5R" id="5hSMZ_ldVkQ" role="2OqNvi">
+                          <node concept="1xMEDy" id="5hSMZ_ldVkR" role="1xVPHs">
+                            <node concept="chp4Y" id="5hSMZ_lxKJf" role="ri$Ld">
+                              <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+                            </node>
+                          </node>
+                          <node concept="1xIGOp" id="5hSMZ_ldVkT" role="1xVPHs" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="5hSMZ_lxLgI" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="5hSMZ_lxLAA" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                    </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 709a2a04..d18a386f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -4044,6 +4044,33 @@
             <ref role="1k5W1q" node="7km57Pk7sC0" resolve="TypeTerm" />
           </node>
         </node>
+        <node concept="3nxI2P" id="5hSMZ_l94mK" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="5hSMZ_ld88_" role="pqm2j">
+          <node concept="3clFbS" id="5hSMZ_ld88A" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_ld8fN" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_ld9yE" role="3clFbG">
+                <node concept="2OqwBi" id="5hSMZ_ld8ty" role="2Oq$k0">
+                  <node concept="pncrf" id="5hSMZ_ld8fM" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5hSMZ_ld99e" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="5hSMZ_lda95" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1iCGBv" id="5hSMZ_l942J" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5hSMZ_l93p$" resolve="termDecl" />
+        <node concept="1sVBvm" id="5hSMZ_l942L" role="1sWHZn">
+          <node concept="3F0A7n" id="5hSMZ_l94mH" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
       </node>
       <node concept="3F0ifn" id="1L74NXFOwvI" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -4057,6 +4084,27 @@
       </node>
       <node concept="3F1sOY" id="1L74NXEmI68" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:1L74NXEmI65" resolve="argument" />
+        <node concept="3nxI2P" id="5hSMZ_le38Y" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="5hSMZ_lvfdP" role="pqm2j">
+          <node concept="3clFbS" id="5hSMZ_lvfdQ" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lvfl3" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lvg_c" role="3clFbG">
+                <node concept="2OqwBi" id="5hSMZ_lvfyM" role="2Oq$k0">
+                  <node concept="pncrf" id="5hSMZ_lvfl2" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5hSMZ_lvgeS" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:1L74NXEmI65" resolve="argument" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="5hSMZ_lvh07" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F1sOY" id="5hSMZ_le4li" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5hSMZ_ldQTd" resolve="termArgument" />
       </node>
       <node concept="3F0ifn" id="1L74NXEn_ul" role="3EZMnx">
         <property role="3F0ifm" value=")" />
@@ -5607,8 +5655,55 @@
         <property role="3F0ifm" value="newType" />
         <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
       </node>
+      <node concept="1iCGBv" id="5hSMZ_lpX5n" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5hSMZ_lpUoi" resolve="typeDecl" />
+        <node concept="1sVBvm" id="5hSMZ_lpX5p" role="1sWHZn">
+          <node concept="3F0A7n" id="5hSMZ_lpX5$" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="5hSMZ_lrdys" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+        <node concept="11L4FC" id="5hSMZ_lrdyt" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="11LMrY" id="5hSMZ_lrdyu" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F1sOY" id="5hSMZ_lrdyv" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5hSMZ_lrcKO" resolve="typeArgument" />
+        <node concept="3nxI2P" id="5hSMZ_lrdyw" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="5hSMZ_lrdyy" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+        <node concept="11L4FC" id="5hSMZ_lrdyz" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="3F1sOY" id="4MEOIDFfpTJ" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+        <node concept="pkWqt" id="5hSMZ_lxkX9" role="pqm2j">
+          <node concept="3clFbS" id="5hSMZ_lxkXa" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lxl4n" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lxm2F" role="3clFbG">
+                <node concept="2OqwBi" id="5hSMZ_lxliS" role="2Oq$k0">
+                  <node concept="pncrf" id="5hSMZ_lxl4m" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5hSMZ_lxlDq" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4MEOIDFfpTb" resolve="typeTerm" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="5hSMZ_lxmzu" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="l2Vlx" id="4MEOIDFfpTj" role="2iSdaV" />
     </node>
@@ -6265,5 +6360,65 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="5hSMZ_ldV91">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1XX52x" to="wq2x:5hSMZ_ldReN" resolve="TermParameterBinding" />
+    <node concept="3EZMnI" id="5hSMZ_ldV93" role="2wV5jI">
+      <node concept="3EZMnI" id="5hSMZ_ldV94" role="3EZMnx">
+        <node concept="VPM3Z" id="5hSMZ_ldV95" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3vyZuw" id="5hSMZ_ldV96" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="1Bsynf" id="5hSMZ_ldV97" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1Bt7hp" id="5hSMZ_ldV98" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1iCGBv" id="5hSMZ_ldV99" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:5hSMZ_ldReO" resolve="parameter" />
+          <node concept="1sVBvm" id="5hSMZ_ldV9a" role="1sWHZn">
+            <node concept="3F0A7n" id="5hSMZ_ldV9b" 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="3F0ifn" id="5hSMZ_ldV9c" role="3EZMnx">
+          <property role="3F0ifm" value="=" />
+          <node concept="11L4FC" id="5hSMZ_ldV9d" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="11LMrY" id="5hSMZ_ldV9e" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F1sOY" id="5hSMZ_ldV9f" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:5hSMZ_ldV8_" resolve="code" />
+        </node>
+        <node concept="l2Vlx" id="5hSMZ_ldV9g" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="5hSMZ_ldV9h" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="5hSMZ_ldWzO">
+    <property role="3GE5qa" value="type.term" />
+    <ref role="1XX52x" to="wq2x:5hSMZ_ldReM" resolve="TermArgumentList" />
+    <node concept="3EZMnI" id="5hSMZ_ldWzQ" role="2wV5jI">
+      <node concept="3F2HdR" id="5hSMZ_ldWzR" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <property role="Q2I2d" value="punctuation" />
+        <ref role="1NtTu8" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+        <node concept="l2Vlx" id="5hSMZ_ldWzS" role="2czzBx" />
+        <node concept="3F0ifn" id="5hSMZ_ldWzT" role="2czzBI">
+          <property role="3F0ifm" value="" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="5hSMZ_ldWzU" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 43637ba7..aa93bc3e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1086,8 +1086,15 @@
       <property role="IQ2ns" value="2037618519496647045" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="argument" />
-      <property role="20lbJX" value="1" />
+      <property role="20lbJX" value="0..1" />
       <ref role="20lvS9" node="1L74NXEmFJU" resolve="TypeArgumentList" />
+      <node concept="asaX9" id="5hSMZ_lg0sM" role="lGtFl" />
+    </node>
+    <node concept="1TJgyj" id="5hSMZ_ldQTd" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168128216653" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="termArgument" />
+      <ref role="20lvS9" node="5hSMZ_ldReM" resolve="TermArgumentList" />
     </node>
     <node concept="1TJgyj" id="1L74NXFNj2L" role="1TKVEi">
       <property role="IQ2ns" value="2037618519520915633" />
@@ -1100,9 +1107,16 @@
       <property role="IQ2ns" value="2037618519496446056" />
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="1" />
+      <property role="20lbJX" value="0..1" />
       <property role="TrG5h" value="declaration" />
       <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
+      <node concept="asaX9" id="5hSMZ_ldQ_C" role="lGtFl" />
+    </node>
+    <node concept="1TJgyj" id="5hSMZ_l93p$" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168126957156" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="termDecl" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
     </node>
     <node concept="PrWs8" id="1L74NXEmHzi" role="PzmwI">
       <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
@@ -1199,6 +1213,13 @@
     <property role="TrG5h" value="NewTypePseudoConstraint" />
     <property role="34LRSv" value="new type" />
     <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
+    <node concept="1TJgyj" id="5hSMZ_lpUoi" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168131376658" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="typeDecl" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
+    </node>
     <node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
       <property role="IQ2ns" value="5524459797186715209" />
       <property role="20lmBu" value="aggregation" />
@@ -1206,12 +1227,22 @@
       <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
     </node>
+    <node concept="1TJgyj" id="5hSMZ_lrcKO" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168131714100" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="typeArgument" />
+      <ref role="20lvS9" node="1L74NXEmFJU" resolve="TypeArgumentList" />
+    </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" />
+      <property role="20lbJX" value="0..1" />
       <ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
+      <node concept="asaX9" id="5hSMZ_lrctE" role="lGtFl" />
+    </node>
+    <node concept="PrWs8" id="5hSMZ_ltV78" role="PzmwI">
+      <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
     </node>
   </node>
   <node concept="1TIwiD" id="4MEOIDFttoe">
@@ -1348,5 +1379,38 @@
     <property role="34LRSv" value="logicalContext" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
   </node>
+  <node concept="1TIwiD" id="5hSMZ_ldReM">
+    <property role="EcuMT" value="6086839168128218034" />
+    <property role="3GE5qa" value="type.term" />
+    <property role="TrG5h" value="TermArgumentList" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="5hSMZ_ldWzp" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168128239833" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="binding" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="5hSMZ_ldReN" resolve="TermParameterBinding" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="5hSMZ_ldReN">
+    <property role="EcuMT" value="6086839168128218035" />
+    <property role="3GE5qa" value="type.term" />
+    <property role="TrG5h" value="TermParameterBinding" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="5hSMZ_ldV8_" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168128234021" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="1TJgyj" id="5hSMZ_ldReO" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168128218036" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="parameter" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+    </node>
+  </node>
 </model>