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 dcdc0fca..0e86544e 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
@@ -116,7 +116,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
@@ -8002,6 +8004,11 @@
       <ref role="2rTdP9" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
+    <node concept="2rT7sh" id="5hSMZ_lNDE_" role="2rTMjI">
+      <property role="TrG5h" value="termtable_class" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
+      <ref role="2rTdP9" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+    </node>
     <node concept="2rT7sh" id="7IysFeAaXEh" role="2rTMjI">
       <property role="TrG5h" value="typeParam_field" />
       <ref role="2rTdP9" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
@@ -8037,6 +8044,11 @@
       <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="_TypeTable" />
       <ref role="2sgKRv" node="2N2MQGCMWOf" resolve="typetable_class" />
     </node>
+    <node concept="3lhOvk" id="5hSMZ_lNwt5" role="3lj3bC">
+      <ref role="30HIoZ" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+      <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="termtable_class" />
+      <ref role="3lhOvi" node="5hSMZ_lNRS0" resolve="_TermTable" />
+    </node>
     <node concept="2VPoh5" id="2N2MQGCMV2s" role="2VS0gm">
       <ref role="2VPoh2" node="2N2MQGCMVs3" resolve="TypeManifest" />
       <ref role="2sBCQV" node="2hteS6ClwZa" resolve="type_manifest" />
@@ -18906,391 +18918,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="1GNw78$HcHg" role="jymVt" />
-      <node concept="312cEu" id="4MEOIDFCzbt" role="jymVt">
-        <property role="2bfB8j" value="false" />
-        <property role="TrG5h" value="_Term" />
-        <node concept="2tJIrI" id="4MEOIDFHEHB" role="jymVt" />
-        <node concept="3clFbW" id="4MEOIDG7PYF" role="jymVt">
-          <node concept="37vLTG" id="4MEOIDGdr2b" role="3clF46">
-            <property role="TrG5h" value="pattern" />
-            <node concept="10P_77" id="4MEOIDGdr_a" role="1tU5fm" />
-          </node>
-          <node concept="37vLTG" id="4MEOIDG7PYI" role="3clF46">
-            <property role="TrG5h" value="param" />
-            <node concept="1WS0z7" id="4MEOIDG7PYJ" role="lGtFl">
-              <node concept="3JmXsc" id="4MEOIDG7PYK" role="3Jn$fo">
-                <node concept="3clFbS" id="4MEOIDG7PYL" role="2VODD2">
-                  <node concept="3clFbF" id="4MEOIDG7PYM" role="3cqZAp">
-                    <node concept="2OqwBi" id="4MEOIDG7PYN" role="3clFbG">
-                      <node concept="3Tsc0h" id="4MEOIDG7PYO" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                      </node>
-                      <node concept="30H73N" id="4MEOIDG7PYP" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3uibUv" id="4MEOIDG7PYQ" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              <node concept="29HgVG" id="4MEOIDG7PYR" role="lGtFl">
-                <node concept="3NFfHV" id="4MEOIDG7PYS" role="3NFExx">
-                  <node concept="3clFbS" id="4MEOIDG7PYT" role="2VODD2">
-                    <node concept="3clFbF" id="4MEOIDG7PYU" role="3cqZAp">
-                      <node concept="2OqwBi" id="4MEOIDG7PYV" role="3clFbG">
-                        <node concept="3TrEf2" id="4MEOIDG7PYW" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
-                        </node>
-                        <node concept="30H73N" id="4MEOIDG7PYX" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cqZAl" id="4MEOIDG7PYY" role="3clF45" />
-          <node concept="3Tm1VV" id="4MEOIDG7PYZ" role="1B3o_S" />
-          <node concept="3clFbS" id="4MEOIDG7PZ0" role="3clF47">
-            <node concept="3clFbF" id="4MEOIDG7PZ1" role="3cqZAp">
-              <node concept="37vLTI" id="4MEOIDG7PZ2" role="3clFbG">
-                <node concept="37vLTw" id="4MEOIDGdrDF" role="37vLTx">
-                  <ref role="3cqZAo" node="4MEOIDGdr2b" resolve="pattern" />
-                </node>
-                <node concept="2OqwBi" id="4MEOIDG7PZ4" role="37vLTJ">
-                  <node concept="Xjq3P" id="4MEOIDG7PZ5" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="4MEOIDG7PZ6" role="2OqNvi">
-                    <ref role="2Oxat5" node="4MEOIDFKfTT" resolve="pattern" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4MEOIDG7PZ7" role="3cqZAp">
-              <node concept="37vLTI" id="4MEOIDG7PZ8" role="3clFbG">
-                <node concept="37vLTw" id="4MEOIDG7PZ9" role="37vLTx">
-                  <ref role="3cqZAo" node="4MEOIDG7PYI" resolve="param" />
-                </node>
-                <node concept="2OqwBi" id="4MEOIDG7PZa" role="37vLTJ">
-                  <node concept="Xjq3P" id="4MEOIDG7PZb" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="4MEOIDG7PZc" role="2OqNvi">
-                    <ref role="2Oxat5" node="4MEOIDFH_Un" resolve="param" />
-                    <node concept="1ZhdrF" id="4MEOIDG7PZd" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
-                      <property role="2qtEX8" value="fieldDeclaration" />
-                      <node concept="3$xsQk" id="4MEOIDG7PZe" role="3$ytzL">
-                        <node concept="3clFbS" id="4MEOIDG7PZf" role="2VODD2">
-                          <node concept="3clFbF" id="4MEOIDG7PZg" role="3cqZAp">
-                            <node concept="2OqwBi" id="4MEOIDG7PZh" role="3clFbG">
-                              <node concept="1iwH7S" id="4MEOIDG7PZi" role="2Oq$k0" />
-                              <node concept="1iwH70" id="4MEOIDG7PZj" role="2OqNvi">
-                                <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
-                                <node concept="30H73N" id="4MEOIDG7PZk" role="1iwH7V" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="4MEOIDG7PZl" role="lGtFl">
-                <node concept="3JmXsc" id="4MEOIDG7PZm" role="3Jn$fo">
-                  <node concept="3clFbS" id="4MEOIDG7PZn" role="2VODD2">
-                    <node concept="3clFbF" id="4MEOIDG7PZo" role="3cqZAp">
-                      <node concept="2OqwBi" id="4MEOIDG7PZp" role="3clFbG">
-                        <node concept="3Tsc0h" id="4MEOIDG7PZq" role="2OqNvi">
-                          <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                        </node>
-                        <node concept="30H73N" id="4MEOIDG7PZr" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4MEOIDFK68H" role="jymVt" />
-        <node concept="312cEg" id="4MEOIDFKfTT" role="jymVt">
-          <property role="TrG5h" value="pattern" />
-          <node concept="3Tm6S6" id="4MEOIDFKfTU" role="1B3o_S" />
-          <node concept="10P_77" id="4MEOIDFKgNd" role="1tU5fm" />
-        </node>
-        <node concept="312cEg" id="4MEOIDFH_Un" role="jymVt">
-          <property role="TrG5h" value="param" />
-          <node concept="3Tmbuc" id="4MEOIDFH_Uo" role="1B3o_S" />
-          <node concept="3uibUv" id="4MEOIDFH_Up" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            <node concept="29HgVG" id="4MEOIDFH_Uq" role="lGtFl">
-              <node concept="3NFfHV" id="4MEOIDFH_Ur" role="3NFExx">
-                <node concept="3clFbS" id="4MEOIDFH_Us" role="2VODD2">
-                  <node concept="3clFbF" id="4MEOIDFH_Ut" role="3cqZAp">
-                    <node concept="2OqwBi" id="4MEOIDFH_Uu" role="3clFbG">
-                      <node concept="3TrEf2" id="4MEOIDFH_Uv" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
-                      </node>
-                      <node concept="30H73N" id="4MEOIDFH_Uw" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1WS0z7" id="4MEOIDFH_Ux" role="lGtFl">
-            <ref role="2rW$FS" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
-            <node concept="3JmXsc" id="4MEOIDFH_Uy" role="3Jn$fo">
-              <node concept="3clFbS" id="4MEOIDFH_Uz" role="2VODD2">
-                <node concept="3clFbF" id="4MEOIDFH_U$" role="3cqZAp">
-                  <node concept="2OqwBi" id="4MEOIDFH_U_" role="3clFbG">
-                    <node concept="3Tsc0h" id="4MEOIDFHDXt" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                    </node>
-                    <node concept="30H73N" id="4MEOIDFH_UB" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="4MEOIDFH_UC" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="4MEOIDFH_UD" role="3zH0cK">
-              <node concept="3clFbS" id="4MEOIDFH_UE" role="2VODD2">
-                <node concept="3clFbF" id="4MEOIDFH_UF" role="3cqZAp">
-                  <node concept="2OqwBi" id="4MEOIDFH_UG" role="3clFbG">
-                    <node concept="3TrcHB" id="4MEOIDFH_UH" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="30H73N" id="4MEOIDFH_UI" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4MEOIDFCzkm" role="jymVt" />
-        <node concept="3clFb_" id="4MEOIDFFfNi" role="jymVt">
-          <property role="TrG5h" value="feature" />
-          <node concept="3uibUv" id="4MEOIDFFfNj" role="3clF45">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-          </node>
-          <node concept="3Tmbuc" id="4MEOIDFFfNk" role="1B3o_S" />
-          <node concept="3clFbS" id="4MEOIDFFfNl" role="3clF47">
-            <node concept="3clFbJ" id="4MEOIDFFfNm" role="3cqZAp">
-              <node concept="3clFbS" id="4MEOIDFFfNn" role="3clFbx">
-                <node concept="3cpWs6" id="4MEOIDFFfNo" role="3cqZAp">
-                  <node concept="10Nm6u" id="4MEOIDFFfNp" role="3cqZAk">
-                    <node concept="1sPUBX" id="4MEOIDFFfNq" role="lGtFl">
-                      <ref role="v9R2y" node="1L74NXFaLHB" resolve="type_term_pattern" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4MEOIDFFfNr" role="3cqZAp" />
-              </node>
-              <node concept="37vLTw" id="4MEOIDFKiX5" role="3clFbw">
-                <ref role="3cqZAo" node="4MEOIDFKfTT" resolve="pattern" />
-              </node>
-              <node concept="9aQIb" id="4MEOIDFFfNt" role="9aQIa">
-                <node concept="3clFbS" id="4MEOIDFFfNu" role="9aQI4">
-                  <node concept="3cpWs6" id="4MEOIDFFfNv" role="3cqZAp">
-                    <node concept="10Nm6u" id="4MEOIDFFfNw" role="3cqZAk">
-                      <node concept="1sPUBX" id="4MEOIDFFfNx" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1WS0z7" id="4MEOIDFFfNy" role="lGtFl">
-            <ref role="2rW$FS" node="1L74NXG7ihq" resolve="typeFeature_method" />
-            <node concept="3JmXsc" id="4MEOIDFFfNz" role="3Jn$fo">
-              <node concept="3clFbS" id="4MEOIDFFfN$" role="2VODD2">
-                <node concept="3clFbF" id="4MEOIDFFfN_" role="3cqZAp">
-                  <node concept="2OqwBi" id="4MEOIDFFfNA" role="3clFbG">
-                    <node concept="3Tsc0h" id="4MEOIDFFlb9" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                    </node>
-                    <node concept="2OqwBi" id="4MEOIDFFk3f" role="2Oq$k0">
-                      <node concept="30H73N" id="4MEOIDFFjkD" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="4MEOIDFFktE" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="4MEOIDFFfNF" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="4MEOIDFFfNG" role="3zH0cK">
-              <node concept="3clFbS" id="4MEOIDFFfNH" role="2VODD2">
-                <node concept="3clFbF" id="4MEOIDFFfNI" role="3cqZAp">
-                  <node concept="2OqwBi" id="4MEOIDFFfNJ" role="3clFbG">
-                    <node concept="30H73N" id="4MEOIDFFfNK" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="4MEOIDFFfNL" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4MEOIDFCLHR" role="jymVt" />
-        <node concept="3clFb_" id="4MEOIDFNm77" role="jymVt">
-          <property role="TrG5h" value="typeTerm" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="3uibUv" id="4MEOIDFNm78" role="3clF45">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-          </node>
-          <node concept="3Tm1VV" id="4MEOIDFNm79" role="1B3o_S" />
-          <node concept="3clFbS" id="4MEOIDFNm7b" role="3clF47">
-            <node concept="3cpWs6" id="4MEOIDFNoCC" role="3cqZAp">
-              <node concept="1oi1Uc" id="4MEOIDFNoCD" role="3cqZAk">
-                <node concept="1oi5UN" id="4MEOIDFNoCE" role="1oi0x0">
-                  <node concept="1oi5Wm" id="4MEOIDFNoCF" role="1ojpOf">
-                    <property role="TrG5h" value="name" />
-                    <node concept="1WS0z7" id="4MEOIDFNoCG" role="lGtFl">
-                      <node concept="3JmXsc" id="4MEOIDFNoCH" role="3Jn$fo">
-                        <node concept="3clFbS" id="4MEOIDFNoCI" role="2VODD2">
-                          <node concept="3clFbF" id="4MEOIDFNoCJ" role="3cqZAp">
-                            <node concept="2OqwBi" id="4MEOIDFNoCK" role="3clFbG">
-                              <node concept="2OqwBi" id="4MEOIDFNuZ8" role="2Oq$k0">
-                                <node concept="30H73N" id="4MEOIDFNoCM" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="4MEOIDFNvjU" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="4MEOIDFNoCO" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:5UYwY$H7MGm" resolve="valueFeatures" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="22Ky0T" id="4MEOIDFNoCP" role="lGtFl">
-                      <node concept="2OqwBi" id="4MEOIDFNoCQ" role="22Ky0K">
-                        <node concept="Xjq3P" id="4MEOIDFNw2I" role="2Oq$k0" />
-                        <node concept="liA8E" id="4MEOIDFNoCS" role="2OqNvi">
-                          <ref role="37wK5l" node="4MEOIDFFfNi" resolve="feature" />
-                          <node concept="1ZhdrF" id="4MEOIDFNoCT" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <node concept="3$xsQk" id="4MEOIDFNoCU" role="3$ytzL">
-                              <node concept="3clFbS" id="4MEOIDFNoCV" role="2VODD2">
-                                <node concept="3clFbF" id="4MEOIDFNoCW" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4MEOIDFNoCX" role="3clFbG">
-                                    <node concept="1iwH7S" id="4MEOIDFNoCY" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="4MEOIDFNoCZ" role="2OqNvi">
-                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
-                                      <node concept="30H73N" id="4MEOIDFNoD0" role="1iwH7V" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1oi5ST" id="4MEOIDFNoD1" role="1ojpOf">
-                    <property role="TrG5h" value="name" />
-                    <node concept="1WS0z7" id="4MEOIDFNoD2" role="lGtFl">
-                      <node concept="3JmXsc" id="4MEOIDFNoD3" role="3Jn$fo">
-                        <node concept="3clFbS" id="4MEOIDFNoD4" role="2VODD2">
-                          <node concept="3clFbF" id="4MEOIDFNoD5" role="3cqZAp">
-                            <node concept="2OqwBi" id="4MEOIDFNoD6" role="3clFbG">
-                              <node concept="2OqwBi" id="4MEOIDFNoD7" role="2Oq$k0">
-                                <node concept="30H73N" id="4MEOIDFNoD8" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="4MEOIDFNBi7" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="4MEOIDFNoDa" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:5UYwY$H7TrL" resolve="childFeatures" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="22Ky0T" id="4MEOIDFNoDb" role="lGtFl">
-                      <node concept="2OqwBi" id="4MEOIDFNoDc" role="22Ky0K">
-                        <node concept="Xjq3P" id="4MEOIDFNBBN" role="2Oq$k0" />
-                        <node concept="liA8E" id="4MEOIDFNoDe" role="2OqNvi">
-                          <ref role="37wK5l" node="4MEOIDFFfNi" resolve="feature" />
-                          <node concept="1ZhdrF" id="4MEOIDFNoDf" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <node concept="3$xsQk" id="4MEOIDFNoDg" role="3$ytzL">
-                              <node concept="3clFbS" id="4MEOIDFNoDh" role="2VODD2">
-                                <node concept="3clFbF" id="4MEOIDFNoDi" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4MEOIDFNoDj" role="3clFbG">
-                                    <node concept="1iwH7S" id="4MEOIDFNoDk" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="4MEOIDFNoDl" role="2OqNvi">
-                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
-                                      <node concept="30H73N" id="4MEOIDFNoDm" role="1iwH7V" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="4MEOIDFNm7c" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="4MEOIDFCzbu" role="1B3o_S" />
-        <node concept="raruj" id="4MEOIDFCAlP" role="lGtFl" />
-        <node concept="1WS0z7" id="4MEOIDFCAm3" role="lGtFl">
-          <node concept="3JmXsc" id="4MEOIDFCAm5" role="3Jn$fo">
-            <node concept="3clFbS" id="4MEOIDFCAm7" role="2VODD2">
-              <node concept="3clFbF" id="4MEOIDFCArL" role="3cqZAp">
-                <node concept="2OqwBi" id="4MEOIDFCACu" role="3clFbG">
-                  <node concept="30H73N" id="4MEOIDFCArK" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="4MEOIDFCAY0" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:4MEOIDFttPg" resolve="termDeclaration" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="4MEOIDFCHBm" role="1zkMxy">
-          <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-        </node>
-        <node concept="17Uvod" id="4MEOIDFCHMU" role="lGtFl">
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <property role="2qtEX9" value="name" />
-          <node concept="3zFVjK" id="4MEOIDFCHMV" role="3zH0cK">
-            <node concept="3clFbS" id="4MEOIDFCHMW" role="2VODD2">
-              <node concept="3clFbF" id="4MEOIDG8ucM" role="3cqZAp">
-                <node concept="2OqwBi" id="4MEOIDG8urI" role="3clFbG">
-                  <node concept="30H73N" id="4MEOIDG8ucL" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="4MEOIDG8uPr" role="2OqNvi">
-                    <ref role="37wK5l" to="x5bw:4MEOIDG83_h" resolve="runtimeClassName" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="3Tm1VV" id="1GNw78$HcGO" role="1B3o_S" />
     </node>
   </node>
@@ -20560,5 +20187,420 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="5hSMZ_lNRS0">
+    <property role="TrG5h" value="_TermTable" />
+    <node concept="2tJIrI" id="5hSMZ_lNYE5" role="jymVt" />
+    <node concept="312cEu" id="5hSMZ_lNZg9" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="_Term" />
+      <node concept="2tJIrI" id="5hSMZ_lNZga" role="jymVt" />
+      <node concept="3clFbW" id="5hSMZ_lNZgb" role="jymVt">
+        <node concept="37vLTG" id="5hSMZ_lNZgc" role="3clF46">
+          <property role="TrG5h" value="pattern" />
+          <node concept="10P_77" id="5hSMZ_lNZgd" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="5hSMZ_lNZge" role="3clF46">
+          <property role="TrG5h" value="param" />
+          <node concept="1WS0z7" id="5hSMZ_lNZgf" role="lGtFl">
+            <node concept="3JmXsc" id="5hSMZ_lNZgg" role="3Jn$fo">
+              <node concept="3clFbS" id="5hSMZ_lNZgh" role="2VODD2">
+                <node concept="3clFbF" id="5hSMZ_lNZgi" role="3cqZAp">
+                  <node concept="2OqwBi" id="5hSMZ_lNZgj" role="3clFbG">
+                    <node concept="3Tsc0h" id="5hSMZ_lNZgk" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                    </node>
+                    <node concept="30H73N" id="5hSMZ_lNZgl" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3uibUv" id="5hSMZ_lNZgm" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            <node concept="29HgVG" id="5hSMZ_lNZgn" role="lGtFl">
+              <node concept="3NFfHV" id="5hSMZ_lNZgo" role="3NFExx">
+                <node concept="3clFbS" id="5hSMZ_lNZgp" role="2VODD2">
+                  <node concept="3clFbF" id="5hSMZ_lNZgq" role="3cqZAp">
+                    <node concept="2OqwBi" id="5hSMZ_lNZgr" role="3clFbG">
+                      <node concept="3TrEf2" id="5hSMZ_lNZgs" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
+                      </node>
+                      <node concept="30H73N" id="5hSMZ_lNZgt" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="5hSMZ_lNZgu" role="3clF45" />
+        <node concept="3Tm1VV" id="5hSMZ_lNZgv" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZgw" role="3clF47">
+          <node concept="3clFbF" id="5hSMZ_lNZgx" role="3cqZAp">
+            <node concept="37vLTI" id="5hSMZ_lNZgy" role="3clFbG">
+              <node concept="37vLTw" id="5hSMZ_lNZgz" role="37vLTx">
+                <ref role="3cqZAo" node="5hSMZ_lNZgc" resolve="pattern" />
+              </node>
+              <node concept="2OqwBi" id="5hSMZ_lNZg$" role="37vLTJ">
+                <node concept="Xjq3P" id="5hSMZ_lNZg_" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5hSMZ_lNZgA" role="2OqNvi">
+                  <ref role="2Oxat5" node="5hSMZ_lNZgX" resolve="pattern" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5hSMZ_lNZgB" role="3cqZAp">
+            <node concept="37vLTI" id="5hSMZ_lNZgC" role="3clFbG">
+              <node concept="37vLTw" id="5hSMZ_lNZgD" role="37vLTx">
+                <ref role="3cqZAo" node="5hSMZ_lNZge" resolve="param" />
+              </node>
+              <node concept="2OqwBi" id="5hSMZ_lNZgE" role="37vLTJ">
+                <node concept="Xjq3P" id="5hSMZ_lNZgF" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5hSMZ_lNZgG" role="2OqNvi">
+                  <ref role="2Oxat5" node="5hSMZ_lNZh0" resolve="param" />
+                  <node concept="1ZhdrF" id="5hSMZ_lNZgH" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                    <property role="2qtEX8" value="fieldDeclaration" />
+                    <node concept="3$xsQk" id="5hSMZ_lNZgI" role="3$ytzL">
+                      <node concept="3clFbS" id="5hSMZ_lNZgJ" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_lNZgK" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_lNZgL" role="3clFbG">
+                            <node concept="1iwH7S" id="5hSMZ_lNZgM" role="2Oq$k0" />
+                            <node concept="1iwH70" id="5hSMZ_lNZgN" role="2OqNvi">
+                              <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+                              <node concept="30H73N" id="5hSMZ_lNZgO" role="1iwH7V" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1WS0z7" id="5hSMZ_lNZgP" role="lGtFl">
+              <node concept="3JmXsc" id="5hSMZ_lNZgQ" role="3Jn$fo">
+                <node concept="3clFbS" id="5hSMZ_lNZgR" role="2VODD2">
+                  <node concept="3clFbF" id="5hSMZ_lNZgS" role="3cqZAp">
+                    <node concept="2OqwBi" id="5hSMZ_lNZgT" role="3clFbG">
+                      <node concept="3Tsc0h" id="5hSMZ_lNZgU" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                      </node>
+                      <node concept="30H73N" id="5hSMZ_lNZgV" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5hSMZ_lNZgW" role="jymVt" />
+      <node concept="312cEg" id="5hSMZ_lNZgX" role="jymVt">
+        <property role="TrG5h" value="pattern" />
+        <node concept="3Tm6S6" id="5hSMZ_lNZgY" role="1B3o_S" />
+        <node concept="10P_77" id="5hSMZ_lNZgZ" role="1tU5fm" />
+      </node>
+      <node concept="312cEg" id="5hSMZ_lNZh0" role="jymVt">
+        <property role="TrG5h" value="param" />
+        <node concept="3Tmbuc" id="5hSMZ_lNZh1" role="1B3o_S" />
+        <node concept="3uibUv" id="5hSMZ_lNZh2" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          <node concept="29HgVG" id="5hSMZ_lNZh3" role="lGtFl">
+            <node concept="3NFfHV" id="5hSMZ_lNZh4" role="3NFExx">
+              <node concept="3clFbS" id="5hSMZ_lNZh5" role="2VODD2">
+                <node concept="3clFbF" id="5hSMZ_lNZh6" role="3cqZAp">
+                  <node concept="2OqwBi" id="5hSMZ_lNZh7" role="3clFbG">
+                    <node concept="3TrEf2" id="5hSMZ_lNZh8" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:4MEOIDFwTy3" resolve="type" />
+                    </node>
+                    <node concept="30H73N" id="5hSMZ_lNZh9" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1WS0z7" id="5hSMZ_lNZha" role="lGtFl">
+          <ref role="2rW$FS" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+          <node concept="3JmXsc" id="5hSMZ_lNZhb" role="3Jn$fo">
+            <node concept="3clFbS" id="5hSMZ_lNZhc" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhd" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhe" role="3clFbG">
+                  <node concept="3Tsc0h" id="5hSMZ_lNZhf" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                  </node>
+                  <node concept="30H73N" id="5hSMZ_lNZhg" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="17Uvod" id="5hSMZ_lNZhh" role="lGtFl">
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <property role="2qtEX9" value="name" />
+          <node concept="3zFVjK" id="5hSMZ_lNZhi" role="3zH0cK">
+            <node concept="3clFbS" id="5hSMZ_lNZhj" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhk" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhl" role="3clFbG">
+                  <node concept="3TrcHB" id="5hSMZ_lNZhm" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                  <node concept="30H73N" id="5hSMZ_lNZhn" role="2Oq$k0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5hSMZ_lNZho" role="jymVt" />
+      <node concept="3clFb_" id="5hSMZ_lNZhp" role="jymVt">
+        <property role="TrG5h" value="feature" />
+        <node concept="3uibUv" id="5hSMZ_lNZhq" role="3clF45">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+        </node>
+        <node concept="3Tmbuc" id="5hSMZ_lNZhr" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZhs" role="3clF47">
+          <node concept="3clFbJ" id="5hSMZ_lNZht" role="3cqZAp">
+            <node concept="3clFbS" id="5hSMZ_lNZhu" role="3clFbx">
+              <node concept="3cpWs6" id="5hSMZ_lNZhv" role="3cqZAp">
+                <node concept="10Nm6u" id="5hSMZ_lNZhw" role="3cqZAk">
+                  <node concept="1sPUBX" id="5hSMZ_lNZhx" role="lGtFl">
+                    <ref role="v9R2y" node="1L74NXFaLHB" resolve="type_term_pattern" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5hSMZ_lNZhy" role="3cqZAp" />
+            </node>
+            <node concept="37vLTw" id="5hSMZ_lNZhz" role="3clFbw">
+              <ref role="3cqZAo" node="5hSMZ_lNZgX" resolve="pattern" />
+            </node>
+            <node concept="9aQIb" id="5hSMZ_lNZh$" role="9aQIa">
+              <node concept="3clFbS" id="5hSMZ_lNZh_" role="9aQI4">
+                <node concept="3cpWs6" id="5hSMZ_lNZhA" role="3cqZAp">
+                  <node concept="10Nm6u" id="5hSMZ_lNZhB" role="3cqZAk">
+                    <node concept="1sPUBX" id="5hSMZ_lNZhC" role="lGtFl">
+                      <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1WS0z7" id="5hSMZ_lNZhD" role="lGtFl">
+          <ref role="2rW$FS" node="1L74NXG7ihq" resolve="typeFeature_method" />
+          <node concept="3JmXsc" id="5hSMZ_lNZhE" role="3Jn$fo">
+            <node concept="3clFbS" id="5hSMZ_lNZhF" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhG" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhH" role="3clFbG">
+                  <node concept="3Tsc0h" id="5hSMZ_lNZhI" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
+                  </node>
+                  <node concept="2OqwBi" id="5hSMZ_lNZhJ" role="2Oq$k0">
+                    <node concept="30H73N" id="5hSMZ_lNZhK" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="5hSMZ_lNZhL" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="17Uvod" id="5hSMZ_lNZhM" role="lGtFl">
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <property role="2qtEX9" value="name" />
+          <node concept="3zFVjK" id="5hSMZ_lNZhN" role="3zH0cK">
+            <node concept="3clFbS" id="5hSMZ_lNZhO" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhP" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhQ" role="3clFbG">
+                  <node concept="30H73N" id="5hSMZ_lNZhR" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5hSMZ_lNZhS" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5hSMZ_lNZhT" role="jymVt" />
+      <node concept="3clFb_" id="5hSMZ_lNZhU" role="jymVt">
+        <property role="TrG5h" value="typeTerm" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3uibUv" id="5hSMZ_lNZhV" role="3clF45">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+        </node>
+        <node concept="3Tm1VV" id="5hSMZ_lNZhW" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZhX" role="3clF47">
+          <node concept="3cpWs6" id="5hSMZ_lNZhY" role="3cqZAp">
+            <node concept="1oi1Uc" id="5hSMZ_lNZhZ" role="3cqZAk">
+              <node concept="1oi5UN" id="5hSMZ_lNZi0" role="1oi0x0">
+                <node concept="1oi5Wm" id="5hSMZ_lNZi1" role="1ojpOf">
+                  <property role="TrG5h" value="name" />
+                  <node concept="1WS0z7" id="5hSMZ_lNZi2" role="lGtFl">
+                    <node concept="3JmXsc" id="5hSMZ_lNZi3" role="3Jn$fo">
+                      <node concept="3clFbS" id="5hSMZ_lNZi4" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_lNZi5" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_lNZi6" role="3clFbG">
+                            <node concept="2OqwBi" id="5hSMZ_lNZi7" role="2Oq$k0">
+                              <node concept="30H73N" id="5hSMZ_lNZi8" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="5hSMZ_lNZi9" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="5hSMZ_lNZia" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:5UYwY$H7MGm" resolve="valueFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="22Ky0T" id="5hSMZ_lNZib" role="lGtFl">
+                    <node concept="2OqwBi" id="5hSMZ_lNZic" role="22Ky0K">
+                      <node concept="Xjq3P" id="5hSMZ_lNZid" role="2Oq$k0">
+                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_TermTable._Term" />
+                      </node>
+                      <node concept="liA8E" id="5hSMZ_lNZie" role="2OqNvi">
+                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                        <node concept="1ZhdrF" id="5hSMZ_lNZif" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                          <node concept="3$xsQk" id="5hSMZ_lNZig" role="3$ytzL">
+                            <node concept="3clFbS" id="5hSMZ_lNZih" role="2VODD2">
+                              <node concept="3clFbF" id="5hSMZ_lNZii" role="3cqZAp">
+                                <node concept="2OqwBi" id="5hSMZ_lNZij" role="3clFbG">
+                                  <node concept="1iwH7S" id="5hSMZ_lNZik" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="5hSMZ_lNZil" role="2OqNvi">
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
+                                    <node concept="30H73N" id="5hSMZ_lNZim" role="1iwH7V" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1oi5ST" id="5hSMZ_lNZin" role="1ojpOf">
+                  <property role="TrG5h" value="name" />
+                  <node concept="1WS0z7" id="5hSMZ_lNZio" role="lGtFl">
+                    <node concept="3JmXsc" id="5hSMZ_lNZip" role="3Jn$fo">
+                      <node concept="3clFbS" id="5hSMZ_lNZiq" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_lNZir" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_lNZis" role="3clFbG">
+                            <node concept="2OqwBi" id="5hSMZ_lNZit" role="2Oq$k0">
+                              <node concept="30H73N" id="5hSMZ_lNZiu" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="5hSMZ_lNZiv" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="5hSMZ_lNZiw" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:5UYwY$H7TrL" resolve="childFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="22Ky0T" id="5hSMZ_lNZix" role="lGtFl">
+                    <node concept="2OqwBi" id="5hSMZ_lNZiy" role="22Ky0K">
+                      <node concept="Xjq3P" id="5hSMZ_lNZiz" role="2Oq$k0">
+                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_TermTable._Term" />
+                      </node>
+                      <node concept="liA8E" id="5hSMZ_lNZi$" role="2OqNvi">
+                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                        <node concept="1ZhdrF" id="5hSMZ_lNZi_" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                          <node concept="3$xsQk" id="5hSMZ_lNZiA" role="3$ytzL">
+                            <node concept="3clFbS" id="5hSMZ_lNZiB" role="2VODD2">
+                              <node concept="3clFbF" id="5hSMZ_lNZiC" role="3cqZAp">
+                                <node concept="2OqwBi" id="5hSMZ_lNZiD" role="3clFbG">
+                                  <node concept="1iwH7S" id="5hSMZ_lNZiE" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="5hSMZ_lNZiF" role="2OqNvi">
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="typeFeature_method" />
+                                    <node concept="30H73N" id="5hSMZ_lNZiG" role="1iwH7V" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5hSMZ_lNZiH" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5hSMZ_lNZiI" role="1B3o_S" />
+      <node concept="raruj" id="5hSMZ_lNZiJ" role="lGtFl" />
+      <node concept="1WS0z7" id="5hSMZ_lNZiK" role="lGtFl">
+        <node concept="3JmXsc" id="5hSMZ_lNZiL" role="3Jn$fo">
+          <node concept="3clFbS" id="5hSMZ_lNZiM" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lNZiN" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lNZiO" role="3clFbG">
+                <node concept="30H73N" id="5hSMZ_lNZiP" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="5hSMZ_lNZiQ" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5hSMZ_lNwq$" resolve="termDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5hSMZ_lNZiR" role="1zkMxy">
+        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+      </node>
+      <node concept="17Uvod" id="5hSMZ_lNZiS" role="lGtFl">
+        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+        <property role="2qtEX9" value="name" />
+        <node concept="3zFVjK" id="5hSMZ_lNZiT" role="3zH0cK">
+          <node concept="3clFbS" id="5hSMZ_lNZiU" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lNZiV" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lNZiW" role="3clFbG">
+                <node concept="30H73N" id="5hSMZ_lNZiX" role="2Oq$k0" />
+                <node concept="2qgKlT" id="5hSMZ_lNZiY" role="2OqNvi">
+                  <ref role="37wK5l" to="x5bw:4MEOIDG83_h" resolve="runtimeClassName" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5hSMZ_lNYE7" role="jymVt" />
+    <node concept="2tJIrI" id="5hSMZ_lNYEa" role="jymVt" />
+    <node concept="3Tm1VV" id="5hSMZ_lNRS1" role="1B3o_S" />
+    <node concept="n94m4" id="5hSMZ_lNRS2" role="lGtFl">
+      <ref role="n9lRv" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+    </node>
+    <node concept="17Uvod" id="5hSMZ_lNWpY" role="lGtFl">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <property role="2qtEX9" value="name" />
+      <node concept="3zFVjK" id="5hSMZ_lNWpZ" role="3zH0cK">
+        <node concept="3clFbS" id="5hSMZ_lNWq0" role="2VODD2">
+          <node concept="3clFbF" id="5hSMZ_lNWyR" role="3cqZAp">
+            <node concept="2OqwBi" id="5hSMZ_lNWLe" role="3clFbG">
+              <node concept="30H73N" id="5hSMZ_lNWyQ" role="2Oq$k0" />
+              <node concept="2qgKlT" id="5hSMZ_lRIJf" role="2OqNvi">
+                <ref role="37wK5l" to="x5bw:5hSMZ_lRESV" resolve="runtimeClassName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 740678b9..e68eb4a7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -961,7 +961,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="1hX44vMEolo">
-    <property role="3GE5qa" value="type.code" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="13h7C2" to="wq2x:1hX44vMEjQg" resolve="GetterBlock" />
     <node concept="13hLZK" id="1hX44vMEolp" role="13h7CW">
       <node concept="3clFbS" id="1hX44vMEolq" role="2VODD2" />
@@ -1284,7 +1284,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="1L74NXEmHzJ">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
     <node concept="13hLZK" id="1L74NXEmHzK" role="13h7CW">
       <node concept="3clFbS" id="1L74NXEmHzL" role="2VODD2" />
@@ -1446,7 +1446,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="5UYwY$H7MGb">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
     <node concept="13i0hz" id="5UYwY$H7MGm" role="13h7CS">
       <property role="TrG5h" value="valueFeatures" />
@@ -1563,7 +1563,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="4MEOIDFxxVo">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
     <node concept="13hLZK" id="4MEOIDFxxVp" role="13h7CW">
       <node concept="3clFbS" id="4MEOIDFxxVq" role="2VODD2" />
@@ -1590,7 +1590,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="4MEOIDG83_6">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
     <node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
       <property role="TrG5h" value="runtimeClassName" />
@@ -1628,14 +1628,14 @@
                   <node concept="13iPFW" id="4MEOIDG8mMt" role="2Oq$k0" />
                   <node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
                     <node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
-                      <node concept="chp4Y" id="4MEOIDG8nri" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
+                      <node concept="chp4Y" id="5hSMZ_lRJAS" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="2qgKlT" id="4MEOIDG8nRC" role="2OqNvi">
-                  <ref role="37wK5l" node="4MEOIDG83X7" resolve="runtimeClassFqName" />
+                <node concept="2qgKlT" id="5hSMZ_lSmq8" role="2OqNvi">
+                  <ref role="37wK5l" node="5hSMZ_lRET5" resolve="runtimeClassFqName" />
                 </node>
               </node>
               <node concept="Xl_RD" id="4MEOIDG8oH1" role="3uHU7w">
@@ -1707,7 +1707,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="5hSMZ_ldW$B">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:5hSMZ_ldReM" resolve="TermArgumentList" />
     <node concept="13i0hz" id="5hSMZ_ldW$M" role="13h7CS">
       <property role="TrG5h" value="getArguments" />
@@ -1868,5 +1868,61 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="5hSMZ_lRESK">
+    <property role="3GE5qa" value="term" />
+    <ref role="13h7C2" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+    <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassName" />
+      <node concept="3Tm1VV" id="5hSMZ_lRESW" role="1B3o_S" />
+      <node concept="17QB3L" id="5hSMZ_lRESX" role="3clF45" />
+      <node concept="3clFbS" id="5hSMZ_lRESY" role="3clF47">
+        <node concept="3clFbF" id="5hSMZ_lRESZ" role="3cqZAp">
+          <node concept="3cpWs3" id="5hSMZ_lRET0" role="3clFbG">
+            <node concept="Xl_RD" id="5hSMZ_lRET1" role="3uHU7w">
+              <property role="Xl_RC" value="_TermTable" />
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_lRET2" role="3uHU7B">
+              <node concept="13iPFW" id="5hSMZ_lRET3" role="2Oq$k0" />
+              <node concept="3TrcHB" id="5hSMZ_lRET4" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="5hSMZ_lRET5" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassFqName" />
+      <node concept="3Tm1VV" id="5hSMZ_lRET6" role="1B3o_S" />
+      <node concept="17QB3L" id="5hSMZ_lRET7" role="3clF45" />
+      <node concept="3clFbS" id="5hSMZ_lRET8" role="3clF47">
+        <node concept="3clFbF" id="5hSMZ_lRET9" role="3cqZAp">
+          <node concept="3cpWs3" id="5hSMZ_lRETa" role="3clFbG">
+            <node concept="3cpWs3" id="5hSMZ_lRETb" role="3uHU7B">
+              <node concept="2OqwBi" id="5hSMZ_lRETc" role="3uHU7B">
+                <node concept="2OqwBi" id="5hSMZ_lRETd" role="2Oq$k0">
+                  <node concept="13iPFW" id="5hSMZ_lRETe" role="2Oq$k0" />
+                  <node concept="I4A8Y" id="5hSMZ_lRETf" role="2OqNvi" />
+                </node>
+                <node concept="LkI2h" id="5hSMZ_lRETg" role="2OqNvi" />
+              </node>
+              <node concept="Xl_RD" id="5hSMZ_lRETh" role="3uHU7w">
+                <property role="Xl_RC" value="!" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_lRETi" role="3uHU7w">
+              <node concept="13iPFW" id="5hSMZ_lRETj" role="2Oq$k0" />
+              <node concept="2qgKlT" id="5hSMZ_lRETk" role="2OqNvi">
+                <ref role="37wK5l" node="5hSMZ_lRESV" resolve="runtimeClassName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="5hSMZ_lRESL" role="13h7CW">
+      <node concept="3clFbS" id="5hSMZ_lRESM" role="2VODD2" />
+    </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 c7f6bb1a..8d0d1238 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -818,7 +818,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="1L74NXFMz8h">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
     <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:1L74NXFMz74" resolve="feature" />
@@ -937,7 +937,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="4MEOIDFxysn">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
     <node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
@@ -1004,7 +1004,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="5hSMZ_ldVhx">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="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" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 9404e18b..f1651cd8 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -2931,6 +2931,21 @@
             <property role="VOm3f" value="true" />
           </node>
           <node concept="l2Vlx" id="4MEOIDFttQA" role="2czzBx" />
+          <node concept="pkWqt" id="5hSMZ_lV63E" role="pqm2j">
+            <node concept="3clFbS" id="5hSMZ_lV63F" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lV6b0" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lVbvA" role="3clFbG">
+                  <node concept="2OqwBi" id="5hSMZ_lV6oJ" role="2Oq$k0">
+                    <node concept="pncrf" id="5hSMZ_lV6aZ" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="5hSMZ_lV6RV" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:4MEOIDFttPg" resolve="termDeclaration" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="5hSMZ_lVfjA" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="l2Vlx" id="4MEOIDFttPY" role="2iSdaV" />
       </node>
@@ -3041,7 +3056,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1pPth$m6bZM">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
     <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
       <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
@@ -3076,14 +3091,14 @@
     </node>
   </node>
   <node concept="24kQdi" id="1pPth$m6rC8">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
     <node concept="1xolST" id="2N2MQGCLx7i" role="2wV5jI">
       <property role="1xolSY" value="&lt;no feature&gt;" />
     </node>
   </node>
   <node concept="24kQdi" id="2N2MQGCKV7Q">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
     <node concept="3EZMnI" id="2N2MQGCKV7S" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlWf" role="3EZMnx">
@@ -3110,7 +3125,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2N2MQGCLx6w">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx6y" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlVQ" role="3EZMnx">
@@ -3133,7 +3148,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2N2MQGCLx6L">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx6N" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlW2" role="3EZMnx">
@@ -3156,7 +3171,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2N2MQGCLx72">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx74" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlW8" role="3EZMnx">
@@ -3404,7 +3419,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1hX44vMKXUu">
-    <property role="3GE5qa" value="type.code" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:1hX44vMEjQg" resolve="GetterBlock" />
     <node concept="3EZMnI" id="1hX44vMLUfw" role="2wV5jI">
       <node concept="3F0ifn" id="1hX44vMLHrt" role="3EZMnx">
@@ -4046,7 +4061,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1L74NXElXMi">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
     <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
       <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
@@ -4291,7 +4306,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1L74NXFMBU3">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
     <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
       <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
@@ -4758,7 +4773,7 @@
   </node>
   <node concept="3ICXOK" id="4hPXq9Jmel2">
     <property role="TrG5h" value="TypeTerm_addOverride" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
     <node concept="yp4Wq" id="4hPXq9Jmel3" role="lGtFl">
       <property role="yp4Ub" value="ext_1_RTransform" />
@@ -5724,7 +5739,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="4MEOIDFttNn">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
     <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
       <node concept="3F0ifn" id="4MEOIDFttNw" role="3EZMnx">
@@ -5759,7 +5774,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="4MEOIDFwTyh">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
     <node concept="3EZMnI" id="4MEOIDFwTyj" role="2wV5jI">
       <node concept="3F1sOY" id="4MEOIDFwTyq" role="3EZMnx">
@@ -5773,7 +5788,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="4MEOIDFxyqZ">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
     <node concept="3EZMnI" id="4MEOIDFxyr4" role="2wV5jI">
       <node concept="1iCGBv" id="4MEOIDFxyre" role="3EZMnx">
@@ -5790,7 +5805,7 @@
     </node>
   </node>
   <node concept="3p36aQ" id="4MEOIDFxyrS">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
   </node>
   <node concept="24kQdi" id="20Ay2VefOqG">
@@ -5885,7 +5900,7 @@
     </node>
   </node>
   <node concept="PKFIW" id="1CcQBrPqjQg">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="TypeFeature_final_name" />
     <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
     <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
@@ -5917,7 +5932,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="1CcQBrPqlWO">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="aqKnT" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
     <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
       <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
@@ -5972,7 +5987,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="1CcQBrPqIC4">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="TypeFeature_delete_final" />
     <ref role="1h_SK9" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
     <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
@@ -6376,7 +6391,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="5hSMZ_ldV91">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="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">
@@ -6420,7 +6435,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="5hSMZ_ldWzO">
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="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">
@@ -6435,5 +6450,53 @@
       <node concept="l2Vlx" id="5hSMZ_ldWzU" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="5hSMZ_lNwqC">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+    <node concept="3EZMnI" id="5hSMZ_lNwqE" role="2wV5jI">
+      <node concept="3EZMnI" id="5hSMZ_lNwqF" role="3EZMnx">
+        <node concept="VPM3Z" id="5hSMZ_lNwqG" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="PMmxH" id="5hSMZ_lNwqH" role="3EZMnx">
+          <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        </node>
+        <node concept="3F0A7n" id="5hSMZ_lNwqI" role="3EZMnx">
+          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        </node>
+        <node concept="3F0ifn" id="5hSMZ_lNwqJ" role="3EZMnx">
+          <property role="3F0ifm" value=" " />
+          <node concept="VPxyj" id="5hSMZ_lNwqK" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPM3Z" id="5hSMZ_lNwqL" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="pVoyu" id="5hSMZ_lNwqM" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="5hSMZ_lNwqN" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="5hSMZ_lNwqO" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="5hSMZ_lNwrb" role="3EZMnx">
+        <node concept="VPM3Z" id="5hSMZ_lNwrc" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F2HdR" id="5hSMZ_lNwrd" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:5hSMZ_lNwq$" resolve="termDeclaration" />
+          <node concept="pj6Ft" id="5hSMZ_lNwre" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="l2Vlx" id="5hSMZ_lNwrf" role="2czzBx" />
+        </node>
+        <node concept="l2Vlx" id="5hSMZ_lNwrg" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="5hSMZ_lNwrh" 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 5a842183..684faa4c 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -627,7 +627,7 @@
   </node>
   <node concept="1TIwiD" id="1pPth$m5o9D">
     <property role="TrG5h" value="TypeTermTemplate" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="EcuMT" value="1618328391714701929" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1pPth$m5oa9" role="1TKVEi">
@@ -639,7 +639,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oa5">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="TypeFeature" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
@@ -655,7 +655,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oa6">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="ListTypeFeature" />
     <property role="34LRSv" value="list" />
     <property role="EcuMT" value="1618328391714701958" />
@@ -668,7 +668,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oae">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="StringTypeFeature" />
     <property role="34LRSv" value="string" />
     <property role="EcuMT" value="1618328391714701966" />
@@ -688,7 +688,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oaG">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="ReferenceTypeFeature" />
     <property role="34LRSv" value="reference" />
     <property role="EcuMT" value="1618328391714701996" />
@@ -701,7 +701,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oaL">
-    <property role="3GE5qa" value="type.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="ChildTypeFeature" />
     <property role="34LRSv" value="child" />
     <property role="EcuMT" value="1618328391714702001" />
@@ -741,6 +741,7 @@
       <property role="20kJfa" value="termDeclaration" />
       <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <node concept="asaX9" id="5hSMZ_lNwsa" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -820,7 +821,7 @@
   </node>
   <node concept="1TIwiD" id="1hX44vMEjQg">
     <property role="EcuMT" value="1476354154047290768" />
-    <property role="3GE5qa" value="type.code" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="GetterBlock" />
     <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
   </node>
@@ -1080,7 +1081,7 @@
   </node>
   <node concept="1TIwiD" id="1L74NXElX0R">
     <property role="EcuMT" value="2037618519496446007" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TypeTerm" />
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="1L74NXEmI65" role="1TKVEi">
@@ -1163,7 +1164,7 @@
   </node>
   <node concept="1TIwiD" id="1L74NXFMz6j">
     <property role="EcuMT" value="2037618519520719251" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TypeFeatureOverride" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1L74NXFMBVS" role="1TKVEi">
@@ -1248,7 +1249,7 @@
   </node>
   <node concept="1TIwiD" id="4MEOIDFttoe">
     <property role="EcuMT" value="5524459797190399502" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TypeTermDeclaration" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="4MEOIDFttNi" role="1TKVEi">
@@ -1271,7 +1272,7 @@
   </node>
   <node concept="1TIwiD" id="4MEOIDFwTxW">
     <property role="EcuMT" value="5524459797191301244" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TypeTermDeclarationParameter" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="4MEOIDFwTy3" role="1TKVEi">
@@ -1293,7 +1294,7 @@
   </node>
   <node concept="1TIwiD" id="4MEOIDFxxDM">
     <property role="EcuMT" value="5524459797191465586" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TypeTermDeclarationParameterReference" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="4MEOIDFxxDY" role="1TKVEi">
@@ -1382,7 +1383,7 @@
   </node>
   <node concept="1TIwiD" id="5hSMZ_ldReM">
     <property role="EcuMT" value="6086839168128218034" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TermArgumentList" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5hSMZ_ldWzp" role="1TKVEi">
@@ -1395,7 +1396,7 @@
   </node>
   <node concept="1TIwiD" id="5hSMZ_ldReN">
     <property role="EcuMT" value="6086839168128218035" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TermParameterBinding" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5hSMZ_ldV8_" role="1TKVEi">
@@ -1413,5 +1414,23 @@
       <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
     </node>
   </node>
+  <node concept="1TIwiD" id="5hSMZ_lNwqz">
+    <property role="EcuMT" value="6086839168138086051" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="TermTable" />
+    <property role="19KtqR" value="true" />
+    <property role="34LRSv" value="term table" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="5hSMZ_lNwq$" role="1TKVEi">
+      <property role="IQ2ns" value="6086839168138086052" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="termDeclaration" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    </node>
+    <node concept="PrWs8" id="5hSMZ_lNwqA" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index d96c0663..d8bd047d 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -1401,7 +1401,7 @@
   </node>
   <node concept="1YbPZF" id="4MEOIDFzuUN">
     <property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
-    <property role="3GE5qa" value="type.term" />
+    <property role="3GE5qa" value="term" />
     <node concept="3clFbS" id="4MEOIDFzuUO" role="18ibNy">
       <node concept="1Z5TYs" id="4MEOIDFzv5A" role="3cqZAp">
         <node concept="mw_s8" id="4MEOIDFzv5S" role="1ZfhKB">