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 0e86544e..517dbda8 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
@@ -13,6 +13,8 @@
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -47,7 +49,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
-    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
@@ -8004,11 +8006,6 @@
       <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" />
@@ -8017,18 +8014,13 @@
     <node concept="2rT7sh" id="4MEOIDFGYa1" role="2rTMjI">
       <property role="TrG5h" value="typeTermParam_field" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
-      <ref role="2rTdP9" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+      <ref role="2rTdP9" to="wq2x:4MEOIDFwTxW" resolve="TermDeclarationParameter" />
     </node>
     <node concept="2rT7sh" id="7IysFeAiAcO" role="2rTMjI">
       <property role="TrG5h" value="typeDecl_typeNode_variable" />
       <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
       <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
     </node>
-    <node concept="2rT7sh" id="1L74NXG7ihq" role="2rTMjI">
-      <property role="TrG5h" value="typeFeature_method" />
-      <ref role="2rTdP9" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
-      <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-    </node>
     <node concept="2rT7sh" id="4JJCDIm$O$I" role="2rTMjI">
       <property role="TrG5h" value="typeDecl_template_constructor" />
       <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
@@ -8044,11 +8036,6 @@
       <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" />
@@ -8071,491 +8058,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="2N2MQGCQWR_" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
-      <node concept="14YyZ8" id="2N2MQGCQWYU" role="1lVwrX">
-        <node concept="14ZrTv" id="1hX44vMVw5i" role="14ZwWg">
-          <node concept="30G5F_" id="1hX44vMVw5j" role="150hEN">
-            <node concept="3clFbS" id="1hX44vMVw5k" role="2VODD2">
-              <node concept="3clFbF" id="1hX44vMVxjE" role="3cqZAp">
-                <node concept="2OqwBi" id="1hX44vMVyPI" role="3clFbG">
-                  <node concept="2OqwBi" id="1hX44vMVxwd" role="2Oq$k0">
-                    <node concept="30H73N" id="1hX44vMVxjD" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="1hX44vMVy48" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1hX44vMEjQe" resolve="getter" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="1hX44vMVzCA" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="1hX44vMVzOF" role="150oIE">
-            <node concept="2YIFZM" id="1hX44vMVzOG" role="gfFT$">
-              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-              <ref role="37wK5l" to="psr6:2N2MQGCMQsb" resolve="string" />
-              <node concept="Xl_RD" id="1hX44vMVzOH" role="37wK5m">
-                <property role="Xl_RC" value="" />
-                <node concept="17Uvod" id="1hX44vMVzOI" role="lGtFl">
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <property role="2qtEX9" value="value" />
-                  <node concept="3zFVjK" id="1hX44vMVzOJ" role="3zH0cK">
-                    <node concept="3clFbS" id="1hX44vMVzOK" role="2VODD2">
-                      <node concept="3clFbF" id="1hX44vMVzOL" role="3cqZAp">
-                        <node concept="2OqwBi" id="1hX44vMVzOM" role="3clFbG">
-                          <node concept="3TrcHB" id="1hX44vMVzON" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="1hX44vMVzOO" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="1hX44vMZ1fP" role="37wK5m">
-                <node concept="29HgVG" id="1hX44vMZ1GR" role="lGtFl">
-                  <node concept="3NFfHV" id="1hX44vMZ1GS" role="3NFExx">
-                    <node concept="3clFbS" id="1hX44vMZ1GT" role="2VODD2">
-                      <node concept="3clFbF" id="1hX44vMZ1GZ" role="3cqZAp">
-                        <node concept="2OqwBi" id="1hX44vMZ1GU" role="3clFbG">
-                          <node concept="3TrEf2" id="1hX44vMZ1GX" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1hX44vMEjQe" resolve="getter" />
-                          </node>
-                          <node concept="30H73N" id="1hX44vMZ1GY" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="2N2MQGCQWZ0" role="14ZwWg">
-          <node concept="30G5F_" id="2N2MQGCQWZ1" role="150hEN">
-            <node concept="3clFbS" id="2N2MQGCQWZ2" role="2VODD2">
-              <node concept="3clFbF" id="2N2MQGCQX40" role="3cqZAp">
-                <node concept="2OqwBi" id="2N2MQGCQXH$" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCQX9f" role="2Oq$k0">
-                    <node concept="30H73N" id="2N2MQGCQX3Z" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="2N2MQGCQXoL" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
-                    </node>
-                  </node>
-                  <node concept="17RvpY" id="2N2MQGCQYhy" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="2N2MQGCQYnw" role="150oIE">
-            <node concept="2YIFZM" id="2N2MQGCQYnx" role="gfFT$">
-              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-              <ref role="37wK5l" to="psr6:2N2MQGCMQsb" resolve="string" />
-              <node concept="Xl_RD" id="2N2MQGCQYny" role="37wK5m">
-                <property role="Xl_RC" value="" />
-                <node concept="17Uvod" id="2N2MQGCQYnz" role="lGtFl">
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <property role="2qtEX9" value="value" />
-                  <node concept="3zFVjK" id="2N2MQGCQYn$" role="3zH0cK">
-                    <node concept="3clFbS" id="2N2MQGCQYn_" role="2VODD2">
-                      <node concept="3clFbF" id="2N2MQGCQYnA" role="3cqZAp">
-                        <node concept="2OqwBi" id="2N2MQGCQYnB" role="3clFbG">
-                          <node concept="3TrcHB" id="2N2MQGCQYnC" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="2N2MQGCQYnD" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Xl_RD" id="2N2MQGCQYPj" role="37wK5m">
-                <property role="Xl_RC" value="" />
-                <node concept="17Uvod" id="2N2MQGCQYVB" role="lGtFl">
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <property role="2qtEX9" value="value" />
-                  <node concept="3zFVjK" id="2N2MQGCQYVE" role="3zH0cK">
-                    <node concept="3clFbS" id="2N2MQGCQYVF" role="2VODD2">
-                      <node concept="3clFbF" id="2N2MQGCQYVL" role="3cqZAp">
-                        <node concept="2OqwBi" id="2N2MQGCQYVG" role="3clFbG">
-                          <node concept="3TrcHB" id="2N2MQGCQYVJ" role="2OqNvi">
-                            <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
-                          </node>
-                          <node concept="30H73N" id="2N2MQGCQYVK" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="2N2MQGCQYz6" role="14YRTM">
-          <node concept="2YIFZM" id="2N2MQGCQYz7" role="gfFT$">
-            <ref role="37wK5l" to="psr6:1pPth$m7GkL" resolve="string" />
-            <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-            <node concept="Xl_RD" id="2N2MQGCQYz8" role="37wK5m">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="2N2MQGCQYz9" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="2N2MQGCQYza" role="3zH0cK">
-                  <node concept="3clFbS" id="2N2MQGCQYzb" role="2VODD2">
-                    <node concept="3clFbF" id="2N2MQGCQYzc" role="3cqZAp">
-                      <node concept="2OqwBi" id="2N2MQGCQYzd" role="3clFbG">
-                        <node concept="3TrcHB" id="2N2MQGCQYze" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                        <node concept="30H73N" id="2N2MQGCQYzf" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7IysFeB2V_d" role="30HLyM">
-        <node concept="3clFbS" id="7IysFeB2V_e" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeB2XmD" role="3cqZAp">
-            <node concept="3clFbT" id="7IysFeB2XmC" role="3clFbG">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="2N2MQGCQWJ6" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
-      <node concept="gft3U" id="2N2MQGCQWJu" role="1lVwrX">
-        <node concept="2YIFZM" id="2N2MQGCQZlW" role="gfFT$">
-          <ref role="37wK5l" to="psr6:1pPth$m7GoR" resolve="reference" />
-          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-          <node concept="Xl_RD" id="2N2MQGCQZlX" role="37wK5m">
-            <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="2N2MQGCQZlY" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="2N2MQGCQZlZ" role="3zH0cK">
-                <node concept="3clFbS" id="2N2MQGCQZm0" role="2VODD2">
-                  <node concept="3clFbF" id="2N2MQGCQZm1" role="3cqZAp">
-                    <node concept="2OqwBi" id="2N2MQGCQZm2" role="3clFbG">
-                      <node concept="3TrcHB" id="2N2MQGCQZm3" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                      <node concept="30H73N" id="2N2MQGCQZm4" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7IysFeB2Xxt" role="30HLyM">
-        <node concept="3clFbS" id="7IysFeB2Xxu" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeB2XNt" role="3cqZAp">
-            <node concept="3clFbT" id="7IysFeB2XNs" role="3clFbG">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="1hX44vNdZ5i" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
-      <node concept="14YyZ8" id="1hX44vNe031" role="1lVwrX">
-        <node concept="14ZrTv" id="1hX44vNe0ep" role="14ZwWg">
-          <node concept="30G5F_" id="1hX44vNe0eq" role="150hEN">
-            <node concept="3clFbS" id="1hX44vNe0er" role="2VODD2">
-              <node concept="3clFbF" id="1hX44vNe0ww" role="3cqZAp">
-                <node concept="2OqwBi" id="1hX44vNfjTq" role="3clFbG">
-                  <node concept="2OqwBi" id="1hX44vNfj2r" role="2Oq$k0">
-                    <node concept="30H73N" id="1hX44vNe0wv" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="1hX44vNfjsN" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:1hX44vNe1iN" resolve="getter" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="1hX44vNfkrW" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="1hX44vNfkBY" role="150oIE">
-            <node concept="2YIFZM" id="1hX44vNfkBZ" role="gfFT$">
-              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-              <ref role="37wK5l" to="psr6:1hX44vNdUS_" resolve="reference" />
-              <node concept="Xl_RD" id="1hX44vNfkC0" role="37wK5m">
-                <property role="Xl_RC" value="" />
-                <node concept="17Uvod" id="1hX44vNfkC1" role="lGtFl">
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <property role="2qtEX9" value="value" />
-                  <node concept="3zFVjK" id="1hX44vNfkC2" role="3zH0cK">
-                    <node concept="3clFbS" id="1hX44vNfkC3" role="2VODD2">
-                      <node concept="3clFbF" id="1hX44vNfkC4" role="3cqZAp">
-                        <node concept="2OqwBi" id="1hX44vNfkC5" role="3clFbG">
-                          <node concept="3TrcHB" id="1hX44vNfkC6" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="1hX44vNfkC7" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="1hX44vNfljv" role="37wK5m">
-                <node concept="29HgVG" id="1hX44vNfluU" role="lGtFl">
-                  <node concept="3NFfHV" id="1hX44vNfluV" role="3NFExx">
-                    <node concept="3clFbS" id="1hX44vNfluW" role="2VODD2">
-                      <node concept="3clFbF" id="1hX44vNflv2" role="3cqZAp">
-                        <node concept="2OqwBi" id="1hX44vNfluX" role="3clFbG">
-                          <node concept="3TrEf2" id="1hX44vNflv0" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1hX44vNe1iN" resolve="getter" />
-                          </node>
-                          <node concept="30H73N" id="1hX44vNflv1" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="1hX44vNdZ5j" role="14YRTM">
-          <node concept="2YIFZM" id="1hX44vNdZ5k" role="gfFT$">
-            <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-            <ref role="37wK5l" to="psr6:1pPth$m7GoR" resolve="reference" />
-            <node concept="Xl_RD" id="1hX44vNdZ5l" role="37wK5m">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="1hX44vNdZ5m" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="1hX44vNdZ5n" role="3zH0cK">
-                  <node concept="3clFbS" id="1hX44vNdZ5o" role="2VODD2">
-                    <node concept="3clFbF" id="1hX44vNdZ5p" role="3cqZAp">
-                      <node concept="2OqwBi" id="1hX44vNdZ5q" role="3clFbG">
-                        <node concept="3TrcHB" id="1hX44vNdZ5r" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                        <node concept="30H73N" id="1hX44vNdZ5s" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7IysFeB2XYh" role="30HLyM">
-        <node concept="3clFbS" id="7IysFeB2XYi" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeB2YnD" role="3cqZAp">
-            <node concept="3clFbT" id="7IysFeB2YnC" role="3clFbG">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="2N2MQGCQWJc" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
-      <node concept="gft3U" id="2N2MQGCQZsl" role="1lVwrX">
-        <node concept="2YIFZM" id="2N2MQGCQZyF" role="gfFT$">
-          <ref role="37wK5l" to="psr6:1pPth$m7GsZ" resolve="child" />
-          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-          <node concept="Xl_RD" id="2N2MQGCQZyG" role="37wK5m">
-            <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="2N2MQGCQZyH" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="2N2MQGCQZyI" role="3zH0cK">
-                <node concept="3clFbS" id="2N2MQGCQZyJ" role="2VODD2">
-                  <node concept="3clFbF" id="2N2MQGCQZyK" role="3cqZAp">
-                    <node concept="2OqwBi" id="2N2MQGCQZyL" role="3clFbG">
-                      <node concept="3TrcHB" id="2N2MQGCQZyM" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                      <node concept="30H73N" id="2N2MQGCQZyN" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7IysFeB2Yyt" role="30HLyM">
-        <node concept="3clFbS" id="7IysFeB2Yyu" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeB2YOt" role="3cqZAp">
-            <node concept="3clFbT" id="7IysFeB2YOs" role="3clFbG">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="2N2MQGCQWJk" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
-      <node concept="gft3U" id="2N2MQGCQZD4" role="1lVwrX">
-        <node concept="2YIFZM" id="2N2MQGCQZJq" role="gfFT$">
-          <ref role="37wK5l" to="psr6:1pPth$m7Gwi" resolve="list" />
-          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
-          <node concept="Xl_RD" id="2N2MQGCQZJr" role="37wK5m">
-            <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="2N2MQGCQZJs" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="2N2MQGCQZJt" role="3zH0cK">
-                <node concept="3clFbS" id="2N2MQGCQZJu" role="2VODD2">
-                  <node concept="3clFbF" id="2N2MQGCQZJv" role="3cqZAp">
-                    <node concept="2OqwBi" id="2N2MQGCQZJw" role="3clFbG">
-                      <node concept="3TrcHB" id="2N2MQGCQZJx" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                      <node concept="30H73N" id="2N2MQGCQZJy" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7IysFeB2YZh" role="30HLyM">
-        <node concept="3clFbS" id="7IysFeB2YZi" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeB2Zhh" role="3cqZAp">
-            <node concept="3clFbT" id="7IysFeB2Zhg" role="3clFbG">
-              <property role="3clFbU" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="1hX44vMYCXM" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1hX44vMEjQg" resolve="GetterBlock" />
-      <node concept="14YyZ8" id="7IysFeB8aNz" role="1lVwrX">
-        <node concept="14ZrTv" id="7IysFeB8bda" role="14ZwWg">
-          <node concept="30G5F_" id="7IysFeB8bdb" role="150hEN">
-            <node concept="3clFbS" id="7IysFeB8bdc" role="2VODD2">
-              <node concept="3clFbF" id="7IysFeB8bxS" role="3cqZAp">
-                <node concept="2OqwBi" id="7IysFeB8ctF" role="3clFbG">
-                  <node concept="2OqwBi" id="7IysFeB8bJ5" role="2Oq$k0">
-                    <node concept="30H73N" id="7IysFeB8bxR" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="7IysFeB8bXH" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeB8d8_" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7IysFeB8dnJ" role="150oIE">
-            <node concept="3clFb_" id="7IysFeB8dnK" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="7IysFeB8dnL" role="1B3o_S" />
-              <node concept="3uibUv" id="7IysFeB8dnM" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="7IysFeB8dnN" role="3clF47">
-                <node concept="3clFbF" id="7IysFeB8dnO" role="3cqZAp">
-                  <node concept="10Nm6u" id="7IysFeB8dnP" role="3clFbG">
-                    <node concept="raruj" id="7IysFeB9Joa" role="lGtFl" />
-                    <node concept="29HgVG" id="7IysFeB9Jor" role="lGtFl">
-                      <node concept="3NFfHV" id="7IysFeB9JoG" role="3NFExx">
-                        <node concept="3clFbS" id="7IysFeB9JoH" role="2VODD2">
-                          <node concept="3clFbF" id="7IysFeB9Jsf" role="3cqZAp">
-                            <node concept="2OqwBi" id="7IysFeB9Nvb" role="3clFbG">
-                              <node concept="1PxgMI" id="7IysFeB9MVU" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="2OqwBi" id="7IysFeB9KvQ" role="1m5AlR">
-                                  <node concept="2OqwBi" id="7IysFeB9J_H" role="2Oq$k0">
-                                    <node concept="30H73N" id="7IysFeB9Jse" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="7IysFeB9K9L" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="2qgKlT" id="7IysFeB9L76" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
-                                  </node>
-                                </node>
-                                <node concept="chp4Y" id="6fXjIfxgnfS" role="3oSUPX">
-                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7IysFeB9NSM" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="1hX44vMYEji" role="14YRTM">
-          <node concept="2OqwBi" id="7IysFeAYfY1" role="gfFT$">
-            <node concept="2ShNRf" id="1hX44vMYEjz" role="2Oq$k0">
-              <node concept="YeOm9" id="1hX44vMYELt" role="2ShVmc">
-                <node concept="1Y3b0j" id="1hX44vMYELw" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <node concept="3Tm1VV" id="1hX44vMYELx" role="1B3o_S" />
-                  <node concept="3clFb_" id="1hX44vMYELy" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="get" />
-                    <node concept="17QB3L" id="1hX44vMYJsd" role="3clF45" />
-                    <node concept="3Tm1VV" id="1hX44vMYELA" role="1B3o_S" />
-                    <node concept="3clFbS" id="1hX44vMYELC" role="3clF47">
-                      <node concept="3clFbF" id="1hX44vMYJxT" role="3cqZAp">
-                        <node concept="10Nm6u" id="1hX44vMYJxS" role="3clFbG" />
-                        <node concept="2b32R4" id="1hX44vMYJyq" role="lGtFl">
-                          <node concept="3JmXsc" id="1hX44vMYJyt" role="2P8S$">
-                            <node concept="3clFbS" id="1hX44vMYJyu" role="2VODD2">
-                              <node concept="3clFbF" id="1hX44vMYJLI" role="3cqZAp">
-                                <node concept="2OqwBi" id="1hX44vMYKZV" role="3clFbG">
-                                  <node concept="2OqwBi" id="1hX44vMYJXV" role="2Oq$k0">
-                                    <node concept="30H73N" id="1hX44vMYJLH" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="1hX44vMYKbq" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="1hX44vMYLpO" role="2OqNvi">
-                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="1hX44vMYKxT" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="17QB3L" id="1hX44vMYJor" role="2Ghqu4" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="7IysFeAYgXz" role="2OqNvi">
-              <ref role="37wK5l" node="1hX44vMYELy" resolve="get" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="7IysFeAYduU" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
       <node concept="14YyZ8" id="7IysFeB5sdu" role="1lVwrX">
@@ -8945,59 +8447,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4MEOIDFGMIC" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
-      <node concept="1Koe21" id="4MEOIDFGMID" role="1lVwrX">
-        <node concept="312cEu" id="4MEOIDFGMIE" role="1Koe22">
-          <property role="TrG5h" value="Context" />
-          <node concept="312cEg" id="4MEOIDFGMIF" role="jymVt">
-            <property role="TrG5h" value="field" />
-            <node concept="3Tm6S6" id="4MEOIDFGMIG" role="1B3o_S" />
-            <node concept="3uibUv" id="4MEOIDFGMIH" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="3clFb_" id="4MEOIDFGMII" role="jymVt">
-            <property role="TrG5h" value="context" />
-            <node concept="3uibUv" id="4MEOIDFGMIJ" role="3clF45">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-            <node concept="3Tm6S6" id="4MEOIDFGMIK" role="1B3o_S" />
-            <node concept="3clFbS" id="4MEOIDFGMIL" role="3clF47">
-              <node concept="3clFbF" id="4MEOIDFGMIM" role="3cqZAp">
-                <node concept="37vLTw" id="4MEOIDFGMIN" role="3clFbG">
-                  <ref role="3cqZAo" node="4MEOIDFGMIF" resolve="field" />
-                  <node concept="raruj" id="4MEOIDFGMIO" role="lGtFl" />
-                  <node concept="1ZhdrF" id="4MEOIDFGMIP" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="4MEOIDFGMIQ" role="3$ytzL">
-                      <node concept="3clFbS" id="4MEOIDFGMIR" role="2VODD2">
-                        <node concept="3clFbF" id="4MEOIDFGMIS" role="3cqZAp">
-                          <node concept="2OqwBi" id="4MEOIDFGMIT" role="3clFbG">
-                            <node concept="1iwH7S" id="4MEOIDFGMIU" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4MEOIDFGMIV" role="2OqNvi">
-                              <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
-                              <node concept="2OqwBi" id="4MEOIDFGMIW" role="1iwH7V">
-                                <node concept="30H73N" id="4MEOIDFGMIX" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="4MEOIDFGMIY" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="4MEOIDFGMIZ" role="1B3o_S" />
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="10IUAVUq92w" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
       <node concept="1Koe21" id="10IUAVUqcHp" role="1lVwrX">
@@ -9698,578 +9147,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
-      <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="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <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="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="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="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="5hSMZ_ljA5X" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
-                            <property role="TrG5h" value="feature" />
-                            <node concept="3uibUv" id="5hSMZ_ljA5Z" role="3clF45">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                            </node>
-                            <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="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="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>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <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="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="5hSMZ_ljA6m" role="2OqNvi">
-                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <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>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <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="5hSMZ_ljA6w" role="lGtFl">
-                            <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
-                            <property role="2qtEX9" value="fqClassName" />
-                            <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="5hSMZ_ljA6C" role="2OqNvi">
-                                      <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="5hSMZ_ljA6D" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <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="5hSMZ_ljToM" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
-                      </node>
-                    </node>
-                    <node concept="3GX2aA" id="5hSMZ_ljToN" role="2OqNvi" />
-                  </node>
-                  <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="5hSMZ_ljToS" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <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="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="5hSMZ_lfXwl" role="1L3L4I">
-                          <property role="3clFbU" value="false" />
-                        </node>
-                        <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="5hSMZ_lgwWL" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
-                                      </node>
-                                    </node>
-                                    <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="5hSMZ_lfXwB" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:5hSMZ_ldV8_" resolve="code" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="Rh6nW" id="5hSMZ_lfXwC" role="1bW2Oz">
-                                          <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="5hSMZ_lfXwD" role="1tU5fm" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFb_" id="5hSMZ_lfXwE" role="3MN40a">
-                          <property role="TrG5h" value="feature" />
-                          <node concept="3uibUv" id="5hSMZ_lfXwF" role="3clF45">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                          </node>
-                          <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="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="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>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <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="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="5hSMZ_lfXx2" role="2OqNvi">
-                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <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>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <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="5hSMZ_lfXxc" role="lGtFl">
-                          <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
-                          <property role="2qtEX9" value="fqClassName" />
-                          <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="5hSMZ_lfXxm" role="2OqNvi">
-                                    <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="5hSMZ_lfXxn" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <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="5hSMZ_ljOwF" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
-                      </node>
-                    </node>
-                    <node concept="3GX2aA" id="5hSMZ_ljOwG" role="2OqNvi" />
-                  </node>
-                  <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="1v1jN8" id="5hSMZ_ljPYJ" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <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 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 concept="Rh6nW" id="5hSMZ_ljQi_" role="1bW2Oz">
-                                      <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="5hSMZ_ljQiA" role="1tU5fm" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </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="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="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="5hSMZ_ljTTY" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <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="2qgKlT" id="5hSMZ_ljTU8" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                            </node>
-                          </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>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="2N2MQGCMHqo">
     <property role="TrG5h" value="_TypeTable" />
@@ -17468,10 +16345,10 @@
     </node>
   </node>
   <node concept="jVnub" id="1L74NXFa1BL">
-    <property role="3GE5qa" value="type" />
-    <property role="TrG5h" value="type_term" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="term" />
     <node concept="3aamgX" id="1L74NXFa1BM" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
       <node concept="gft3U" id="1L74NXFa1BN" role="1lVwrX">
         <node concept="1oi5Wm" id="1L74NXFa1BO" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17515,7 +16392,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1L74NXFa1C6" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
       <node concept="gft3U" id="1L74NXFa1C7" role="1lVwrX">
         <node concept="1oi5Wm" id="1L74NXFa1C8" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17559,7 +16436,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="2L20jGt8bfk" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
       <node concept="gft3U" id="2L20jGt8bfl" role="1lVwrX">
         <node concept="1oi5ST" id="2L20jGt8bPy" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17603,7 +16480,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1L74NXFa1Cq" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
       <node concept="gft3U" id="1L74NXFa1Cr" role="1lVwrX">
         <node concept="1oi5ST" id="1L74NXFa1Cs" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17650,7 +16527,7 @@
     </node>
     <node concept="3aamgX" id="1L74NXFa2MM" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5o9D" resolve="TermTemplate" />
       <node concept="gft3U" id="1L74NXFa38G" role="1lVwrX">
         <node concept="1oi1Uc" id="1L74NXFa38H" role="gfFT$">
           <node concept="1oi5UN" id="1L74NXFa38I" role="1oi0x0">
@@ -17678,7 +16555,7 @@
                                     </node>
                                     <node concept="1mIQ4w" id="1L74NXFa40N" role="2OqNvi">
                                       <node concept="chp4Y" id="1L74NXFa40O" role="cj9EA">
-                                        <ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+                                        <ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
                                       </node>
                                     </node>
                                   </node>
@@ -17688,7 +16565,7 @@
                                     </node>
                                     <node concept="1mIQ4w" id="1L74NXFa40R" role="2OqNvi">
                                       <node concept="chp4Y" id="1L74NXFa40S" role="cj9EA">
-                                        <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+                                        <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
                                       </node>
                                     </node>
                                   </node>
@@ -17707,7 +16584,7 @@
                 </node>
               </node>
               <node concept="1sPUBX" id="1L74NXFa4GS" role="lGtFl">
-                <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+                <ref role="v9R2y" node="1L74NXFa1BL" resolve="term" />
               </node>
             </node>
             <node concept="1oi5ST" id="1L74NXFa397" role="1ojpOf">
@@ -17733,7 +16610,7 @@
                                   </node>
                                   <node concept="1mIQ4w" id="1L74NXFa5kT" role="2OqNvi">
                                     <node concept="chp4Y" id="1L74NXFa5kU" role="cj9EA">
-                                      <ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+                                      <ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
                                     </node>
                                   </node>
                                 </node>
@@ -17751,7 +16628,7 @@
                 </node>
               </node>
               <node concept="1sPUBX" id="1L74NXFa5M0" role="lGtFl">
-                <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+                <ref role="v9R2y" node="1L74NXFa1BL" resolve="term" />
               </node>
             </node>
           </node>
@@ -17766,8 +16643,8 @@
     </node>
   </node>
   <node concept="jVnub" id="1L74NXGmvsM">
-    <property role="3GE5qa" value="type" />
-    <property role="TrG5h" value="type_term_feature_override" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="term_feature_override" />
     <node concept="1N15co" id="1L74NXGmwe4" role="1s_3oS">
       <property role="TrG5h" value="getter" />
       <node concept="3Tqbb2" id="1L74NXGmwfS" role="1N15GL">
@@ -17775,7 +16652,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1L74NXGmvsN" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
       <node concept="gft3U" id="1L74NXGmvsO" role="1lVwrX">
         <node concept="1oi5Wm" id="1L74NXGmvsP" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17816,7 +16693,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1L74NXGmvt7" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
       <node concept="gft3U" id="1L74NXGmvt8" role="1lVwrX">
         <node concept="1oi5Wm" id="1L74NXGmvt9" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17857,7 +16734,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="5YVpdheuZhj" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
       <node concept="gft3U" id="5YVpdheuZhk" role="1lVwrX">
         <node concept="1oi5ST" id="5YVpdheuZhl" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -17898,7 +16775,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1L74NXGmvtr" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
       <node concept="gft3U" id="1L74NXGmvts" role="1lVwrX">
         <node concept="1oi5ST" id="1L74NXGmvtt" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20041,16 +18918,16 @@
     </node>
   </node>
   <node concept="jVnub" id="1L74NXFaLHB">
-    <property role="3GE5qa" value="type" />
-    <property role="TrG5h" value="type_term_pattern" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="term_pattern" />
     <node concept="3aamgX" id="1L74NXFaLHC" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
       <node concept="gft3U" id="1L74NXFaLHD" role="1lVwrX">
         <node concept="1oi5Wm" id="1L74NXFaLHE" role="gfFT$">
           <property role="TrG5h" value="name" />
           <node concept="1sPUBX" id="1L74NXFBo_k" role="lGtFl">
-            <ref role="v9R2y" node="1L74NXFa1BL" resolve="type_term" />
+            <ref role="v9R2y" node="1L74NXFa1BL" resolve="term" />
           </node>
         </node>
       </node>
@@ -20070,16 +18947,16 @@
     <node concept="gft3U" id="1CcQBrPQb9v" role="jxRDz">
       <node concept="10Nm6u" id="1CcQBrPQd_n" role="gfFT$">
         <node concept="1sPUBX" id="1CcQBrPQd_o" role="lGtFl">
-          <ref role="v9R2y" node="1CcQBrPQape" resolve="type_term_pattern_feature" />
+          <ref role="v9R2y" node="1CcQBrPQape" resolve="term_pattern_feature" />
         </node>
       </node>
     </node>
   </node>
   <node concept="jVnub" id="1CcQBrPQape">
-    <property role="3GE5qa" value="type" />
-    <property role="TrG5h" value="type_term_pattern_feature" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="term_pattern_feature" />
     <node concept="3aamgX" id="1CcQBrPQapf" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
       <node concept="gft3U" id="1CcQBrPQapg" role="1lVwrX">
         <node concept="1oi5Wm" id="1CcQBrPQaph" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20104,7 +18981,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1CcQBrPQapq" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
       <node concept="gft3U" id="1CcQBrPQapr" role="1lVwrX">
         <node concept="1oi5Wm" id="1CcQBrPQaps" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20129,7 +19006,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1CcQBrPQap_" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
       <node concept="gft3U" id="1CcQBrPQapA" role="1lVwrX">
         <node concept="1oi5ST" id="1CcQBrPQapB" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20154,7 +19031,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1CcQBrPQapK" role="3aUrZf">
-      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
       <node concept="gft3U" id="1CcQBrPQapL" role="1lVwrX">
         <node concept="1oi5ST" id="1CcQBrPQapM" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20189,6 +19066,7 @@
   </node>
   <node concept="312cEu" id="5hSMZ_lNRS0">
     <property role="TrG5h" value="_TermTable" />
+    <property role="3GE5qa" value="term" />
     <node concept="2tJIrI" id="5hSMZ_lNYE5" role="jymVt" />
     <node concept="312cEu" id="5hSMZ_lNZg9" role="jymVt">
       <property role="2bfB8j" value="false" />
@@ -20366,7 +19244,7 @@
               <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" />
+                    <ref role="v9R2y" node="1L74NXFaLHB" resolve="term_pattern" />
                   </node>
                 </node>
               </node>
@@ -20380,7 +19258,7 @@
                 <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" />
+                      <ref role="v9R2y" node="1L74NXFa1BL" resolve="term" />
                     </node>
                   </node>
                 </node>
@@ -20389,7 +19267,7 @@
           </node>
         </node>
         <node concept="1WS0z7" id="5hSMZ_lNZhD" role="lGtFl">
-          <ref role="2rW$FS" node="1L74NXG7ihq" resolve="typeFeature_method" />
+          <ref role="2rW$FS" node="1L74NXG7ihq" resolve="termFeature_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">
@@ -20474,7 +19352,7 @@
                                 <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" />
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="termFeature_method" />
                                     <node concept="30H73N" id="5hSMZ_lNZim" role="1iwH7V" />
                                   </node>
                                 </node>
@@ -20523,7 +19401,7 @@
                                 <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" />
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="termFeature_method" />
                                     <node concept="30H73N" id="5hSMZ_lNZiG" role="1iwH7V" />
                                   </node>
                                 </node>
@@ -20602,5 +19480,1134 @@
       </node>
     </node>
   </node>
+  <node concept="bUwia" id="4bWqD4BQZ6v">
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="term" />
+    <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="1L74NXG7ihq" role="2rTMjI">
+      <property role="TrG5h" value="termFeature_method" />
+      <ref role="2rTdP9" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
+      <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
+    </node>
+    <node concept="3lhOvk" id="5hSMZ_lNwt5" role="3lj3bC">
+      <ref role="30HIoZ" to="wq2x:5hSMZ_lNwqz" resolve="TermTable" />
+      <ref role="3lhOvi" node="5hSMZ_lNRS0" resolve="_TermTable" />
+      <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="termtable_class" />
+    </node>
+    <node concept="3aamgX" id="2N2MQGCQWR_" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
+      <node concept="14YyZ8" id="2N2MQGCQWYU" role="1lVwrX">
+        <node concept="14ZrTv" id="1hX44vMVw5i" role="14ZwWg">
+          <node concept="30G5F_" id="1hX44vMVw5j" role="150hEN">
+            <node concept="3clFbS" id="1hX44vMVw5k" role="2VODD2">
+              <node concept="3clFbF" id="1hX44vMVxjE" role="3cqZAp">
+                <node concept="2OqwBi" id="1hX44vMVyPI" role="3clFbG">
+                  <node concept="2OqwBi" id="1hX44vMVxwd" role="2Oq$k0">
+                    <node concept="30H73N" id="1hX44vMVxjD" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="1hX44vMVy48" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:1hX44vMEjQe" resolve="getter" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="1hX44vMVzCA" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="1hX44vMVzOF" role="150oIE">
+            <node concept="2YIFZM" id="1hX44vMVzOG" role="gfFT$">
+              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+              <ref role="37wK5l" to="psr6:2N2MQGCMQsb" resolve="string" />
+              <node concept="Xl_RD" id="1hX44vMVzOH" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="1hX44vMVzOI" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="1hX44vMVzOJ" role="3zH0cK">
+                    <node concept="3clFbS" id="1hX44vMVzOK" role="2VODD2">
+                      <node concept="3clFbF" id="1hX44vMVzOL" role="3cqZAp">
+                        <node concept="2OqwBi" id="1hX44vMVzOM" role="3clFbG">
+                          <node concept="3TrcHB" id="1hX44vMVzON" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="1hX44vMVzOO" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="10Nm6u" id="1hX44vMZ1fP" role="37wK5m">
+                <node concept="29HgVG" id="1hX44vMZ1GR" role="lGtFl">
+                  <node concept="3NFfHV" id="1hX44vMZ1GS" role="3NFExx">
+                    <node concept="3clFbS" id="1hX44vMZ1GT" role="2VODD2">
+                      <node concept="3clFbF" id="1hX44vMZ1GZ" role="3cqZAp">
+                        <node concept="2OqwBi" id="1hX44vMZ1GU" role="3clFbG">
+                          <node concept="3TrEf2" id="1hX44vMZ1GX" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:1hX44vMEjQe" resolve="getter" />
+                          </node>
+                          <node concept="30H73N" id="1hX44vMZ1GY" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="2N2MQGCQWZ0" role="14ZwWg">
+          <node concept="30G5F_" id="2N2MQGCQWZ1" role="150hEN">
+            <node concept="3clFbS" id="2N2MQGCQWZ2" role="2VODD2">
+              <node concept="3clFbF" id="2N2MQGCQX40" role="3cqZAp">
+                <node concept="2OqwBi" id="2N2MQGCQXH$" role="3clFbG">
+                  <node concept="2OqwBi" id="2N2MQGCQX9f" role="2Oq$k0">
+                    <node concept="30H73N" id="2N2MQGCQX3Z" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="2N2MQGCQXoL" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
+                    </node>
+                  </node>
+                  <node concept="17RvpY" id="2N2MQGCQYhy" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="2N2MQGCQYnw" role="150oIE">
+            <node concept="2YIFZM" id="2N2MQGCQYnx" role="gfFT$">
+              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+              <ref role="37wK5l" to="psr6:2N2MQGCMQsb" resolve="string" />
+              <node concept="Xl_RD" id="2N2MQGCQYny" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="2N2MQGCQYnz" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="2N2MQGCQYn$" role="3zH0cK">
+                    <node concept="3clFbS" id="2N2MQGCQYn_" role="2VODD2">
+                      <node concept="3clFbF" id="2N2MQGCQYnA" role="3cqZAp">
+                        <node concept="2OqwBi" id="2N2MQGCQYnB" role="3clFbG">
+                          <node concept="3TrcHB" id="2N2MQGCQYnC" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="2N2MQGCQYnD" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Xl_RD" id="2N2MQGCQYPj" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="2N2MQGCQYVB" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="2N2MQGCQYVE" role="3zH0cK">
+                    <node concept="3clFbS" id="2N2MQGCQYVF" role="2VODD2">
+                      <node concept="3clFbF" id="2N2MQGCQYVL" role="3cqZAp">
+                        <node concept="2OqwBi" id="2N2MQGCQYVG" role="3clFbG">
+                          <node concept="3TrcHB" id="2N2MQGCQYVJ" role="2OqNvi">
+                            <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
+                          </node>
+                          <node concept="30H73N" id="2N2MQGCQYVK" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="2N2MQGCQYz6" role="14YRTM">
+          <node concept="2YIFZM" id="2N2MQGCQYz7" role="gfFT$">
+            <ref role="37wK5l" to="psr6:1pPth$m7GkL" resolve="string" />
+            <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+            <node concept="Xl_RD" id="2N2MQGCQYz8" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="2N2MQGCQYz9" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="2N2MQGCQYza" role="3zH0cK">
+                  <node concept="3clFbS" id="2N2MQGCQYzb" role="2VODD2">
+                    <node concept="3clFbF" id="2N2MQGCQYzc" role="3cqZAp">
+                      <node concept="2OqwBi" id="2N2MQGCQYzd" role="3clFbG">
+                        <node concept="3TrcHB" id="2N2MQGCQYze" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="30H73N" id="2N2MQGCQYzf" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7IysFeB2V_d" role="30HLyM">
+        <node concept="3clFbS" id="7IysFeB2V_e" role="2VODD2">
+          <node concept="3clFbF" id="7IysFeB2XmD" role="3cqZAp">
+            <node concept="3clFbT" id="7IysFeB2XmC" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2N2MQGCQWJ6" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
+      <node concept="gft3U" id="2N2MQGCQWJu" role="1lVwrX">
+        <node concept="2YIFZM" id="2N2MQGCQZlW" role="gfFT$">
+          <ref role="37wK5l" to="psr6:1pPth$m7GoR" resolve="reference" />
+          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+          <node concept="Xl_RD" id="2N2MQGCQZlX" role="37wK5m">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="2N2MQGCQZlY" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="2N2MQGCQZlZ" role="3zH0cK">
+                <node concept="3clFbS" id="2N2MQGCQZm0" role="2VODD2">
+                  <node concept="3clFbF" id="2N2MQGCQZm1" role="3cqZAp">
+                    <node concept="2OqwBi" id="2N2MQGCQZm2" role="3clFbG">
+                      <node concept="3TrcHB" id="2N2MQGCQZm3" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                      <node concept="30H73N" id="2N2MQGCQZm4" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7IysFeB2Xxt" role="30HLyM">
+        <node concept="3clFbS" id="7IysFeB2Xxu" role="2VODD2">
+          <node concept="3clFbF" id="7IysFeB2XNt" role="3cqZAp">
+            <node concept="3clFbT" id="7IysFeB2XNs" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1hX44vNdZ5i" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
+      <node concept="14YyZ8" id="1hX44vNe031" role="1lVwrX">
+        <node concept="14ZrTv" id="1hX44vNe0ep" role="14ZwWg">
+          <node concept="30G5F_" id="1hX44vNe0eq" role="150hEN">
+            <node concept="3clFbS" id="1hX44vNe0er" role="2VODD2">
+              <node concept="3clFbF" id="1hX44vNe0ww" role="3cqZAp">
+                <node concept="2OqwBi" id="1hX44vNfjTq" role="3clFbG">
+                  <node concept="2OqwBi" id="1hX44vNfj2r" role="2Oq$k0">
+                    <node concept="30H73N" id="1hX44vNe0wv" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="1hX44vNfjsN" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:1hX44vNe1iN" resolve="getter" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="1hX44vNfkrW" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="1hX44vNfkBY" role="150oIE">
+            <node concept="2YIFZM" id="1hX44vNfkBZ" role="gfFT$">
+              <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+              <ref role="37wK5l" to="psr6:1hX44vNdUS_" resolve="reference" />
+              <node concept="Xl_RD" id="1hX44vNfkC0" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="1hX44vNfkC1" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="1hX44vNfkC2" role="3zH0cK">
+                    <node concept="3clFbS" id="1hX44vNfkC3" role="2VODD2">
+                      <node concept="3clFbF" id="1hX44vNfkC4" role="3cqZAp">
+                        <node concept="2OqwBi" id="1hX44vNfkC5" role="3clFbG">
+                          <node concept="3TrcHB" id="1hX44vNfkC6" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="1hX44vNfkC7" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="10Nm6u" id="1hX44vNfljv" role="37wK5m">
+                <node concept="29HgVG" id="1hX44vNfluU" role="lGtFl">
+                  <node concept="3NFfHV" id="1hX44vNfluV" role="3NFExx">
+                    <node concept="3clFbS" id="1hX44vNfluW" role="2VODD2">
+                      <node concept="3clFbF" id="1hX44vNflv2" role="3cqZAp">
+                        <node concept="2OqwBi" id="1hX44vNfluX" role="3clFbG">
+                          <node concept="3TrEf2" id="1hX44vNflv0" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:1hX44vNe1iN" resolve="getter" />
+                          </node>
+                          <node concept="30H73N" id="1hX44vNflv1" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="1hX44vNdZ5j" role="14YRTM">
+          <node concept="2YIFZM" id="1hX44vNdZ5k" role="gfFT$">
+            <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+            <ref role="37wK5l" to="psr6:1pPth$m7GoR" resolve="reference" />
+            <node concept="Xl_RD" id="1hX44vNdZ5l" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="1hX44vNdZ5m" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="1hX44vNdZ5n" role="3zH0cK">
+                  <node concept="3clFbS" id="1hX44vNdZ5o" role="2VODD2">
+                    <node concept="3clFbF" id="1hX44vNdZ5p" role="3cqZAp">
+                      <node concept="2OqwBi" id="1hX44vNdZ5q" role="3clFbG">
+                        <node concept="3TrcHB" id="1hX44vNdZ5r" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="30H73N" id="1hX44vNdZ5s" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7IysFeB2XYh" role="30HLyM">
+        <node concept="3clFbS" id="7IysFeB2XYi" role="2VODD2">
+          <node concept="3clFbF" id="7IysFeB2YnD" role="3cqZAp">
+            <node concept="3clFbT" id="7IysFeB2YnC" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2N2MQGCQWJc" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
+      <node concept="gft3U" id="2N2MQGCQZsl" role="1lVwrX">
+        <node concept="2YIFZM" id="2N2MQGCQZyF" role="gfFT$">
+          <ref role="37wK5l" to="psr6:1pPth$m7GsZ" resolve="child" />
+          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+          <node concept="Xl_RD" id="2N2MQGCQZyG" role="37wK5m">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="2N2MQGCQZyH" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="2N2MQGCQZyI" role="3zH0cK">
+                <node concept="3clFbS" id="2N2MQGCQZyJ" role="2VODD2">
+                  <node concept="3clFbF" id="2N2MQGCQZyK" role="3cqZAp">
+                    <node concept="2OqwBi" id="2N2MQGCQZyL" role="3clFbG">
+                      <node concept="3TrcHB" id="2N2MQGCQZyM" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                      <node concept="30H73N" id="2N2MQGCQZyN" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7IysFeB2Yyt" role="30HLyM">
+        <node concept="3clFbS" id="7IysFeB2Yyu" role="2VODD2">
+          <node concept="3clFbF" id="7IysFeB2YOt" role="3cqZAp">
+            <node concept="3clFbT" id="7IysFeB2YOs" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="2N2MQGCQWJk" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
+      <node concept="gft3U" id="2N2MQGCQZD4" role="1lVwrX">
+        <node concept="2YIFZM" id="2N2MQGCQZJq" role="gfFT$">
+          <ref role="37wK5l" to="psr6:1pPth$m7Gwi" resolve="list" />
+          <ref role="1Pybhc" to="psr6:1pPth$m7FLs" resolve="TypeFeature" />
+          <node concept="Xl_RD" id="2N2MQGCQZJr" role="37wK5m">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="2N2MQGCQZJs" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="2N2MQGCQZJt" role="3zH0cK">
+                <node concept="3clFbS" id="2N2MQGCQZJu" role="2VODD2">
+                  <node concept="3clFbF" id="2N2MQGCQZJv" role="3cqZAp">
+                    <node concept="2OqwBi" id="2N2MQGCQZJw" role="3clFbG">
+                      <node concept="3TrcHB" id="2N2MQGCQZJx" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                      <node concept="30H73N" id="2N2MQGCQZJy" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="7IysFeB2YZh" role="30HLyM">
+        <node concept="3clFbS" id="7IysFeB2YZi" role="2VODD2">
+          <node concept="3clFbF" id="7IysFeB2Zhh" role="3cqZAp">
+            <node concept="3clFbT" id="7IysFeB2Zhg" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1hX44vMYCXM" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1hX44vMEjQg" resolve="GetterBlock" />
+      <node concept="14YyZ8" id="7IysFeB8aNz" role="1lVwrX">
+        <node concept="14ZrTv" id="7IysFeB8bda" role="14ZwWg">
+          <node concept="30G5F_" id="7IysFeB8bdb" role="150hEN">
+            <node concept="3clFbS" id="7IysFeB8bdc" role="2VODD2">
+              <node concept="3clFbF" id="7IysFeB8bxS" role="3cqZAp">
+                <node concept="2OqwBi" id="7IysFeB8ctF" role="3clFbG">
+                  <node concept="2OqwBi" id="7IysFeB8bJ5" role="2Oq$k0">
+                    <node concept="30H73N" id="7IysFeB8bxR" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7IysFeB8bXH" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="7IysFeB8d8_" role="2OqNvi">
+                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="7IysFeB8dnJ" role="150oIE">
+            <node concept="3clFb_" id="7IysFeB8dnK" role="1Koe22">
+              <property role="TrG5h" value="context" />
+              <node concept="3Tm6S6" id="7IysFeB8dnL" role="1B3o_S" />
+              <node concept="3uibUv" id="7IysFeB8dnM" role="3clF45">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+              <node concept="3clFbS" id="7IysFeB8dnN" role="3clF47">
+                <node concept="3clFbF" id="7IysFeB8dnO" role="3cqZAp">
+                  <node concept="10Nm6u" id="7IysFeB8dnP" role="3clFbG">
+                    <node concept="raruj" id="7IysFeB9Joa" role="lGtFl" />
+                    <node concept="29HgVG" id="7IysFeB9Jor" role="lGtFl">
+                      <node concept="3NFfHV" id="7IysFeB9JoG" role="3NFExx">
+                        <node concept="3clFbS" id="7IysFeB9JoH" role="2VODD2">
+                          <node concept="3clFbF" id="7IysFeB9Jsf" role="3cqZAp">
+                            <node concept="2OqwBi" id="7IysFeB9Nvb" role="3clFbG">
+                              <node concept="1PxgMI" id="7IysFeB9MVU" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="2OqwBi" id="7IysFeB9KvQ" role="1m5AlR">
+                                  <node concept="2OqwBi" id="7IysFeB9J_H" role="2Oq$k0">
+                                    <node concept="30H73N" id="7IysFeB9Jse" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="7IysFeB9K9L" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
+                                    </node>
+                                  </node>
+                                  <node concept="2qgKlT" id="7IysFeB9L76" role="2OqNvi">
+                                    <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
+                                  </node>
+                                </node>
+                                <node concept="chp4Y" id="6fXjIfxgnfS" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="7IysFeB9NSM" role="2OqNvi">
+                                <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="1hX44vMYEji" role="14YRTM">
+          <node concept="2OqwBi" id="7IysFeAYfY1" role="gfFT$">
+            <node concept="2ShNRf" id="1hX44vMYEjz" role="2Oq$k0">
+              <node concept="YeOm9" id="1hX44vMYELt" role="2ShVmc">
+                <node concept="1Y3b0j" id="1hX44vMYELw" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <node concept="3Tm1VV" id="1hX44vMYELx" role="1B3o_S" />
+                  <node concept="3clFb_" id="1hX44vMYELy" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="get" />
+                    <node concept="17QB3L" id="1hX44vMYJsd" role="3clF45" />
+                    <node concept="3Tm1VV" id="1hX44vMYELA" role="1B3o_S" />
+                    <node concept="3clFbS" id="1hX44vMYELC" role="3clF47">
+                      <node concept="3clFbF" id="1hX44vMYJxT" role="3cqZAp">
+                        <node concept="10Nm6u" id="1hX44vMYJxS" role="3clFbG" />
+                        <node concept="2b32R4" id="1hX44vMYJyq" role="lGtFl">
+                          <node concept="3JmXsc" id="1hX44vMYJyt" role="2P8S$">
+                            <node concept="3clFbS" id="1hX44vMYJyu" role="2VODD2">
+                              <node concept="3clFbF" id="1hX44vMYJLI" role="3cqZAp">
+                                <node concept="2OqwBi" id="1hX44vMYKZV" role="3clFbG">
+                                  <node concept="2OqwBi" id="1hX44vMYJXV" role="2Oq$k0">
+                                    <node concept="30H73N" id="1hX44vMYJLH" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="1hX44vMYKbq" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
+                                    </node>
+                                  </node>
+                                  <node concept="3Tsc0h" id="1hX44vMYLpO" role="2OqNvi">
+                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="1hX44vMYKxT" role="3cqZAp" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="17QB3L" id="1hX44vMYJor" role="2Ghqu4" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="7IysFeAYgXz" role="2OqNvi">
+              <ref role="37wK5l" node="1hX44vMYELy" resolve="get" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="4MEOIDFGMIC" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
+      <node concept="1Koe21" id="4MEOIDFGMID" role="1lVwrX">
+        <node concept="312cEu" id="4MEOIDFGMIE" role="1Koe22">
+          <property role="TrG5h" value="Context" />
+          <node concept="312cEg" id="4MEOIDFGMIF" role="jymVt">
+            <property role="TrG5h" value="field" />
+            <node concept="3Tm6S6" id="4MEOIDFGMIG" role="1B3o_S" />
+            <node concept="3uibUv" id="4MEOIDFGMIH" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="3clFb_" id="4MEOIDFGMII" role="jymVt">
+            <property role="TrG5h" value="context" />
+            <node concept="3uibUv" id="4MEOIDFGMIJ" role="3clF45">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="3Tm6S6" id="4MEOIDFGMIK" role="1B3o_S" />
+            <node concept="3clFbS" id="4MEOIDFGMIL" role="3clF47">
+              <node concept="3clFbF" id="4MEOIDFGMIM" role="3cqZAp">
+                <node concept="37vLTw" id="4MEOIDFGMIN" role="3clFbG">
+                  <ref role="3cqZAo" node="4MEOIDFGMIF" resolve="field" />
+                  <node concept="raruj" id="4MEOIDFGMIO" role="lGtFl" />
+                  <node concept="1ZhdrF" id="4MEOIDFGMIP" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <node concept="3$xsQk" id="4MEOIDFGMIQ" role="3$ytzL">
+                      <node concept="3clFbS" id="4MEOIDFGMIR" role="2VODD2">
+                        <node concept="3clFbF" id="4MEOIDFGMIS" role="3cqZAp">
+                          <node concept="2OqwBi" id="4MEOIDFGMIT" role="3clFbG">
+                            <node concept="1iwH7S" id="4MEOIDFGMIU" role="2Oq$k0" />
+                            <node concept="1iwH70" id="4MEOIDFGMIV" role="2OqNvi">
+                              <ref role="1iwH77" node="4MEOIDFGYa1" resolve="typeTermParam_field" />
+                              <node concept="2OqwBi" id="4MEOIDFGMIW" role="1iwH7V">
+                                <node concept="30H73N" id="4MEOIDFGMIX" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="4MEOIDFGMIY" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="4MEOIDFGMIZ" role="1B3o_S" />
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1L74NXElX0R" resolve="Term" />
+      <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="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <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="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="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="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="5hSMZ_ljA5X" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
+                            <property role="TrG5h" value="feature" />
+                            <node concept="3uibUv" id="5hSMZ_ljA5Z" role="3clF45">
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                            </node>
+                            <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="term_feature_override" />
+                                    <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="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>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <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="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="5hSMZ_ljA6m" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <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>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <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="5hSMZ_ljA6w" role="lGtFl">
+                            <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                            <property role="2qtEX9" value="fqClassName" />
+                            <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="5hSMZ_ljA6C" role="2OqNvi">
+                                      <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="5hSMZ_ljA6D" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <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="5hSMZ_ljToM" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="5hSMZ_ljToN" role="2OqNvi" />
+                  </node>
+                  <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="5hSMZ_ljToS" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <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="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="5hSMZ_lfXwl" role="1L3L4I">
+                          <property role="3clFbU" value="false" />
+                        </node>
+                        <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="5hSMZ_lgwWL" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+                                      </node>
+                                    </node>
+                                    <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="5hSMZ_lfXwB" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:5hSMZ_ldV8_" resolve="code" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="5hSMZ_lfXwC" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="5hSMZ_lfXwD" role="1tU5fm" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="5hSMZ_lfXwE" role="3MN40a">
+                          <property role="TrG5h" value="feature" />
+                          <node concept="3uibUv" id="5hSMZ_lfXwF" role="3clF45">
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                          </node>
+                          <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="term_feature_override" />
+                                  <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="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>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <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="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="5hSMZ_lfXx2" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <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>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <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="5hSMZ_lfXxc" role="lGtFl">
+                          <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                          <property role="2qtEX9" value="fqClassName" />
+                          <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="5hSMZ_lfXxm" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="5hSMZ_lfXxn" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <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="5hSMZ_ljOwF" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5hSMZ_ldWzp" resolve="binding" />
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="5hSMZ_ljOwG" role="2OqNvi" />
+                  </node>
+                  <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="1v1jN8" id="5hSMZ_ljPYJ" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <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 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 concept="Rh6nW" id="5hSMZ_ljQi_" role="1bW2Oz">
+                                      <property role="TrG5h" value="it" />
+                                      <node concept="2jxLKc" id="5hSMZ_ljQiA" role="1tU5fm" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </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="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="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="5hSMZ_ljTTY" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <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="2qgKlT" id="5hSMZ_ljTU8" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                            </node>
+                          </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>
+        </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 e68eb4a7..3c8e8b03 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -1285,7 +1285,7 @@
   </node>
   <node concept="13h7C7" id="1L74NXEmHzJ">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+    <ref role="13h7C2" to="wq2x:1L74NXElX0R" resolve="Term" />
     <node concept="13hLZK" id="1L74NXEmHzK" role="13h7CW">
       <node concept="3clFbS" id="1L74NXEmHzL" role="2VODD2" />
     </node>
@@ -1447,13 +1447,13 @@
   </node>
   <node concept="13h7C7" id="5UYwY$H7MGb">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
+    <ref role="13h7C2" to="wq2x:1pPth$m5o9D" resolve="TermTemplate" />
     <node concept="13i0hz" id="5UYwY$H7MGm" role="13h7CS">
       <property role="TrG5h" value="valueFeatures" />
       <node concept="3Tm1VV" id="5UYwY$H7MGn" role="1B3o_S" />
       <node concept="A3Dl8" id="5UYwY$H7MID" role="3clF45">
         <node concept="3Tqbb2" id="5UYwY$H7MIQ" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+          <ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="5UYwY$H7MGp" role="3clF47">
@@ -1476,7 +1476,7 @@
                         </node>
                         <node concept="1mIQ4w" id="1GNw78$s22b" role="2OqNvi">
                           <node concept="chp4Y" id="1GNw78$s22c" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+                            <ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
                           </node>
                         </node>
                       </node>
@@ -1486,7 +1486,7 @@
                         </node>
                         <node concept="1mIQ4w" id="1GNw78$s22f" role="2OqNvi">
                           <node concept="chp4Y" id="1GNw78$s22g" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+                            <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
                           </node>
                         </node>
                       </node>
@@ -1508,7 +1508,7 @@
       <node concept="3Tm1VV" id="5UYwY$H7TrM" role="1B3o_S" />
       <node concept="A3Dl8" id="5UYwY$H7TDk" role="3clF45">
         <node concept="3Tqbb2" id="5UYwY$H7TDx" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+          <ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="5UYwY$H7TrO" role="3clF47">
@@ -1531,7 +1531,7 @@
                         </node>
                         <node concept="1mIQ4w" id="1GNw78$s22K" role="2OqNvi">
                           <node concept="chp4Y" id="1GNw78$s22L" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+                            <ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
                           </node>
                         </node>
                       </node>
@@ -1541,7 +1541,7 @@
                         </node>
                         <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
                           <node concept="chp4Y" id="5YVpdhev4Ub" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
+                            <ref role="cht4Q" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
                           </node>
                         </node>
                       </node>
@@ -1564,7 +1564,7 @@
   </node>
   <node concept="13h7C7" id="4MEOIDFxxVo">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
     <node concept="13hLZK" id="4MEOIDFxxVp" role="13h7CW">
       <node concept="3clFbS" id="4MEOIDFxxVq" role="2VODD2" />
     </node>
@@ -1591,7 +1591,7 @@
   </node>
   <node concept="13h7C7" id="4MEOIDG83_6">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    <ref role="13h7C2" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
     <node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
       <property role="TrG5h" value="runtimeClassName" />
       <node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
@@ -1718,7 +1718,7 @@
           <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" />
+              <ref role="2I9WkF" to="wq2x:4MEOIDFwTxW" resolve="TermDeclarationParameter" />
             </node>
             <node concept="2OqwBi" id="5hSMZ_ldW$T" role="33vP2m">
               <node concept="2OqwBi" id="5hSMZ_ldW$U" role="2Oq$k0">
@@ -1727,7 +1727,7 @@
                   <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" />
+                        <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
                       </node>
                     </node>
                   </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 8d0d1238..30219009 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -819,7 +819,7 @@
   </node>
   <node concept="1M2fIO" id="1L74NXFMz8h">
     <property role="3GE5qa" value="term" />
-    <ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
+    <ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TermFeatureOverride" />
     <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:1L74NXFMz74" resolve="feature" />
       <node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
@@ -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:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+                <ref role="ehGHo" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
               </node>
               <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
                 <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
@@ -836,7 +836,7 @@
                   <node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
                     <node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
                       <node concept="chp4Y" id="6fXjIfxgfUb" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+                        <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
                       </node>
                     </node>
                     <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
@@ -938,7 +938,7 @@
   </node>
   <node concept="1M2fIO" id="4MEOIDFxysn">
     <property role="3GE5qa" value="term" />
-    <ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
     <node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
       <node concept="3dgokm" id="6fXjIfxgfXc" role="1N6uqs">
@@ -956,7 +956,7 @@
                       <node concept="2Xjw5R" id="6fXjIfxgfXl" role="2OqNvi">
                         <node concept="1xMEDy" id="6fXjIfxgfXm" role="1xVPHs">
                           <node concept="chp4Y" id="6fXjIfxgfXn" role="ri$Ld">
-                            <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+                            <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
                           </node>
                         </node>
                         <node concept="1xIGOp" id="6fXjIfxgfXo" role="1xVPHs" />
@@ -1053,7 +1053,7 @@
                         <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" />
+                              <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="Term" />
                             </node>
                           </node>
                           <node concept="1xIGOp" id="5hSMZ_ldVkT" role="1xVPHs" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index f1651cd8..0dc1d3c7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -3057,7 +3057,7 @@
   </node>
   <node concept="24kQdi" id="1pPth$m6bZM">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5o9D" resolve="TermTemplate" />
     <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
       <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
         <property role="3F0ifm" value="[" />
@@ -3092,17 +3092,17 @@
   </node>
   <node concept="24kQdi" id="1pPth$m6rC8">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
     <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="term.feature" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oae" resolve="StringTermFeature" />
     <node concept="3EZMnI" id="2N2MQGCKV7S" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlWf" role="3EZMnx">
-        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
+        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
       </node>
       <node concept="3F0ifn" id="2N2MQGCKV7U" role="3EZMnx">
         <property role="3F0ifm" value=":" />
@@ -3126,10 +3126,10 @@
   </node>
   <node concept="24kQdi" id="2N2MQGCLx6w">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oaL" resolve="ChildTermFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx6y" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlVQ" role="3EZMnx">
-        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
+        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
       </node>
       <node concept="3F0ifn" id="2N2MQGCLx6$" role="3EZMnx">
         <property role="3F0ifm" value=":" />
@@ -3149,10 +3149,10 @@
   </node>
   <node concept="24kQdi" id="2N2MQGCLx6L">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oa6" resolve="ListTermFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx6N" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlW2" role="3EZMnx">
-        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
+        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
       </node>
       <node concept="3F0ifn" id="2N2MQGCLx6P" role="3EZMnx">
         <property role="3F0ifm" value=":" />
@@ -3172,10 +3172,10 @@
   </node>
   <node concept="24kQdi" id="2N2MQGCLx72">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oaG" resolve="ReferenceTermFeature" />
     <node concept="3EZMnI" id="2N2MQGCLx74" role="2wV5jI">
       <node concept="PMmxH" id="1CcQBrPqlW8" role="3EZMnx">
-        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TypeFeature_final_name" />
+        <ref role="PMmxG" node="1CcQBrPqjQg" resolve="TermFeature_final_name" />
       </node>
       <node concept="3F0ifn" id="2N2MQGCLx76" role="3EZMnx">
         <property role="3F0ifm" value=":" />
@@ -4062,7 +4062,7 @@
   </node>
   <node concept="24kQdi" id="1L74NXElXMi">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+    <ref role="1XX52x" to="wq2x:1L74NXElX0R" resolve="Term" />
     <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
       <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
       <node concept="1iCGBv" id="1L74NXEmHUe" role="3EZMnx">
@@ -4143,7 +4143,7 @@
           <property role="VOm3f" value="true" />
         </node>
         <node concept="A1WHu" id="4hPXq9Jmfb$" role="3vIgyS">
-          <ref role="A1WHt" node="4hPXq9Jmel2" resolve="TypeTerm_addOverride" />
+          <ref role="A1WHt" node="4hPXq9Jmel2" resolve="Term_addOverride" />
         </node>
       </node>
       <node concept="3EZMnI" id="1L74NXFNJ0S" role="3EZMnx">
@@ -4307,7 +4307,7 @@
   </node>
   <node concept="24kQdi" id="1L74NXFMBU3">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
+    <ref role="1XX52x" to="wq2x:1L74NXFMz6j" resolve="TermFeatureOverride" />
     <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
       <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:1L74NXFMz74" resolve="feature" />
@@ -4332,6 +4332,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="7LZcKzBrF6I">
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:7LZcKzBrEPK" resolve="TermListExpression" />
     <node concept="3EZMnI" id="7LZcKzBrF6K" role="2wV5jI">
       <node concept="3F0ifn" id="7LZcKzBzqk8" role="3EZMnx">
@@ -4616,6 +4617,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9JmejC">
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="wq2x:7IysFe_ZPXH" resolve="TypeInitializerLogicalDeclaration" />
     <node concept="1Qtc8_" id="4hPXq9JmejD" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9JmejE" role="1Qtc8$">
@@ -4772,9 +4774,9 @@
     </node>
   </node>
   <node concept="3ICXOK" id="4hPXq9Jmel2">
-    <property role="TrG5h" value="TypeTerm_addOverride" />
+    <property role="TrG5h" value="Term_addOverride" />
     <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
+    <ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="Term" />
     <node concept="yp4Wq" id="4hPXq9Jmel3" role="lGtFl">
       <property role="yp4Ub" value="ext_1_RTransform" />
     </node>
@@ -4961,6 +4963,11 @@
         <ref role="2kkw0f" node="4hPXq9Jmes_" resolve="TypeDeclaration_parameter" />
       </node>
     </node>
+    <node concept="1s_PAr" id="4bWqD4C23I8" role="3ft7WO">
+      <node concept="2kknPI" id="4bWqD4C23I9" role="1s_PAo">
+        <ref role="2kkw0f" node="4bWqD4C22Ew" resolve="TermDeclaration_parameter" />
+      </node>
+    </node>
     <node concept="1s_PAr" id="4hPXq9Jmew6" role="3ft7WO">
       <node concept="2kknPI" id="4hPXq9Jmew7" role="1s_PAo">
         <ref role="2kkw0f" node="4hPXq9Jmeuj" resolve="Expression_subst_LogicExpressionWrapper" />
@@ -4974,6 +4981,7 @@
   </node>
   <node concept="Q6S24" id="4hPXq9JmepQ">
     <property role="TrG5h" value="TypeNode_Expression" />
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="3ft6gV" id="4hPXq9JmepS" role="3ft7WO">
       <node concept="3ft6gW" id="4hPXq9JmepT" role="3ft5RY">
@@ -5072,6 +5080,7 @@
   </node>
   <node concept="Q6S24" id="4hPXq9JmerR">
     <property role="TrG5h" value="TypeLogical_Expression" />
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="3ft6gV" id="4hPXq9JmerT" role="3ft7WO">
       <node concept="3ft6gW" id="4hPXq9JmerU" role="3ft5RY">
@@ -5101,6 +5110,7 @@
   </node>
   <node concept="Q6S24" id="4hPXq9Jmes_">
     <property role="TrG5h" value="TypeDeclaration_parameter" />
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="3ft6gV" id="4hPXq9JmesB" role="3ft7WO">
       <node concept="3ft6gW" id="4hPXq9JmesC" role="3ft5RY">
@@ -5127,31 +5137,6 @@
         <ref role="4PJHt" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
       </node>
     </node>
-    <node concept="3ft6gV" id="4MEOIDFzaBu" role="3ft7WO">
-      <node concept="3ft6gW" id="4MEOIDFzaFK" role="3ft5RY">
-        <node concept="3clFbS" id="4MEOIDFzaFL" role="2VODD2">
-          <node concept="3clFbF" id="4MEOIDFzaMT" role="3cqZAp">
-            <node concept="2OqwBi" id="4MEOIDFzaMU" role="3clFbG">
-              <node concept="2OqwBi" id="4MEOIDFzaMV" role="2Oq$k0">
-                <node concept="3bvxqY" id="4MEOIDFzaMW" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="4MEOIDFzaMX" role="2OqNvi">
-                  <node concept="1xMEDy" id="4MEOIDFzaMY" role="1xVPHs">
-                    <node concept="chp4Y" id="4MEOIDFzb0R" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="4MEOIDFzaN0" role="1xVPHs" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="4MEOIDFzaN1" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3ft5Ry" id="4MEOIDFzaXh" role="3ft5RZ">
-        <ref role="4PJHt" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
-      </node>
-    </node>
   </node>
   <node concept="3p309x" id="4hPXq9Jmetj">
     <property role="TrG5h" value="Statement_Contribution" />
@@ -5641,15 +5626,18 @@
     </node>
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBh">
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="wq2x:7IysFeA99oR" resolve="TypeLogicalExpression" />
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBi">
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBj">
     <ref role="aqKnT" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBl">
+    <property role="3GE5qa" value="type" />
     <ref role="aqKnT" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBm">
@@ -5740,7 +5728,7 @@
   </node>
   <node concept="24kQdi" id="4MEOIDFttNn">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
     <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
       <node concept="3F0ifn" id="4MEOIDFttNw" role="3EZMnx">
         <property role="3F0ifm" value="term" />
@@ -5775,7 +5763,7 @@
   </node>
   <node concept="24kQdi" id="4MEOIDFwTyh">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFwTxW" resolve="TermDeclarationParameter" />
     <node concept="3EZMnI" id="4MEOIDFwTyj" role="2wV5jI">
       <node concept="3F1sOY" id="4MEOIDFwTyq" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:4MEOIDFwTy3" resolve="type" />
@@ -5789,7 +5777,7 @@
   </node>
   <node concept="24kQdi" id="4MEOIDFxyqZ">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <ref role="1XX52x" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
     <node concept="3EZMnI" id="4MEOIDFxyr4" role="2wV5jI">
       <node concept="1iCGBv" id="4MEOIDFxyre" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
@@ -5806,7 +5794,7 @@
   </node>
   <node concept="3p36aQ" id="4MEOIDFxyrS">
     <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+    <ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
   </node>
   <node concept="24kQdi" id="20Ay2VefOqG">
     <property role="3GE5qa" value="rule.clause" />
@@ -5901,12 +5889,12 @@
   </node>
   <node concept="PKFIW" id="1CcQBrPqjQg">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="TypeFeature_final_name" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+    <property role="TrG5h" value="TermFeature_final_name" />
+    <ref role="1XX52x" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
     <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
       <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
         <property role="3F0ifm" value="final" />
-        <ref role="1ERwB7" node="1CcQBrPqIC4" resolve="TypeFeature_delete_final" />
+        <ref role="1ERwB7" node="1CcQBrPqIC4" resolve="TermFeature_delete_final" />
         <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="pkWqt" id="1CcQBrPqjRc" role="pqm2j">
           <node concept="3clFbS" id="1CcQBrPqjRd" role="2VODD2">
@@ -5926,14 +5914,14 @@
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" node="1iWwVK2_Eea" resolve="TypeFeature" />
         <node concept="A1WHr" id="1CcQBrPqp6y" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+          <ref role="2ZyFGn" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
         </node>
       </node>
     </node>
   </node>
   <node concept="IW6AY" id="1CcQBrPqlWO">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="aqKnT" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="aqKnT" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
       <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
         <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
@@ -5988,8 +5976,8 @@
   </node>
   <node concept="1h_SRR" id="1CcQBrPqIC4">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="TypeFeature_delete_final" />
-    <ref role="1h_SK9" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
+    <property role="TrG5h" value="TermFeature_delete_final" />
+    <ref role="1h_SK9" to="wq2x:1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
       <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
@@ -6498,5 +6486,35 @@
       <node concept="l2Vlx" id="5hSMZ_lNwrh" role="2iSdaV" />
     </node>
   </node>
+  <node concept="Q6S24" id="4bWqD4C22Ew">
+    <property role="TrG5h" value="TermDeclaration_parameter" />
+    <property role="3GE5qa" value="term" />
+    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="3ft6gV" id="4bWqD4C22EI" role="3ft7WO">
+      <node concept="3ft6gW" id="4bWqD4C22EJ" role="3ft5RY">
+        <node concept="3clFbS" id="4bWqD4C22EK" role="2VODD2">
+          <node concept="3clFbF" id="4bWqD4C22EL" role="3cqZAp">
+            <node concept="2OqwBi" id="4bWqD4C22EM" role="3clFbG">
+              <node concept="2OqwBi" id="4bWqD4C22EN" role="2Oq$k0">
+                <node concept="3bvxqY" id="4bWqD4C22EO" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="4bWqD4C22EP" role="2OqNvi">
+                  <node concept="1xMEDy" id="4bWqD4C22EQ" role="1xVPHs">
+                    <node concept="chp4Y" id="4bWqD4C22ER" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TermDeclaration" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="4bWqD4C22ES" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="4bWqD4C22ET" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3ft5Ry" id="4bWqD4C22EU" role="3ft5RZ">
+        <ref role="4PJHt" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
+      </node>
+    </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 684faa4c..065e940a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -626,7 +626,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5o9D">
-    <property role="TrG5h" value="TypeTermTemplate" />
+    <property role="TrG5h" value="TermTemplate" />
     <property role="3GE5qa" value="term" />
     <property role="EcuMT" value="1618328391714701929" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
@@ -635,12 +635,12 @@
       <property role="20kJfa" value="feature" />
       <property role="20lbJX" value="1..n" />
       <property role="IQ2ns" value="1618328391714701961" />
-      <ref role="20lvS9" node="1pPth$m5oa5" resolve="TypeFeature" />
+      <ref role="20lvS9" node="1pPth$m5oa5" resolve="TermFeature" />
     </node>
   </node>
   <node concept="1TIwiD" id="1pPth$m5oa5">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="TypeFeature" />
+    <property role="TrG5h" value="TermFeature" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="EcuMT" value="1618328391714701957" />
@@ -656,10 +656,10 @@
   </node>
   <node concept="1TIwiD" id="1pPth$m5oa6">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="ListTypeFeature" />
+    <property role="TrG5h" value="ListTermFeature" />
     <property role="34LRSv" value="list" />
     <property role="EcuMT" value="1618328391714701958" />
-    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1TJgyj" id="3AWu6Embo_Z" role="1TKVEi">
       <property role="IQ2ns" value="4160332554964928895" />
       <property role="20lmBu" value="aggregation" />
@@ -669,10 +669,10 @@
   </node>
   <node concept="1TIwiD" id="1pPth$m5oae">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="StringTypeFeature" />
+    <property role="TrG5h" value="StringTermFeature" />
     <property role="34LRSv" value="string" />
     <property role="EcuMT" value="1618328391714701966" />
-    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1TJgyj" id="1hX44vMEjQe" role="1TKVEi">
       <property role="IQ2ns" value="1476354154047290766" />
       <property role="20lmBu" value="aggregation" />
@@ -689,10 +689,10 @@
   </node>
   <node concept="1TIwiD" id="1pPth$m5oaG">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="ReferenceTypeFeature" />
+    <property role="TrG5h" value="ReferenceTermFeature" />
     <property role="34LRSv" value="reference" />
     <property role="EcuMT" value="1618328391714701996" />
-    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1TJgyj" id="1hX44vNe1iN" role="1TKVEi">
       <property role="IQ2ns" value="1476354154056651955" />
       <property role="20lmBu" value="aggregation" />
@@ -702,10 +702,10 @@
   </node>
   <node concept="1TIwiD" id="1pPth$m5oaL">
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="ChildTypeFeature" />
+    <property role="TrG5h" value="ChildTermFeature" />
     <property role="34LRSv" value="child" />
     <property role="EcuMT" value="1618328391714702001" />
-    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
+    <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TermFeature" />
     <node concept="1TJgyj" id="2L20jGt8dYg" role="1TKVEi">
       <property role="IQ2ns" value="3189112839535124368" />
       <property role="20lmBu" value="aggregation" />
@@ -740,7 +740,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="termDeclaration" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
       <node concept="asaX9" id="5hSMZ_lNwsa" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
@@ -776,7 +776,7 @@
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="termDecl" />
       <property role="20lbJX" value="0..1" />
-      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
       <node concept="asaX9" id="5hSMZ_lMoKM" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
@@ -1082,7 +1082,7 @@
   <node concept="1TIwiD" id="1L74NXElX0R">
     <property role="EcuMT" value="2037618519496446007" />
     <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TypeTerm" />
+    <property role="TrG5h" value="Term" />
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="1L74NXEmI65" role="1TKVEi">
       <property role="IQ2ns" value="2037618519496647045" />
@@ -1103,7 +1103,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="override" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="1L74NXFMz6j" resolve="TypeFeatureOverride" />
+      <ref role="20lvS9" node="1L74NXFMz6j" resolve="TermFeatureOverride" />
     </node>
     <node concept="1TJgyj" id="1L74NXElX1C" role="1TKVEi">
       <property role="IQ2ns" value="2037618519496446056" />
@@ -1118,7 +1118,7 @@
       <property role="IQ2ns" value="6086839168126957156" />
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="termDecl" />
-      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
     </node>
     <node concept="PrWs8" id="1L74NXEmHzi" role="PzmwI">
       <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
@@ -1165,7 +1165,7 @@
   <node concept="1TIwiD" id="1L74NXFMz6j">
     <property role="EcuMT" value="2037618519520719251" />
     <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TypeFeatureOverride" />
+    <property role="TrG5h" value="TermFeatureOverride" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1L74NXFMBVS" role="1TKVEi">
       <property role="IQ2ns" value="2037618519520739064" />
@@ -1180,7 +1180,7 @@
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="feature" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="1pPth$m5oa5" resolve="TypeFeature" />
+      <ref role="20lvS9" node="1pPth$m5oa5" resolve="TermFeature" />
     </node>
   </node>
   <node concept="1TIwiD" id="7LZcKzBrEPK">
@@ -1240,7 +1240,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeTerm" />
       <property role="20lbJX" value="0..1" />
-      <ref role="20lvS9" node="1L74NXElX0R" resolve="TypeTerm" />
+      <ref role="20lvS9" node="1L74NXElX0R" resolve="Term" />
       <node concept="asaX9" id="5hSMZ_lrctE" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="5hSMZ_ltV78" role="PzmwI">
@@ -1250,21 +1250,21 @@
   <node concept="1TIwiD" id="4MEOIDFttoe">
     <property role="EcuMT" value="5524459797190399502" />
     <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TypeTermDeclaration" />
+    <property role="TrG5h" value="TermDeclaration" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="4MEOIDFttNi" role="1TKVEi">
       <property role="IQ2ns" value="5524459797190401234" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
     </node>
     <node concept="1TJgyj" id="4MEOIDFttNk" role="1TKVEi">
       <property role="IQ2ns" value="5524459797190401236" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="template" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
+      <ref role="20lvS9" node="1pPth$m5o9D" resolve="TermTemplate" />
     </node>
     <node concept="PrWs8" id="4MEOIDFttNg" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -1273,7 +1273,7 @@
   <node concept="1TIwiD" id="4MEOIDFwTxW">
     <property role="EcuMT" value="5524459797191301244" />
     <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TypeTermDeclarationParameter" />
+    <property role="TrG5h" value="TermDeclarationParameter" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="4MEOIDFwTy3" role="1TKVEi">
       <property role="IQ2ns" value="5524459797191301251" />
@@ -1295,14 +1295,14 @@
   <node concept="1TIwiD" id="4MEOIDFxxDM">
     <property role="EcuMT" value="5524459797191465586" />
     <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TypeTermDeclarationParameterReference" />
+    <property role="TrG5h" value="TermDeclarationParameterRef" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="4MEOIDFxxDY" role="1TKVEi">
       <property role="IQ2ns" value="5524459797191465598" />
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
     </node>
     <node concept="PrWs8" id="4MEOIDFxxDW" role="PzmwI">
       <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
@@ -1411,7 +1411,7 @@
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TypeTermDeclarationParameter" />
+      <ref role="20lvS9" node="4MEOIDFwTxW" resolve="TermDeclarationParameter" />
     </node>
   </node>
   <node concept="1TIwiD" id="5hSMZ_lNwqz">
@@ -1426,7 +1426,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="termDeclaration" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <ref role="20lvS9" node="4MEOIDFttoe" resolve="TermDeclaration" />
     </node>
     <node concept="PrWs8" id="5hSMZ_lNwqA" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index d8bd047d..870cd143 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -1400,7 +1400,7 @@
     </node>
   </node>
   <node concept="1YbPZF" id="4MEOIDFzuUN">
-    <property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
+    <property role="TrG5h" value="typeof_TermDeclarationParameterRef" />
     <property role="3GE5qa" value="term" />
     <node concept="3clFbS" id="4MEOIDFzuUO" role="18ibNy">
       <node concept="1Z5TYs" id="4MEOIDFzv5A" role="3cqZAp">
@@ -1430,7 +1430,7 @@
     </node>
     <node concept="1YaCAy" id="4MEOIDFzuUQ" role="1YuTPh">
       <property role="TrG5h" value="ttdpr" />
-      <ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
+      <ref role="1YaFvo" to="wq2x:4MEOIDFxxDM" resolve="TermDeclarationParameterRef" />
     </node>
   </node>
   <node concept="1YbPZF" id="60zk4o7revn">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
index 49d0546b..110ab1eb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
@@ -14,20 +14,9 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" implicit="true" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
@@ -35,9 +24,6 @@
         <reference id="1224575174120" name="enumClass" index="un$jP" />
         <child id="1224575157853" name="value" index="unwt0" />
       </concept>
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -65,9 +51,6 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <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="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -82,9 +65,6 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <property id="4467513934994662257" name="forceMultiLine" index="TyiWK" />
-        <property id="4467513934994662256" name="forceOneLine" index="TyiWL" />
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -94,7 +74,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -102,12 +81,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -116,7 +89,6 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -128,98 +100,33 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
-      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
-    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-    </language>
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="5979988948250981289" name="jetbrains.mps.lang.actions.structure.SNodeCreatorAndInitializer" flags="nn" index="2fJWfE" />
-      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
-        <child id="1138662048170" name="value" index="tz02z" />
-      </concept>
-      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
-        <reference id="1139877738879" name="concept" index="1A0vxQ" />
-      </concept>
-      <concept id="1171500988903" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenOperation" flags="nn" index="32TBzR" />
-      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
-        <reference id="1154546997487" name="concept" index="3gnhBz" />
-      </concept>
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
-      <concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
-      <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
-        <child id="5944356402132808753" name="case" index="1_3QMm" />
-        <child id="5944356402132808752" name="expression" index="1_3QMn" />
-      </concept>
-      <concept id="5944356402132808754" name="jetbrains.mps.lang.smodel.structure.SubconceptCase" flags="ng" index="1_3QMl">
-        <child id="1163670677455" name="concept" index="3Kbmr1" />
-        <child id="1163670683720" name="body" index="3Kbo56" />
-      </concept>
       <concept id="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
         <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
       </concept>
-      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
-        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -237,9 +144,6 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -248,1020 +152,10 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
-      <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
-        <child id="9042586985346099734" name="forEach" index="1_o_by" />
-      </concept>
-      <concept id="9042586985346099733" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachPair" flags="ng" index="1_o_bx">
-        <child id="9042586985346099778" name="variable" index="1_o_aQ" />
-        <child id="9042586985346099735" name="input" index="1_o_bz" />
-      </concept>
-      <concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
-      <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
-        <reference id="8293956702609966325" name="variable" index="3M$S_o" />
-      </concept>
     </language>
   </registry>
-  <node concept="312cEu" id="2N2MQGCJu8I">
-    <property role="TrG5h" value="TypeTermUtil" />
-    <node concept="2tJIrI" id="2N2MQGCJu8W" role="jymVt" />
-    <node concept="2YIFZL" id="2N2MQGCJu99" role="jymVt">
-      <property role="TrG5h" value="createFromTemplate" />
-      <node concept="37vLTG" id="2N2MQGCJu9$" role="3clF46">
-        <property role="TrG5h" value="term" />
-        <node concept="3Tqbb2" id="2N2MQGCJu9W" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2N2MQGCJu9p" role="3clF45">
-        <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-      </node>
-      <node concept="3Tm1VV" id="2N2MQGCJu9c" role="1B3o_S" />
-      <node concept="3clFbS" id="2N2MQGCJu9d" role="3clF47">
-        <node concept="3SKdUt" id="2N2MQGCJvXx" role="3cqZAp">
-          <node concept="3SKdUq" id="2N2MQGCJw0q" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: extract standard role IDs" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2N2MQGCK4IQ" role="3cqZAp">
-          <node concept="3cpWsn" id="2N2MQGCK4IR" role="3cpWs9">
-            <property role="TrG5h" value="node" />
-            <node concept="3Tqbb2" id="2N2MQGCK4IO" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-            </node>
-            <node concept="2ShNRf" id="2N2MQGCK4IS" role="33vP2m">
-              <node concept="2fJWfE" id="2N2MQGCK4IT" role="2ShVmc">
-                <node concept="3Tqbb2" id="2N2MQGCK4IU" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2N2MQGCK3Cz" role="3cqZAp">
-          <node concept="2OqwBi" id="2N2MQGCK5UG" role="3clFbG">
-            <node concept="2OqwBi" id="2N2MQGCK4MS" role="2Oq$k0">
-              <node concept="37vLTw" id="2N2MQGCK4IV" role="2Oq$k0">
-                <ref role="3cqZAo" node="2N2MQGCK4IR" resolve="node" />
-              </node>
-              <node concept="3Tsc0h" id="2N2MQGCK51N" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-              </node>
-            </node>
-            <node concept="X8dFx" id="2N2MQGCK8Qw" role="2OqNvi">
-              <node concept="1rXfSq" id="2N2MQGCK9DD" role="25WWJ7">
-                <ref role="37wK5l" node="2N2MQGCJx48" resolve="features2roles" />
-                <node concept="2OqwBi" id="2N2MQGCKaH$" role="37wK5m">
-                  <node concept="37vLTw" id="2N2MQGCKaob" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2N2MQGCJu9$" resolve="term" />
-                  </node>
-                  <node concept="3Tsc0h" id="2N2MQGCKb$u" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2N2MQGCKhWl" role="3cqZAp">
-          <node concept="37vLTw" id="2N2MQGCKhWj" role="3clFbG">
-            <ref role="3cqZAo" node="2N2MQGCK4IR" resolve="node" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCJx0i" role="jymVt" />
-    <node concept="2YIFZL" id="2CEQDIE2hE2" role="jymVt">
-      <property role="TrG5h" value="createFromTemplateAndPrototype" />
-      <node concept="37vLTG" id="2CEQDIE2hLl" role="3clF46">
-        <property role="TrG5h" value="term" />
-        <node concept="3Tqbb2" id="2CEQDIE2hLm" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2CEQDIE2hKO" role="3clF46">
-        <property role="TrG5h" value="prototype" />
-        <node concept="3Tqbb2" id="2CEQDIE2hKY" role="1tU5fm">
-          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2CEQDIE2hE5" role="1B3o_S" />
-      <node concept="3clFbS" id="2CEQDIE2hE6" role="3clF47">
-        <node concept="3SKdUt" id="2CEQDIE2hLD" role="3cqZAp">
-          <node concept="3SKdUq" id="2CEQDIE2hLE" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: extract standard role IDs" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2CEQDIE2hLF" role="3cqZAp">
-          <node concept="3cpWsn" id="2CEQDIE2hLG" role="3cpWs9">
-            <property role="TrG5h" value="node" />
-            <node concept="3Tqbb2" id="2CEQDIE2hLH" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-            </node>
-            <node concept="2ShNRf" id="2CEQDIE2hLI" role="33vP2m">
-              <node concept="2fJWfE" id="2CEQDIE2hLJ" role="2ShVmc">
-                <node concept="3Tqbb2" id="2CEQDIE2hLK" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6SKZg6H37iY" role="3cqZAp">
-          <node concept="2OqwBi" id="6SKZg6H39FT" role="3clFbG">
-            <node concept="2OqwBi" id="6SKZg6H388a" role="2Oq$k0">
-              <node concept="37vLTw" id="6SKZg6H37iW" role="2Oq$k0">
-                <ref role="3cqZAo" node="2CEQDIE2hLG" resolve="node" />
-              </node>
-              <node concept="3TrcHB" id="6SKZg6H39u$" role="2OqNvi">
-                <ref role="3TsBF5" to="5j4j:6dP_abdQoiG" resolve="kind" />
-              </node>
-            </node>
-            <node concept="tyxLq" id="6SKZg6H3aDm" role="2OqNvi">
-              <node concept="2OqwBi" id="6SKZg6H3aHX" role="tz02z">
-                <node concept="37vLTw" id="6SKZg6H3aFh" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2CEQDIE2hKO" resolve="prototype" />
-                </node>
-                <node concept="3TrcHB" id="6SKZg6H3aX8" role="2OqNvi">
-                  <ref role="3TsBF5" to="5j4j:6dP_abdQoiG" resolve="kind" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2CEQDIE2hLL" role="3cqZAp">
-          <node concept="2OqwBi" id="2CEQDIE2hLM" role="3clFbG">
-            <node concept="2OqwBi" id="2CEQDIE2hLN" role="2Oq$k0">
-              <node concept="37vLTw" id="2CEQDIE2hLO" role="2Oq$k0">
-                <ref role="3cqZAo" node="2CEQDIE2hLG" resolve="node" />
-              </node>
-              <node concept="3Tsc0h" id="2CEQDIE2hLP" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-              </node>
-            </node>
-            <node concept="X8dFx" id="2CEQDIE2hLQ" role="2OqNvi">
-              <node concept="1rXfSq" id="2CEQDIE2hLR" role="25WWJ7">
-                <ref role="37wK5l" node="2N2MQGCJx48" resolve="features2roles" />
-                <node concept="2OqwBi" id="2CEQDIE2hLS" role="37wK5m">
-                  <node concept="37vLTw" id="2CEQDIE2hLT" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2CEQDIE2hLl" resolve="term" />
-                  </node>
-                  <node concept="3Tsc0h" id="2CEQDIE2hLU" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2CEQDIE2jpW" role="3cqZAp" />
-        <node concept="1DcWWT" id="2CEQDIE2mvw" role="3cqZAp">
-          <node concept="3clFbS" id="2CEQDIE2mvy" role="2LFqv$">
-            <node concept="3cpWs8" id="2CEQDIE2vL9" role="3cqZAp">
-              <node concept="3cpWsn" id="2CEQDIE2vLa" role="3cpWs9">
-                <property role="TrG5h" value="newRole" />
-                <node concept="3Tqbb2" id="2CEQDIE2vL6" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:6$jH9oLmYD_" resolve="Role" />
-                </node>
-                <node concept="2OqwBi" id="2CEQDIE2vLb" role="33vP2m">
-                  <node concept="2OqwBi" id="2CEQDIE2vLc" role="2Oq$k0">
-                    <node concept="37vLTw" id="2CEQDIE2vUl" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2CEQDIE2hLG" resolve="node" />
-                    </node>
-                    <node concept="3Tsc0h" id="2CEQDIE2vLe" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                    </node>
-                  </node>
-                  <node concept="1z4cxt" id="2CEQDIE2vLf" role="2OqNvi">
-                    <node concept="1bVj0M" id="2CEQDIE2vLg" role="23t8la">
-                      <node concept="3clFbS" id="2CEQDIE2vLh" role="1bW5cS">
-                        <node concept="3clFbF" id="2CEQDIE2vLi" role="3cqZAp">
-                          <node concept="2OqwBi" id="2CEQDIE2vLj" role="3clFbG">
-                            <node concept="2OqwBi" id="2CEQDIE2vLk" role="2Oq$k0">
-                              <node concept="37vLTw" id="2CEQDIE2vLl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CEQDIE2vLr" resolve="it" />
-                              </node>
-                              <node concept="3TrcHB" id="2CEQDIE2vLm" role="2OqNvi">
-                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="2CEQDIE2vLn" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                              <node concept="2OqwBi" id="2CEQDIE2vLo" role="37wK5m">
-                                <node concept="37vLTw" id="2CEQDIE2vLp" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2CEQDIE2mv$" resolve="protoRole" />
-                                </node>
-                                <node concept="3TrcHB" id="2CEQDIE2vLq" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="2CEQDIE2vLr" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2CEQDIE2vLs" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="2CEQDIE2w1P" role="3cqZAp">
-              <node concept="3clFbS" id="2CEQDIE2w1R" role="3clFbx">
-                <node concept="3clFbF" id="2CEQDIE2yq6" role="3cqZAp">
-                  <node concept="2OqwBi" id="2CEQDIE2TuQ" role="3clFbG">
-                    <node concept="2OqwBi" id="2CEQDIE2z21" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2CEQDIE2ysV" role="2Oq$k0">
-                        <node concept="37vLTw" id="2CEQDIE2yq5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2CEQDIE2vLa" resolve="newRole" />
-                        </node>
-                        <node concept="32TBzR" id="2CEQDIE2yAf" role="2OqNvi" />
-                      </node>
-                      <node concept="1uHKPH" id="2CEQDIE2SIe" role="2OqNvi" />
-                    </node>
-                    <node concept="1P9Npp" id="2CEQDIE2TD2" role="2OqNvi">
-                      <node concept="2OqwBi" id="2CEQDIE2TE7" role="1P9ThW">
-                        <node concept="2OqwBi" id="2CEQDIE2TE8" role="2Oq$k0">
-                          <node concept="2OqwBi" id="2CEQDIE2TE9" role="2Oq$k0">
-                            <node concept="37vLTw" id="2CEQDIE2TEa" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2CEQDIE2mv$" resolve="protoRole" />
-                            </node>
-                            <node concept="32TBzR" id="2CEQDIE2TEb" role="2OqNvi" />
-                          </node>
-                          <node concept="1uHKPH" id="2CEQDIE2TEc" role="2OqNvi" />
-                        </node>
-                        <node concept="1$rogu" id="2CEQDIE2TEd" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="2CEQDIE2w7T" role="3clFbw">
-                <node concept="10Nm6u" id="2CEQDIE2w8X" role="3uHU7w" />
-                <node concept="37vLTw" id="2CEQDIE2w4Q" role="3uHU7B">
-                  <ref role="3cqZAo" node="2CEQDIE2vLa" resolve="newRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="2CEQDIE2mv$" role="1Duv9x">
-            <property role="TrG5h" value="protoRole" />
-            <node concept="3Tqbb2" id="2CEQDIE2nHt" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:6$jH9oLmYD_" resolve="Role" />
-            </node>
-          </node>
-          <node concept="2OqwBi" id="2CEQDIE2mvD" role="1DdaDG">
-            <node concept="37vLTw" id="2CEQDIE2mvE" role="2Oq$k0">
-              <ref role="3cqZAo" node="2CEQDIE2hKO" resolve="prototype" />
-            </node>
-            <node concept="3Tsc0h" id="2CEQDIE2mvF" role="2OqNvi">
-              <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2CEQDIE2FME" role="3cqZAp" />
-        <node concept="3clFbF" id="2CEQDIE2hLV" role="3cqZAp">
-          <node concept="37vLTw" id="2CEQDIE2hLW" role="3clFbG">
-            <ref role="3cqZAo" node="2CEQDIE2hLG" resolve="node" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2CEQDIE2qg9" role="3clF45">
-        <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CEQDIE2h$1" role="jymVt" />
-    <node concept="2YIFZL" id="67SsWaEdYHz" role="jymVt">
-      <property role="TrG5h" value="validateWithTemplate" />
-      <node concept="37vLTG" id="67SsWaEdYVI" role="3clF46">
-        <property role="TrG5h" value="tterm" />
-        <node concept="3Tqbb2" id="67SsWaEdYVS" role="1tU5fm">
-          <ref role="ehGHo" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="67SsWaEdYW1" role="3clF46">
-        <property role="TrG5h" value="tpl" />
-        <node concept="3Tqbb2" id="67SsWaEdYWf" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:1pPth$m5o9D" resolve="TypeTermTemplate" />
-        </node>
-      </node>
-      <node concept="17QB3L" id="67SsWaEf2Kj" role="3clF45" />
-      <node concept="3Tm1VV" id="67SsWaEdYHA" role="1B3o_S" />
-      <node concept="3clFbS" id="67SsWaEdYHB" role="3clF47">
-        <node concept="1_o_46" id="67SsWaEe2GB" role="3cqZAp">
-          <node concept="3clFbS" id="67SsWaEe2GC" role="2LFqv$">
-            <node concept="3clFbJ" id="67SsWaEe3My" role="3cqZAp">
-              <property role="TyiWK" value="true" />
-              <property role="TyiWL" value="false" />
-              <node concept="3clFbS" id="67SsWaEe3Mz" role="3clFbx">
-                <node concept="3cpWs6" id="67SsWaEf3OZ" role="3cqZAp">
-                  <node concept="2YIFZM" id="67SsWaEe8yW" role="3cqZAk">
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="Xl_RD" id="67SsWaEe8B2" role="37wK5m">
-                      <property role="Xl_RC" value="name mismatch: %s and %s" />
-                    </node>
-                    <node concept="2OqwBi" id="67SsWaEe8Zc" role="37wK5m">
-                      <node concept="3M$PaV" id="67SsWaEe8UM" role="2Oq$k0">
-                        <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
-                      </node>
-                      <node concept="3TrcHB" id="67SsWaEe9aP" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="67SsWaEe9o$" role="37wK5m">
-                      <node concept="3M$PaV" id="67SsWaEe9kG" role="2Oq$k0">
-                        <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                      </node>
-                      <node concept="3TrcHB" id="67SsWaEe9A6" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="67SsWaEe5Aa" role="3clFbw">
-                <node concept="1eOMI4" id="67SsWaEe5Ai" role="3fr31v">
-                  <node concept="17R0WA" id="67SsWaEe5Ab" role="1eOMHV">
-                    <node concept="2OqwBi" id="67SsWaEe5Ac" role="3uHU7w">
-                      <node concept="3M$PaV" id="67SsWaEe5Ad" role="2Oq$k0">
-                        <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                      </node>
-                      <node concept="3TrcHB" id="67SsWaEe5Ae" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="67SsWaEe5Af" role="3uHU7B">
-                      <node concept="3M$PaV" id="67SsWaEe5Ag" role="2Oq$k0">
-                        <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
-                      </node>
-                      <node concept="3TrcHB" id="67SsWaEe5Ah" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="67SsWaEfuHM" role="3cqZAp" />
-            <node concept="3cpWs8" id="67SsWaEea_A" role="3cqZAp">
-              <node concept="3cpWsn" id="67SsWaEea_D" role="3cpWs9">
-                <property role="TrG5h" value="typeMatches" />
-                <node concept="10P_77" id="67SsWaEea_$" role="1tU5fm" />
-                <node concept="3clFbT" id="67SsWaEeaGD" role="33vP2m">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_3QMa" id="67SsWaEe9JT" role="3cqZAp">
-              <node concept="2OqwBi" id="5Z2pjOGAbNI" role="1_3QMn">
-                <node concept="3M$PaV" id="5Z2pjOGAbKP" role="2Oq$k0">
-                  <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
-                </node>
-                <node concept="2yIwOk" id="5Z2pjOGAcbP" role="2OqNvi" />
-              </node>
-              <node concept="1_3QMl" id="67SsWaEea5d" role="1_3QMm">
-                <node concept="3gn64h" id="67SsWaEeave" role="3Kbmr1">
-                  <ref role="3gnhBz" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                </node>
-                <node concept="3clFbS" id="67SsWaEea5f" role="3Kbo56">
-                  <node concept="3clFbF" id="67SsWaEeaIO" role="3cqZAp">
-                    <node concept="37vLTI" id="67SsWaEeaYi" role="3clFbG">
-                      <node concept="1eOMI4" id="67SsWaEeb2W" role="37vLTx">
-                        <node concept="22lmx$" id="67SsWaEecqQ" role="1eOMHV">
-                          <node concept="2OqwBi" id="67SsWaEecCo" role="3uHU7w">
-                            <node concept="3M$PaV" id="67SsWaEecy4" role="2Oq$k0">
-                              <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                            </node>
-                            <node concept="1mIQ4w" id="67SsWaEecXs" role="2OqNvi">
-                              <node concept="chp4Y" id="67SsWaEed5l" role="cj9EA">
-                                <ref role="cht4Q" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="67SsWaEeb9f" role="3uHU7B">
-                            <node concept="3M$PaV" id="67SsWaEeb6S" role="2Oq$k0">
-                              <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                            </node>
-                            <node concept="1mIQ4w" id="67SsWaEebE9" role="2OqNvi">
-                              <node concept="chp4Y" id="67SsWaEebKR" role="cj9EA">
-                                <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="67SsWaEeaIN" role="37vLTJ">
-                        <ref role="3cqZAo" node="67SsWaEea_D" resolve="typeMatches" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1_3QMl" id="67SsWaEedgk" role="1_3QMm">
-                <node concept="3gn64h" id="67SsWaEednd" role="3Kbmr1">
-                  <ref role="3gnhBz" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                </node>
-                <node concept="3clFbS" id="67SsWaEedgm" role="3Kbo56">
-                  <node concept="3clFbJ" id="67SsWaEeffq" role="3cqZAp">
-                    <node concept="3clFbS" id="67SsWaEeffs" role="3clFbx">
-                      <node concept="3clFbF" id="67SsWaEek5K" role="3cqZAp">
-                        <node concept="37vLTI" id="67SsWaEek5L" role="3clFbG">
-                          <node concept="2OqwBi" id="67SsWaEek5M" role="37vLTx">
-                            <node concept="3M$PaV" id="67SsWaEek5N" role="2Oq$k0">
-                              <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                            </node>
-                            <node concept="1mIQ4w" id="67SsWaEek5O" role="2OqNvi">
-                              <node concept="chp4Y" id="67SsWaEekzi" role="cj9EA">
-                                <ref role="cht4Q" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="67SsWaEek5Q" role="37vLTJ">
-                            <ref role="3cqZAo" node="67SsWaEea_D" resolve="typeMatches" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="67SsWaEejLK" role="3clFbw">
-                      <node concept="2OqwBi" id="67SsWaEehqX" role="2Oq$k0">
-                        <node concept="2OqwBi" id="67SsWaEegdX" role="2Oq$k0">
-                          <node concept="1PxgMI" id="67SsWaEefUS" role="2Oq$k0">
-                            <node concept="3M$PaV" id="67SsWaEefgD" role="1m5AlR">
-                              <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
-                            </node>
-                            <node concept="chp4Y" id="6fXjIfxgneS" role="3oSUPX">
-                              <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                            </node>
-                          </node>
-                          <node concept="3Tsc0h" id="67SsWaEegFL" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                          </node>
-                        </node>
-                        <node concept="1uHKPH" id="67SsWaEeiCA" role="2OqNvi" />
-                      </node>
-                      <node concept="1mIQ4w" id="67SsWaEek4w" role="2OqNvi">
-                        <node concept="chp4Y" id="67SsWaEek4P" role="cj9EA">
-                          <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="9aQIb" id="67SsWaEekGA" role="9aQIa">
-                      <node concept="3clFbS" id="67SsWaEekGB" role="9aQI4">
-                        <node concept="3clFbF" id="67SsWaEedni" role="3cqZAp">
-                          <node concept="37vLTI" id="67SsWaEednj" role="3clFbG">
-                            <node concept="2OqwBi" id="67SsWaEednq" role="37vLTx">
-                              <node concept="3M$PaV" id="67SsWaEednr" role="2Oq$k0">
-                                <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                              </node>
-                              <node concept="1mIQ4w" id="67SsWaEedns" role="2OqNvi">
-                                <node concept="chp4Y" id="67SsWaEedB6" role="cj9EA">
-                                  <ref role="cht4Q" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="67SsWaEednu" role="37vLTJ">
-                              <ref role="3cqZAo" node="67SsWaEea_D" resolve="typeMatches" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="67SsWaEfvwC" role="3cqZAp" />
-            <node concept="3clFbJ" id="67SsWaEele5" role="3cqZAp">
-              <property role="TyiWK" value="true" />
-              <property role="TyiWL" value="false" />
-              <node concept="3clFbS" id="67SsWaEele7" role="3clFbx">
-                <node concept="3cpWs6" id="67SsWaEf5L5" role="3cqZAp">
-                  <node concept="2YIFZM" id="67SsWaEeluI" role="3cqZAk">
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="Xl_RD" id="67SsWaEeluJ" role="37wK5m">
-                      <property role="Xl_RC" value="type mismatch: %s and %s" />
-                    </node>
-                    <node concept="2EnYce" id="67SsWaEem0u" role="37wK5m">
-                      <node concept="2OqwBi" id="6fXjIfxggn5" role="2Oq$k0">
-                        <node concept="2yIwOk" id="6fXjIfxggn6" role="2OqNvi" />
-                        <node concept="3M$PaV" id="67SsWaEeluL" role="2Oq$k0">
-                          <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="6fXjIfxggn7" role="2OqNvi">
-                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="67SsWaEeSBP" role="37wK5m">
-                      <node concept="2OqwBi" id="6fXjIfxgglU" role="2Oq$k0">
-                        <node concept="2yIwOk" id="6fXjIfxgglV" role="2OqNvi" />
-                        <node concept="3M$PaV" id="67SsWaEeluO" role="2Oq$k0">
-                          <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
-                        </node>
-                      </node>
-                      <node concept="3n3YKJ" id="6fXjIfxgglW" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="67SsWaEelrP" role="3clFbw">
-                <node concept="37vLTw" id="67SsWaEelu6" role="3fr31v">
-                  <ref role="3cqZAo" node="67SsWaEea_D" resolve="typeMatches" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1_o_bx" id="67SsWaEe2GD" role="1_o_by">
-            <node concept="2OqwBi" id="67SsWaEe2Mw" role="1_o_bz">
-              <node concept="37vLTw" id="67SsWaEe2JJ" role="2Oq$k0">
-                <ref role="3cqZAo" node="67SsWaEdYVI" resolve="tterm" />
-              </node>
-              <node concept="3Tsc0h" id="67SsWaEe2Uk" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-              </node>
-            </node>
-            <node concept="1_o_bG" id="67SsWaEe2GF" role="1_o_aQ">
-              <property role="TrG5h" value="role" />
-            </node>
-          </node>
-          <node concept="1_o_bx" id="67SsWaEe2UF" role="1_o_by">
-            <node concept="2OqwBi" id="67SsWaEe33N" role="1_o_bz">
-              <node concept="37vLTw" id="67SsWaEe31t" role="2Oq$k0">
-                <ref role="3cqZAo" node="67SsWaEdYW1" resolve="tpl" />
-              </node>
-              <node concept="3Tsc0h" id="67SsWaEe3g2" role="2OqNvi">
-                <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-              </node>
-            </node>
-            <node concept="1_o_bG" id="67SsWaEe2UH" role="1_o_aQ">
-              <property role="TrG5h" value="feature" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="67SsWaEfxfo" role="3cqZAp" />
-        <node concept="3clFbJ" id="67SsWaEf6Kd" role="3cqZAp">
-          <property role="TyiWK" value="true" />
-          <property role="TyiWL" value="false" />
-          <node concept="3clFbS" id="67SsWaEf6Kf" role="3clFbx">
-            <node concept="3cpWs6" id="67SsWaEfhak" role="3cqZAp">
-              <node concept="2YIFZM" id="67SsWaEfhqm" role="3cqZAk">
-                <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <node concept="Xl_RD" id="67SsWaEfh_C" role="37wK5m">
-                  <property role="Xl_RC" value="features size mismatch: %d and %d" />
-                </node>
-                <node concept="2OqwBi" id="67SsWaEfkyI" role="37wK5m">
-                  <node concept="2OqwBi" id="67SsWaEfkyJ" role="2Oq$k0">
-                    <node concept="37vLTw" id="67SsWaEfkyK" role="2Oq$k0">
-                      <ref role="3cqZAo" node="67SsWaEdYVI" resolve="tterm" />
-                    </node>
-                    <node concept="3Tsc0h" id="67SsWaEfkyL" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                    </node>
-                  </node>
-                  <node concept="34oBXx" id="67SsWaEfkyM" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="67SsWaEfl5j" role="37wK5m">
-                  <node concept="2OqwBi" id="67SsWaEfl5k" role="2Oq$k0">
-                    <node concept="37vLTw" id="67SsWaEfl5l" role="2Oq$k0">
-                      <ref role="3cqZAo" node="67SsWaEdYW1" resolve="tpl" />
-                    </node>
-                    <node concept="3Tsc0h" id="67SsWaEfl5m" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                    </node>
-                  </node>
-                  <node concept="34oBXx" id="67SsWaEfl5n" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="67SsWaEfcOX" role="3clFbw">
-            <node concept="2OqwBi" id="67SsWaEfeb1" role="3uHU7w">
-              <node concept="2OqwBi" id="67SsWaEfd0p" role="2Oq$k0">
-                <node concept="37vLTw" id="67SsWaEfcSk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="67SsWaEdYW1" resolve="tpl" />
-                </node>
-                <node concept="3Tsc0h" id="67SsWaEfdcW" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                </node>
-              </node>
-              <node concept="34oBXx" id="67SsWaEfh6z" role="2OqNvi" />
-            </node>
-            <node concept="2OqwBi" id="67SsWaEf86j" role="3uHU7B">
-              <node concept="2OqwBi" id="67SsWaEf74$" role="2Oq$k0">
-                <node concept="37vLTw" id="67SsWaEf717" role="2Oq$k0">
-                  <ref role="3cqZAo" node="67SsWaEdYVI" resolve="tterm" />
-                </node>
-                <node concept="3Tsc0h" id="67SsWaEf7cU" role="2OqNvi">
-                  <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                </node>
-              </node>
-              <node concept="34oBXx" id="67SsWaEfb2q" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="67SsWaEfxxv" role="3cqZAp" />
-        <node concept="3cpWs6" id="67SsWaEe3jW" role="3cqZAp">
-          <node concept="10Nm6u" id="67SsWaEf6xZ" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="67SsWaEdYWA" role="lGtFl">
-        <node concept="TZ5HA" id="67SsWaEdYWB" role="TZ5H$">
-          <node concept="1dT_AC" id="67SsWaEdYWC" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns null if validation succeeds, error string otherwise. " />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="67SsWaEdY_v" role="jymVt" />
-    <node concept="2YIFZL" id="2N2MQGCJx48" role="jymVt">
-      <property role="TrG5h" value="features2roles" />
-      <node concept="37vLTG" id="2N2MQGCJx6x" role="3clF46">
-        <property role="TrG5h" value="features" />
-        <node concept="2I9FWS" id="2N2MQGCJx6F" role="1tU5fm">
-          <ref role="2I9WkF" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="2N2MQGCKnSp" role="1B3o_S" />
-      <node concept="3clFbS" id="2N2MQGCJx4c" role="3clF47">
-        <node concept="3clFbF" id="2N2MQGCJNlm" role="3cqZAp">
-          <node concept="2OqwBi" id="2N2MQGCJRGT" role="3clFbG">
-            <node concept="2OqwBi" id="2N2MQGCJO8g" role="2Oq$k0">
-              <node concept="37vLTw" id="2N2MQGCJNlk" role="2Oq$k0">
-                <ref role="3cqZAo" node="2N2MQGCJx6x" resolve="features" />
-              </node>
-              <node concept="3$u5V9" id="2N2MQGCJRl$" role="2OqNvi">
-                <node concept="1bVj0M" id="2N2MQGCJRlA" role="23t8la">
-                  <node concept="3clFbS" id="2N2MQGCJRlB" role="1bW5cS">
-                    <node concept="3clFbF" id="2N2MQGCJRrI" role="3cqZAp">
-                      <node concept="1rXfSq" id="2N2MQGCJRrH" role="3clFbG">
-                        <ref role="37wK5l" node="2N2MQGCJ_lS" resolve="createFeature" />
-                        <node concept="37vLTw" id="2N2MQGCJRx1" role="37wK5m">
-                          <ref role="3cqZAo" node="2N2MQGCJRlC" resolve="it" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="2N2MQGCJRlC" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2N2MQGCJRlD" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="2N2MQGCK3eT" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="2I9FWS" id="2N2MQGCJCEB" role="3clF45">
-        <ref role="2I9WkF" to="5j4j:6$jH9oLmYD_" resolve="Role" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCJx3v" role="jymVt" />
-    <node concept="2YIFZL" id="2N2MQGCJ_lS" role="jymVt">
-      <property role="TrG5h" value="createFeature" />
-      <node concept="37vLTG" id="2N2MQGCJHIO" role="3clF46">
-        <property role="TrG5h" value="feature" />
-        <node concept="3Tqbb2" id="2N2MQGCJHIY" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:1pPth$m5oa5" resolve="TypeFeature" />
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2N2MQGCJHHb" role="3clF45">
-        <ref role="ehGHo" to="5j4j:6$jH9oLmYD_" resolve="Role" />
-      </node>
-      <node concept="3Tm6S6" id="2N2MQGCJ_na" role="1B3o_S" />
-      <node concept="3clFbS" id="2N2MQGCJ_lW" role="3clF47">
-        <node concept="1_3QMa" id="2N2MQGCJ_p1" role="3cqZAp">
-          <node concept="1_3QMl" id="2N2MQGCJ_V1" role="1_3QMm">
-            <node concept="3gn64h" id="2N2MQGCJ_X6" role="3Kbmr1">
-              <ref role="3gnhBz" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
-            </node>
-            <node concept="3clFbS" id="2N2MQGCJ_V3" role="3Kbo56">
-              <node concept="3cpWs8" id="2N2MQGCJDfH" role="3cqZAp">
-                <node concept="3cpWsn" id="2N2MQGCJDfI" role="3cpWs9">
-                  <property role="TrG5h" value="vr" />
-                  <node concept="3Tqbb2" id="2N2MQGCJDfG" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                  </node>
-                  <node concept="2ShNRf" id="2N2MQGCJDfJ" role="33vP2m">
-                    <node concept="2fJWfE" id="2N2MQGCJDfK" role="2ShVmc">
-                      <node concept="3Tqbb2" id="2N2MQGCJDfL" role="3zrR0E">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJSp$" role="3cqZAp">
-                <node concept="37vLTI" id="2N2MQGCJSYy" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJTdP" role="37vLTx">
-                    <node concept="37vLTw" id="2N2MQGCJT5j" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJTnu" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2N2MQGCJSz9" role="37vLTJ">
-                    <node concept="37vLTw" id="2N2MQGCJSpy" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJDfI" resolve="vr" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJSIb" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="2N2MQGCLkug" role="3cqZAp">
-                <node concept="3cpWsn" id="2N2MQGCLkuh" role="3cpWs9">
-                  <property role="TrG5h" value="val" />
-                  <node concept="3Tqbb2" id="2N2MQGCLkue" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                  </node>
-                  <node concept="2OqwBi" id="2N2MQGCLkui" role="33vP2m">
-                    <node concept="2OqwBi" id="2N2MQGCLkuj" role="2Oq$k0">
-                      <node concept="37vLTw" id="2N2MQGCLkuk" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2N2MQGCJDfI" resolve="vr" />
-                      </node>
-                      <node concept="3Tsc0h" id="2N2MQGCLkul" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="2DeJg1" id="2N2MQGCLkum" role="2OqNvi">
-                      <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJDyZ" role="3cqZAp">
-                <node concept="2OqwBi" id="2N2MQGCLmNV" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCLmgd" role="2Oq$k0">
-                    <node concept="37vLTw" id="2N2MQGCLkun" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCLkuh" resolve="val" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCLmod" role="2OqNvi">
-                      <ref role="3TsBF5" to="5j4j:6$jH9oLmYKA" resolve="value" />
-                    </node>
-                  </node>
-                  <node concept="tyxLq" id="2N2MQGCLn3J" role="2OqNvi">
-                    <node concept="2OqwBi" id="2N2MQGCLn4Z" role="tz02z">
-                      <node concept="1PxgMI" id="2N2MQGCLn50" role="2Oq$k0">
-                        <node concept="37vLTw" id="2N2MQGCLn51" role="1m5AlR">
-                          <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                        </node>
-                        <node concept="chp4Y" id="6fXjIfxgneL" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
-                        </node>
-                      </node>
-                      <node concept="3TrcHB" id="2N2MQGCLn52" role="2OqNvi">
-                        <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="2N2MQGCJI1a" role="3cqZAp">
-                <node concept="37vLTw" id="2N2MQGCJI2R" role="3cqZAk">
-                  <ref role="3cqZAo" node="2N2MQGCJDfI" resolve="vr" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="2N2MQGCJI3s" role="3cqZAp" />
-            </node>
-          </node>
-          <node concept="1_3QMl" id="2N2MQGCJ_V7" role="1_3QMm">
-            <node concept="3gn64h" id="2N2MQGCJ_Xe" role="3Kbmr1">
-              <ref role="3gnhBz" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
-            </node>
-            <node concept="3clFbS" id="2N2MQGCJ_V9" role="3Kbo56">
-              <node concept="3cpWs8" id="2N2MQGCJIbp" role="3cqZAp">
-                <node concept="3cpWsn" id="2N2MQGCJIbq" role="3cpWs9">
-                  <property role="TrG5h" value="vr" />
-                  <node concept="3Tqbb2" id="2N2MQGCJIbr" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                  </node>
-                  <node concept="2ShNRf" id="2N2MQGCJIbs" role="33vP2m">
-                    <node concept="2fJWfE" id="2N2MQGCJIbt" role="2ShVmc">
-                      <node concept="3Tqbb2" id="2N2MQGCJIbu" role="3zrR0E">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJTsc" role="3cqZAp">
-                <node concept="37vLTI" id="2N2MQGCJTsd" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJTse" role="37vLTx">
-                    <node concept="37vLTw" id="2N2MQGCJTsf" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJTsg" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2N2MQGCJTsh" role="37vLTJ">
-                    <node concept="37vLTw" id="2N2MQGCJTsi" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJIbq" resolve="vr" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJTsj" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJIbB" role="3cqZAp">
-                <node concept="2OqwBi" id="2N2MQGCJIbC" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJIbD" role="2Oq$k0">
-                    <node concept="37vLTw" id="2N2MQGCJIbE" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJIbq" resolve="vr" />
-                    </node>
-                    <node concept="3Tsc0h" id="2N2MQGCJIbF" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                    </node>
-                  </node>
-                  <node concept="2DeJg1" id="2N2MQGCJIbG" role="2OqNvi">
-                    <ref role="1A0vxQ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="2N2MQGCJIbH" role="3cqZAp">
-                <node concept="37vLTw" id="2N2MQGCJIbI" role="3cqZAk">
-                  <ref role="3cqZAo" node="2N2MQGCJIbq" resolve="vr" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="2N2MQGCJIeW" role="3cqZAp" />
-            </node>
-          </node>
-          <node concept="1_3QMl" id="2N2MQGCJ_Vl" role="1_3QMm">
-            <node concept="3gn64h" id="2N2MQGCJ_Xm" role="3Kbmr1">
-              <ref role="3gnhBz" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
-            </node>
-            <node concept="3clFbS" id="2N2MQGCJ_Vn" role="3Kbo56">
-              <node concept="3cpWs8" id="2N2MQGCJItd" role="3cqZAp">
-                <node concept="3cpWsn" id="2N2MQGCJIte" role="3cpWs9">
-                  <property role="TrG5h" value="cr" />
-                  <node concept="3Tqbb2" id="2N2MQGCJItc" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                  </node>
-                  <node concept="2ShNRf" id="2N2MQGCJItf" role="33vP2m">
-                    <node concept="2fJWfE" id="2N2MQGCJItg" role="2ShVmc">
-                      <node concept="3Tqbb2" id="2N2MQGCJIth" role="3zrR0E">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJUej" role="3cqZAp">
-                <node concept="37vLTI" id="2N2MQGCJUek" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJUel" role="37vLTx">
-                    <node concept="37vLTw" id="2N2MQGCJUem" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJUen" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2N2MQGCJUeo" role="37vLTJ">
-                    <node concept="37vLTw" id="2N2MQGCJV2g" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJIte" resolve="cr" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJUeq" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJIzq" role="3cqZAp">
-                <node concept="2OqwBi" id="2N2MQGCJJI6" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJIAc" role="2Oq$k0">
-                    <node concept="37vLTw" id="2N2MQGCJIzo" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJIte" resolve="cr" />
-                    </node>
-                    <node concept="3Tsc0h" id="2N2MQGCJJ76" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                    </node>
-                  </node>
-                  <node concept="2DeJg1" id="2N2MQGCJLYf" role="2OqNvi">
-                    <ref role="1A0vxQ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="2N2MQGCJIwv" role="3cqZAp">
-                <node concept="37vLTw" id="2N2MQGCJIti" role="3cqZAk">
-                  <ref role="3cqZAo" node="2N2MQGCJIte" resolve="cr" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="2N2MQGCJIsh" role="3cqZAp" />
-            </node>
-          </node>
-          <node concept="1_3QMl" id="2N2MQGCJ_Xu" role="1_3QMm">
-            <node concept="3gn64h" id="2N2MQGCJ_XM" role="3Kbmr1">
-              <ref role="3gnhBz" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
-            </node>
-            <node concept="3clFbS" id="2N2MQGCJ_Xw" role="3Kbo56">
-              <node concept="3cpWs8" id="2N2MQGCJM0w" role="3cqZAp">
-                <node concept="3cpWsn" id="2N2MQGCJM0x" role="3cpWs9">
-                  <property role="TrG5h" value="cr" />
-                  <node concept="3Tqbb2" id="2N2MQGCJM0y" role="1tU5fm">
-                    <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                  </node>
-                  <node concept="2ShNRf" id="2N2MQGCJM0z" role="33vP2m">
-                    <node concept="2fJWfE" id="2N2MQGCJM0$" role="2ShVmc">
-                      <node concept="3Tqbb2" id="2N2MQGCJM0_" role="3zrR0E">
-                        <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJV9g" role="3cqZAp">
-                <node concept="37vLTI" id="2N2MQGCJV9h" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJV9i" role="37vLTx">
-                    <node concept="37vLTw" id="2N2MQGCJV9j" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJV9k" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2N2MQGCJV9l" role="37vLTJ">
-                    <node concept="37vLTw" id="2N2MQGCJV9m" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJM0x" resolve="cr" />
-                    </node>
-                    <node concept="3TrcHB" id="2N2MQGCJV9n" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2N2MQGCJM0A" role="3cqZAp">
-                <node concept="2OqwBi" id="2N2MQGCJM0B" role="3clFbG">
-                  <node concept="2OqwBi" id="2N2MQGCJM0C" role="2Oq$k0">
-                    <node concept="37vLTw" id="2N2MQGCJM0D" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2N2MQGCJM0x" resolve="cr" />
-                    </node>
-                    <node concept="3Tsc0h" id="2N2MQGCJM0E" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                    </node>
-                  </node>
-                  <node concept="2DeJg1" id="2N2MQGCJM0F" role="2OqNvi">
-                    <ref role="1A0vxQ" to="5j4j:1OShD0HAY6y" resolve="List" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="2N2MQGCJM0G" role="3cqZAp">
-                <node concept="37vLTw" id="2N2MQGCJM0H" role="3cqZAk">
-                  <ref role="3cqZAo" node="2N2MQGCJM0x" resolve="cr" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="5Z2pjOGAcso" role="1_3QMn">
-            <node concept="37vLTw" id="5Z2pjOGAckJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-            </node>
-            <node concept="2yIwOk" id="5Z2pjOGAcFj" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="2N2MQGCJM8D" role="3cqZAp" />
-        <node concept="YS8fn" id="2N2MQGCJMdC" role="3cqZAp">
-          <node concept="2ShNRf" id="2N2MQGCJMgN" role="YScLw">
-            <node concept="1pGfFk" id="2N2MQGCJMrp" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
-              <node concept="3cpWs3" id="2N2MQGCJMJu" role="37wK5m">
-                <node concept="2OqwBi" id="2N2MQGCJMQC" role="3uHU7w">
-                  <node concept="37vLTw" id="2N2MQGCJML_" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
-                  </node>
-                  <node concept="2qgKlT" id="2N2MQGCJN9z" role="2OqNvi">
-                    <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="2N2MQGCJMsU" role="3uHU7B">
-                  <property role="Xl_RC" value="unknown feature: " />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCJx2T" role="jymVt" />
-    <node concept="3Tm1VV" id="2N2MQGCJu8J" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="746Sd4ujSKb">
     <property role="TrG5h" value="RuleTemplateUtil" />
     <node concept="2tJIrI" id="746Sd4ujSOi" role="jymVt" />