From a0bc96b3e0aa78e7c8aeee083324030b3f38b278 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 13 Apr 2020 14:18:07 +0200
Subject: [PATCH] Move all concepts related to term to j.m.coderules.

---
 .../generator/template/main@generator.mps     | 110 +--
 .../languageModels/behavior.mps               | 392 ++++++++
 .../languageModels/constraints.mps            | 198 +++-
 .../languageModels/editor.mps                 | 711 ++++++++++++++-
 .../jetbrains.mps.lang.coderules.analysis.mps |  14 +-
 .../languageModels/migration.mps              |   2 +-
 .../languageModels/structure.mps              | 201 ++++-
 .../languageModels/typesystem.mps             |  44 +
 .../jetbrains.mps.logic.mpl                   |   2 -
 .../languageModels/behavior.mps               | 440 ---------
 .../languageModels/constraints.mps            | 207 +----
 .../languageModels/editor.mps                 | 842 ++----------------
 .../languageModels/migration.mps              |   1 -
 .../languageModels/structure.mps              | 195 +---
 .../languageModels/typesystem.mps             |  36 -
 15 files changed, 1665 insertions(+), 1730 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index c85aa1be..6fac9580 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -19627,12 +19627,12 @@
               <node concept="3clFbF" id="5hSMZ_lNZhG" role="3cqZAp">
                 <node concept="2OqwBi" id="5hSMZ_lNZhH" role="3clFbG">
                   <node concept="3Tsc0h" id="JOGAOsGeIA" role="2OqNvi">
-                    <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
+                    <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
                   </node>
                   <node concept="2OqwBi" id="5hSMZ_lNZhJ" role="2Oq$k0">
                     <node concept="30H73N" id="5hSMZ_lNZhK" role="2Oq$k0" />
                     <node concept="3TrEf2" id="JOGAOsGe7X" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
                     </node>
                   </node>
                 </node>
@@ -19699,7 +19699,7 @@
               <node concept="2OqwBi" id="5hSMZ_lNZiO" role="3clFbG">
                 <node concept="30H73N" id="5hSMZ_lNZiP" role="2Oq$k0" />
                 <node concept="3Tsc0h" id="JOGAOsG9cr" role="2OqNvi">
-                  <ref role="3TtcxE" to="5j4j:JOGAOsxaCx" resolve="contents" />
+                  <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
                 </node>
               </node>
             </node>
@@ -19718,7 +19718,7 @@
               <node concept="2OqwBi" id="5hSMZ_lNZiW" role="3clFbG">
                 <node concept="30H73N" id="5hSMZ_lNZiX" role="2Oq$k0" />
                 <node concept="2qgKlT" id="5hSMZ_lNZiY" role="2OqNvi">
-                  <ref role="37wK5l" to="ha02:4MEOIDG83_h" resolve="runtimeClassName" />
+                  <ref role="37wK5l" to="x5bw:4MEOIDG83_h" resolve="runtimeClassName" />
                 </node>
               </node>
             </node>
@@ -19730,7 +19730,7 @@
     <node concept="2tJIrI" id="JOGAOsG6Mv" role="jymVt" />
     <node concept="3Tm1VV" id="JOGAOsG6LK" role="1B3o_S" />
     <node concept="n94m4" id="JOGAOsG6LL" role="lGtFl">
-      <ref role="n9lRv" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="n9lRv" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
     </node>
     <node concept="17Uvod" id="JOGAOt0ycr" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -19741,7 +19741,7 @@
             <node concept="2OqwBi" id="JOGAOt0zo0" role="3clFbG">
               <node concept="30H73N" id="JOGAOt0z9m" role="2Oq$k0" />
               <node concept="2qgKlT" id="JOGAOt0_6U" role="2OqNvi">
-                <ref role="37wK5l" to="ha02:5hSMZ_lRESV" resolve="runtimeClassName" />
+                <ref role="37wK5l" to="x5bw:5hSMZ_lRESV" resolve="runtimeClassName" />
               </node>
             </node>
           </node>
@@ -19755,10 +19755,10 @@
     <node concept="3lhOvk" id="JOGAOsHmdz" role="3lj3bC">
       <ref role="3lhOvi" node="JOGAOsG6LJ" resolve="_TermTable" />
       <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="dataformtable_class" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
     </node>
     <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
       <node concept="14YyZ8" id="5hSMZ_lfXvV" role="1lVwrX">
         <node concept="14ZrTv" id="5hSMZ_ljA5j" role="14ZwWg">
           <node concept="30G5F_" id="5hSMZ_ljA5k" role="150hEN">
@@ -19768,7 +19768,7 @@
                   <node concept="2OqwBi" id="5hSMZ_ljXuo" role="2Oq$k0">
                     <node concept="30H73N" id="5hSMZ_ljXup" role="2Oq$k0" />
                     <node concept="3Tsc0h" id="JOGAOsGMSJ" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                      <ref role="3TtcxE" to="wq2x:JOGAOsxaC4" resolve="override" />
                     </node>
                   </node>
                   <node concept="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
@@ -19834,13 +19834,13 @@
                                     <node concept="2OqwBi" id="5hSMZ_ljA65" role="v9R3O">
                                       <node concept="30H73N" id="5hSMZ_ljA66" role="2Oq$k0" />
                                       <node concept="3TrEf2" id="JOGAOsGOYN" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="5j4j:JOGAOsxTDm" resolve="getter" />
+                                        <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
                                       </node>
                                     </node>
                                     <node concept="2OqwBi" id="3kjrYXAPA7p" role="v9R3O">
                                       <node concept="30H73N" id="3kjrYXAP_DE" role="2Oq$k0" />
                                       <node concept="3TrEf2" id="JOGAOsGPng" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="5j4j:JOGAOsxTDo" resolve="feature" />
+                                        <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
                                       </node>
                                     </node>
                                   </node>
@@ -19857,7 +19857,7 @@
                                       <node concept="2OqwBi" id="5hSMZ_ljA6j" role="2Oq$k0">
                                         <node concept="30H73N" id="5hSMZ_ljA6k" role="2Oq$k0" />
                                         <node concept="3TrEf2" id="JOGAOsGRPZ" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="5j4j:JOGAOsxTDo" resolve="feature" />
+                                          <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
                                         </node>
                                       </node>
                                       <node concept="3TrcHB" id="5hSMZ_ljA6m" role="2OqNvi">
@@ -19875,7 +19875,7 @@
                                     <node concept="2OqwBi" id="5hSMZ_ljA6r" role="3clFbG">
                                       <node concept="30H73N" id="5hSMZ_ljA6s" role="2Oq$k0" />
                                       <node concept="3Tsc0h" id="JOGAOsGNB4" role="2OqNvi">
-                                        <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                                        <ref role="3TtcxE" to="wq2x:JOGAOsxaC4" resolve="override" />
                                       </node>
                                     </node>
                                   </node>
@@ -19897,7 +19897,7 @@
                                     <node concept="1PxgMI" id="3kjrYXAJAdN" role="2Oq$k0">
                                       <property role="1BlNFB" value="true" />
                                       <node concept="chp4Y" id="JOGAOsGSXE" role="3oSUPX">
-                                        <ref role="cht4Q" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                        <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
                                       </node>
                                       <node concept="2OqwBi" id="3kjrYXAJ$7j" role="1m5AlR">
                                         <node concept="1iwH7S" id="3kjrYXAJz9G" role="2Oq$k0" />
@@ -19905,14 +19905,14 @@
                                           <node concept="2OqwBi" id="3kjrYXAJ$GR" role="12$y8L">
                                             <node concept="30H73N" id="3kjrYXAJ$GS" role="2Oq$k0" />
                                             <node concept="3TrEf2" id="JOGAOsGSEu" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="5j4j:JOGAOsxaC6" resolve="decl" />
+                                              <ref role="3Tt5mk" to="wq2x:JOGAOsxaC6" resolve="decl" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                     <node concept="2qgKlT" id="JOGAOsGXNz" role="2OqNvi">
-                                      <ref role="37wK5l" to="ha02:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                      <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                                     </node>
                                   </node>
                                 </node>
@@ -19951,7 +19951,7 @@
                             <node concept="1PxgMI" id="3kjrYXAJFsq" role="2Oq$k0">
                               <property role="1BlNFB" value="true" />
                               <node concept="chp4Y" id="JOGAOsGY9c" role="3oSUPX">
-                                <ref role="cht4Q" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
                               </node>
                               <node concept="2OqwBi" id="3kjrYXAJFss" role="1m5AlR">
                                 <node concept="1iwH7S" id="3kjrYXAJFst" role="2Oq$k0" />
@@ -19959,14 +19959,14 @@
                                   <node concept="2OqwBi" id="3kjrYXAJFsv" role="12$y8L">
                                     <node concept="30H73N" id="3kjrYXAJFsw" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="JOGAOsGZ4Z" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="5j4j:JOGAOsxaC6" resolve="decl" />
+                                      <ref role="3Tt5mk" to="wq2x:JOGAOsxaC6" resolve="decl" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                             <node concept="2qgKlT" id="JOGAOsGYCo" role="2OqNvi">
-                              <ref role="37wK5l" to="ha02:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                              <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                             </node>
                           </node>
                         </node>
@@ -19985,7 +19985,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="24ciDNzqU8o" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:24ciDNzqIuw" resolve="TermType" />
+      <ref role="30HIoZ" to="wq2x:24ciDNzqIuw" resolve="TermType" />
       <node concept="1Koe21" id="24ciDNzqUp4" role="1lVwrX">
         <node concept="3clFbS" id="24ciDNzqUpa" role="1Koe22">
           <node concept="3cpWs8" id="24ciDNzqUsf" role="3cqZAp">
@@ -20003,15 +20003,15 @@
     <node concept="2rT7sh" id="5hSMZ_lNDE_" role="2rTMjI">
       <property role="TrG5h" value="dataformtable_class" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-      <ref role="2rTdP9" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="2rTdP9" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
     </node>
     <node concept="2rT7sh" id="1L74NXG7ihq" role="2rTMjI">
       <property role="TrG5h" value="dataformfeature_method" />
       <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-      <ref role="2rTdP9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="2rTdP9" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
     </node>
     <node concept="3aamgX" id="4nUKN9YPm7g" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+      <ref role="30HIoZ" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
       <node concept="1Koe21" id="4nUKN9YPm7h" role="1lVwrX">
         <node concept="3clFbS" id="4nUKN9YPm7i" role="1Koe22">
           <node concept="3cpWs8" id="4nUKN9YPm7j" role="3cqZAp">
@@ -20034,13 +20034,13 @@
       <property role="TrG5h" value="prototypeStack" />
       <node concept="2BANLN" id="4lCLOtwvRjl" role="1N15GL">
         <node concept="3Tqbb2" id="4lCLOtwvScp" role="_ZDj9">
-          <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
         </node>
       </node>
     </node>
     <node concept="3aamgX" id="4lCLOtwvW$M" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
       <node concept="1Koe21" id="4lCLOtww00p" role="1lVwrX">
         <node concept="9aQIb" id="4lCLOtww00y" role="1Koe22">
           <node concept="3clFbS" id="4lCLOtww00z" role="9aQI4">
@@ -20053,7 +20053,7 @@
                     <node concept="2OqwBi" id="4vr5SApfugf" role="v9R3O">
                       <node concept="30H73N" id="4vr5SApftWD" role="2Oq$k0" />
                       <node concept="2qgKlT" id="4vr5SApfuvX" role="2OqNvi">
-                        <ref role="37wK5l" to="ha02:4lCLOtww4qi" resolve="prototypesStack" />
+                        <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                       </node>
                     </node>
                   </node>
@@ -20078,7 +20078,7 @@
     </node>
     <node concept="3aamgX" id="4lCLOtwvLkd" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
       <node concept="30G5F_" id="4lCLOtwvMqp" role="30HLyM">
         <node concept="3clFbS" id="4lCLOtwvMqq" role="2VODD2">
           <node concept="3clFbF" id="4lCLOtwvTpG" role="3cqZAp">
@@ -20109,7 +20109,7 @@
                                 <node concept="3cpWsn" id="4vr5SApb_lX" role="3cpWs9">
                                   <property role="TrG5h" value="dfdecl" />
                                   <node concept="3Tqbb2" id="4vr5SApb_kb" role="1tU5fm">
-                                    <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                    <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
                                   </node>
                                   <node concept="2OqwBi" id="4vr5SApb_lY" role="33vP2m">
                                     <node concept="v3LJS" id="4vr5SApb_lZ" role="2Oq$k0">
@@ -20279,7 +20279,7 @@
                       <node concept="2ShNRf" id="4vr5SApbiKh" role="v9R3O">
                         <node concept="2Jqq0_" id="4vr5SApbkxE" role="2ShVmc">
                           <node concept="3Tqbb2" id="4vr5SApbkJK" role="HW$YZ">
-                            <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                            <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -20296,7 +20296,7 @@
     </node>
     <node concept="3aamgX" id="4lCLOtwwaTw" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
       <node concept="30G5F_" id="4lCLOtwwaTx" role="30HLyM">
         <node concept="3clFbS" id="4lCLOtwwaTy" role="2VODD2">
           <node concept="3clFbF" id="4lCLOtwwaTz" role="3cqZAp">
@@ -20329,7 +20329,7 @@
                               <node concept="3clFbF" id="4lCLOtwwaTN" role="3cqZAp">
                                 <node concept="2OqwBi" id="4lCLOtwwaTO" role="3clFbG">
                                   <node concept="2qgKlT" id="4lCLOtwwaTP" role="2OqNvi">
-                                    <ref role="37wK5l" to="ha02:7c96q9t$Nk0" resolve="symbol" />
+                                    <ref role="37wK5l" to="x5bw:7c96q9t$Nk0" resolve="symbol" />
                                   </node>
                                   <node concept="30H73N" id="4lCLOtwwaTQ" role="2Oq$k0" />
                                 </node>
@@ -20349,7 +20349,7 @@
                               <node concept="2OqwBi" id="4vr5SAptSQd" role="3clFbG">
                                 <node concept="30H73N" id="4vr5SAptSBW" role="2Oq$k0" />
                                 <node concept="3TrcHB" id="4vr5SAptT0v" role="2OqNvi">
-                                  <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
+                                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
                                 </node>
                               </node>
                             </node>
@@ -20366,7 +20366,7 @@
                               <node concept="2OqwBi" id="4lCLOtwwaTW" role="3clFbG">
                                 <node concept="30H73N" id="4lCLOtwwaTX" role="2Oq$k0" />
                                 <node concept="2qgKlT" id="4lCLOtwwaTY" role="2OqNvi">
-                                  <ref role="37wK5l" to="ha02:7c96q9tALRr" resolve="valueFeatures" />
+                                  <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                                 </node>
                               </node>
                             </node>
@@ -20410,7 +20410,7 @@
                               <node concept="2OqwBi" id="4lCLOtwwaUg" role="3clFbG">
                                 <node concept="30H73N" id="4lCLOtwwaUh" role="2Oq$k0" />
                                 <node concept="2qgKlT" id="4lCLOtwwaUi" role="2OqNvi">
-                                  <ref role="37wK5l" to="ha02:7c96q9tCSX_" resolve="childFeatures" />
+                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
                                 </node>
                               </node>
                             </node>
@@ -20461,7 +20461,7 @@
     <property role="TrG5h" value="term_feature_override" />
     <node concept="3aamgX" id="3kjrYXAPmgG" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
       <node concept="30G5F_" id="3kjrYXAPmwz" role="30HLyM">
         <node concept="3clFbS" id="3kjrYXAPmw$" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPmBH" role="3cqZAp">
@@ -20471,7 +20471,7 @@
               </node>
               <node concept="1mIQ4w" id="3kjrYXAPndi" role="2OqNvi">
                 <node concept="chp4Y" id="JOGAOsGIOM" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+                  <ref role="cht4Q" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
                 </node>
               </node>
             </node>
@@ -20521,7 +20521,7 @@
     </node>
     <node concept="3aamgX" id="3kjrYXAPsCJ" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
       <node concept="30G5F_" id="3kjrYXAPsCK" role="30HLyM">
         <node concept="3clFbS" id="3kjrYXAPsCL" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPsCM" role="3cqZAp">
@@ -20531,7 +20531,7 @@
               </node>
               <node concept="1mIQ4w" id="3kjrYXAPsCP" role="2OqNvi">
                 <node concept="chp4Y" id="JOGAOsGJpk" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+                  <ref role="cht4Q" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
                 </node>
               </node>
             </node>
@@ -20581,7 +20581,7 @@
     </node>
     <node concept="3aamgX" id="1fvYCPA6Ndu" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
       <node concept="30G5F_" id="1fvYCPA6Ndv" role="30HLyM">
         <node concept="3clFbS" id="1fvYCPA6Ndw" role="2VODD2">
           <node concept="3clFbF" id="1fvYCPA6Ndx" role="3cqZAp">
@@ -20591,7 +20591,7 @@
               </node>
               <node concept="1mIQ4w" id="1fvYCPA6Nd$" role="2OqNvi">
                 <node concept="chp4Y" id="1fvYCPA6Nd_" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+                  <ref role="cht4Q" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
                 </node>
               </node>
             </node>
@@ -20648,7 +20648,7 @@
     <node concept="1N15co" id="3kjrYXAPl_p" role="1s_3oS">
       <property role="TrG5h" value="feature" />
       <node concept="3Tqbb2" id="3kjrYXAPlNR" role="1N15GL">
-        <ref role="ehGHo" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+        <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
       </node>
     </node>
     <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
@@ -20668,7 +20668,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="Lu45F877I6" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
       <node concept="14YyZ8" id="Lu45F8oWCN" role="1lVwrX">
         <node concept="14ZrTv" id="Lu45F8oWOz" role="14ZwWg">
           <node concept="30G5F_" id="Lu45F8oWO$" role="150hEN">
@@ -20678,7 +20678,7 @@
                   <node concept="2OqwBi" id="Lu45F877Iu" role="2Oq$k0">
                     <node concept="30H73N" id="Lu45F877Iv" role="2Oq$k0" />
                     <node concept="3TrEf2" id="Lu45F877Iw" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="Lu45F877Ix" role="2OqNvi" />
@@ -20699,7 +20699,7 @@
                             <node concept="3clFbF" id="Lu45F877If" role="3cqZAp">
                               <node concept="2OqwBi" id="Lu45F877Ig" role="3clFbG">
                                 <node concept="3TrEf2" id="Lu45F877Ih" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                                  <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                                 </node>
                                 <node concept="30H73N" id="Lu45F877Ii" role="2Oq$k0" />
                               </node>
@@ -20767,7 +20767,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="Lu45F8795V" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
       <node concept="14YyZ8" id="Lu45F8iYP0" role="1lVwrX">
         <node concept="14ZrTv" id="Lu45F8iZ0K" role="14ZwWg">
           <node concept="30G5F_" id="Lu45F8iZ0L" role="150hEN">
@@ -20777,7 +20777,7 @@
                   <node concept="2OqwBi" id="Lu45F8796j" role="2Oq$k0">
                     <node concept="30H73N" id="Lu45F8796k" role="2Oq$k0" />
                     <node concept="3TrEf2" id="Lu45F8796l" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="Lu45F8796m" role="2OqNvi" />
@@ -20799,7 +20799,7 @@
                               <node concept="2OqwBi" id="Lu45F87965" role="3clFbG">
                                 <node concept="30H73N" id="Lu45F87966" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="Lu45F87967" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                                  <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                                 </node>
                               </node>
                             </node>
@@ -20866,7 +20866,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="Lu45F87avA" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
       <node concept="14YyZ8" id="Lu45F8gLLG" role="1lVwrX">
         <node concept="14ZrTv" id="1fvYCPA6P$C" role="14ZwWg">
           <node concept="30G5F_" id="1fvYCPA6P$D" role="150hEN">
@@ -20876,7 +20876,7 @@
                   <node concept="2OqwBi" id="1fvYCPA6P$H" role="2Oq$k0">
                     <node concept="30H73N" id="1fvYCPA6P$I" role="2Oq$k0" />
                     <node concept="3TrEf2" id="1fvYCPA6P$J" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                     </node>
                   </node>
                   <node concept="3x8VRR" id="1fvYCPA6P$K" role="2OqNvi" />
@@ -20897,7 +20897,7 @@
                             <node concept="3clFbF" id="1fvYCPA6QJa" role="3cqZAp">
                               <node concept="2OqwBi" id="1fvYCPA6QJb" role="3clFbG">
                                 <node concept="3TrEf2" id="1fvYCPA6QJc" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                                  <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
                                 </node>
                                 <node concept="30H73N" id="1fvYCPA6QJd" role="2Oq$k0" />
                               </node>
@@ -20960,7 +20960,7 @@
     <property role="3GE5qa" value="term" />
     <node concept="3aamgX" id="JOGAOsGlpV" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
       <node concept="gft3U" id="JOGAOsGmnd" role="1lVwrX">
         <node concept="1oi5Wm" id="JOGAOsGmwQ" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -20975,7 +20975,7 @@
             <node concept="2OqwBi" id="JOGAOsGlJj" role="3clFbG">
               <node concept="30H73N" id="JOGAOsGlxi" role="2Oq$k0" />
               <node concept="3TrcHB" id="JOGAOsGma1" role="2OqNvi">
-                <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
+                <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
               </node>
             </node>
           </node>
@@ -20994,7 +20994,7 @@
     <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="term_pattern_feature" />
     <node concept="3aamgX" id="1CcQBrPQapf" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
       <node concept="gft3U" id="1CcQBrPQapg" role="1lVwrX">
         <node concept="1oi5Wm" id="1CcQBrPQaph" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -21019,7 +21019,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1CcQBrPQap_" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
       <node concept="gft3U" id="1CcQBrPQapA" role="1lVwrX">
         <node concept="1oi5ST" id="1CcQBrPQapB" role="gfFT$">
           <property role="TrG5h" value="name" />
@@ -21044,7 +21044,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1fvYCPA6RsP" role="3aUrZf">
-      <ref role="30HIoZ" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
       <node concept="gft3U" id="1fvYCPA6RxW" role="1lVwrX">
         <node concept="1oi5ST" id="1fvYCPA6Ry2" role="gfFT$">
           <property role="TrG5h" value="name" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 2915f4e4..1acf7f93 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -5,6 +5,10 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <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>
@@ -49,12 +53,18 @@
       </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="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
+        <child id="1076505808688" name="condition" index="2$JKZa" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </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" />
@@ -178,6 +188,9 @@
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -218,14 +231,24 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="2526372162255441536" name="jetbrains.mps.baseLanguage.collections.structure.AsUnmodifiableOperation" flags="nn" index="26Dbio" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
+      <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
@@ -1936,5 +1959,374 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="JOGAOsxFgi">
+    <property role="3GE5qa" value="term" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="13i0hz" id="4lCLOtww4qi" role="13h7CS">
+      <property role="TrG5h" value="prototypesStack" />
+      <node concept="3Tm1VV" id="4lCLOtww4qj" role="1B3o_S" />
+      <node concept="2BANLN" id="4lCLOtww4G2" role="3clF45">
+        <node concept="3Tqbb2" id="4lCLOtww4H2" role="_ZDj9">
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4lCLOtww4ql" role="3clF47">
+        <node concept="3cpWs8" id="4lCLOtww5ju" role="3cqZAp">
+          <node concept="3cpWsn" id="4lCLOtww5jv" role="3cpWs9">
+            <property role="TrG5h" value="stack" />
+            <node concept="2BANLN" id="4lCLOtww5ji" role="1tU5fm">
+              <node concept="3Tqbb2" id="4lCLOtww5jl" role="_ZDj9">
+                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="4lCLOtww5jw" role="33vP2m">
+              <node concept="2Jqq0_" id="4lCLOtww5jx" role="2ShVmc">
+                <node concept="3Tqbb2" id="4lCLOtww5jy" role="HW$YZ">
+                  <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4lCLOtww5EW" role="3cqZAp">
+          <node concept="3cpWsn" id="4lCLOtww5EX" role="3cpWs9">
+            <property role="TrG5h" value="prototype" />
+            <node concept="3Tqbb2" id="4lCLOtww5CJ" role="1tU5fm">
+              <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="4lCLOtww5EY" role="33vP2m">
+              <node concept="13iPFW" id="4lCLOtww5EZ" role="2Oq$k0" />
+              <node concept="3TrEf2" id="4lCLOtww5F0" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2$JKZl" id="4lCLOtww5KA" role="3cqZAp">
+          <node concept="3clFbS" id="4lCLOtww5KC" role="2LFqv$">
+            <node concept="3clFbF" id="4lCLOtww69v" role="3cqZAp">
+              <node concept="2OqwBi" id="4lCLOtww7ug" role="3clFbG">
+                <node concept="37vLTw" id="4lCLOtww69u" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4lCLOtww5jv" resolve="stack" />
+                </node>
+                <node concept="2Ke4WJ" id="4lCLOtww8YI" role="2OqNvi">
+                  <node concept="37vLTw" id="4lCLOtww96p" role="25WWJ7">
+                    <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4lCLOtww9bJ" role="3cqZAp">
+              <node concept="37vLTI" id="4lCLOtww9kA" role="3clFbG">
+                <node concept="2OqwBi" id="4lCLOtww9lB" role="37vLTx">
+                  <node concept="37vLTw" id="4lCLOtww9lb" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+                  </node>
+                  <node concept="3TrEf2" id="4lCLOtww9vN" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="4lCLOtww9bH" role="37vLTJ">
+                  <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4lCLOtww5Wm" role="2$JKZa">
+            <node concept="37vLTw" id="4lCLOtww5Lx" role="2Oq$k0">
+              <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+            </node>
+            <node concept="3x8VRR" id="4lCLOtww66w" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="4lCLOtww4I3" role="3cqZAp">
+          <node concept="37vLTw" id="4lCLOtww5jz" role="3clFbG">
+            <ref role="3cqZAo" node="4lCLOtww5jv" resolve="stack" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="7c96q9t$Nk0" role="13h7CS">
+      <property role="TrG5h" value="symbol" />
+      <node concept="3Tm1VV" id="7c96q9t$Nk1" role="1B3o_S" />
+      <node concept="17QB3L" id="7c96q9t$SiM" role="3clF45" />
+      <node concept="3clFbS" id="7c96q9t$Nk3" role="3clF47">
+        <node concept="3cpWs6" id="7c96q9t$QdM" role="3cqZAp">
+          <node concept="2OqwBi" id="7c96q9t$Q_A" role="3cqZAk">
+            <node concept="13iPFW" id="7c96q9t$Qns" role="2Oq$k0" />
+            <node concept="3TrcHB" id="7c96q9t$QMZ" role="2OqNvi">
+              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="7c96q9tALRr" role="13h7CS">
+      <property role="TrG5h" value="valueFeatures" />
+      <node concept="3Tm1VV" id="7c96q9tALRs" role="1B3o_S" />
+      <node concept="A3Dl8" id="7c96q9tAM63" role="3clF45">
+        <node concept="3Tqbb2" id="7c96q9tAM6o" role="A3Ik2">
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7c96q9tALRu" role="3clF47">
+        <node concept="3clFbF" id="7c96q9tIw7w" role="3cqZAp">
+          <node concept="2OqwBi" id="7c96q9tIw7x" role="3clFbG">
+            <node concept="2OqwBi" id="7c96q9tIw7y" role="2Oq$k0">
+              <node concept="13iPFW" id="7c96q9tIw7z" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7c96q9tIw7$" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="7c96q9tIw7_" role="2OqNvi">
+              <ref role="37wK5l" node="5UYwY$H7MGm" resolve="valueFeatures" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="7c96q9tCSX_" role="13h7CS">
+      <property role="TrG5h" value="childFeatures" />
+      <node concept="3Tm1VV" id="7c96q9tCSXA" role="1B3o_S" />
+      <node concept="A3Dl8" id="7c96q9tCSXB" role="3clF45">
+        <node concept="3Tqbb2" id="7c96q9tCSXC" role="A3Ik2">
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7c96q9tCSXD" role="3clF47">
+        <node concept="3clFbF" id="7c96q9tIynM" role="3cqZAp">
+          <node concept="2OqwBi" id="7c96q9tIynN" role="3clFbG">
+            <node concept="2OqwBi" id="7c96q9tIynO" role="2Oq$k0">
+              <node concept="13iPFW" id="7c96q9tIynP" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7c96q9tIynQ" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="7c96q9tLmeG" role="2OqNvi">
+              <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassName" />
+      <node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG83_x" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG83_k" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8lha" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG8moh" role="3clFbG">
+            <node concept="Xl_RD" id="4MEOIDG8mok" role="3uHU7w">
+              <property role="Xl_RC" value="_dataform" />
+            </node>
+            <node concept="2OqwBi" id="4MEOIDG8lrk" role="3uHU7B">
+              <node concept="13iPFW" id="4MEOIDG8lh8" role="2Oq$k0" />
+              <node concept="3TrcHB" id="4MEOIDG8lzW" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="4MEOIDG8lgz" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassFqName" />
+      <node concept="3Tm1VV" id="4MEOIDG8lg$" role="1B3o_S" />
+      <node concept="17QB3L" id="4MEOIDG8lg_" role="3clF45" />
+      <node concept="3clFbS" id="4MEOIDG8lgA" role="3clF47">
+        <node concept="3clFbF" id="4MEOIDG8mMv" role="3cqZAp">
+          <node concept="3cpWs3" id="4MEOIDG8po4" role="3clFbG">
+            <node concept="BsUDl" id="4MEOIDG8pxn" role="3uHU7w">
+              <ref role="37wK5l" node="4MEOIDG83_h" resolve="runtimeClassName" />
+            </node>
+            <node concept="3cpWs3" id="4MEOIDG8oGY" role="3uHU7B">
+              <node concept="2OqwBi" id="4MEOIDG8nA1" role="3uHU7B">
+                <node concept="2OqwBi" id="4MEOIDG8mWD" role="2Oq$k0">
+                  <node concept="13iPFW" id="4MEOIDG8mMt" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
+                    <node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
+                      <node concept="chp4Y" id="JOGAOsX26P" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="JOGAOsXW3x" role="2OqNvi">
+                  <ref role="37wK5l" node="5hSMZ_lRET5" resolve="runtimeClassFqName" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4MEOIDG8oH1" role="3uHU7w">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="JOGAOsxFgj" role="13h7CW">
+      <node concept="3clFbS" id="JOGAOsxFgk" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="JOGAOsxidP">
+    <property role="3GE5qa" value="term" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+    <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassName" />
+      <node concept="3Tm1VV" id="5hSMZ_lRESW" role="1B3o_S" />
+      <node concept="17QB3L" id="5hSMZ_lRESX" role="3clF45" />
+      <node concept="3clFbS" id="5hSMZ_lRESY" role="3clF47">
+        <node concept="3clFbF" id="5hSMZ_lRESZ" role="3cqZAp">
+          <node concept="3cpWs3" id="5hSMZ_lRET0" role="3clFbG">
+            <node concept="Xl_RD" id="5hSMZ_lRET1" role="3uHU7w">
+              <property role="Xl_RC" value="_DFTable" />
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_lRET2" role="3uHU7B">
+              <node concept="13iPFW" id="5hSMZ_lRET3" role="2Oq$k0" />
+              <node concept="3TrcHB" id="5hSMZ_lRET4" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="5hSMZ_lRET5" role="13h7CS">
+      <property role="TrG5h" value="runtimeClassFqName" />
+      <node concept="3Tm1VV" id="5hSMZ_lRET6" role="1B3o_S" />
+      <node concept="17QB3L" id="5hSMZ_lRET7" role="3clF45" />
+      <node concept="3clFbS" id="5hSMZ_lRET8" role="3clF47">
+        <node concept="3clFbF" id="5hSMZ_lRET9" role="3cqZAp">
+          <node concept="3cpWs3" id="5hSMZ_lRETa" role="3clFbG">
+            <node concept="3cpWs3" id="5hSMZ_lRETb" role="3uHU7B">
+              <node concept="2OqwBi" id="5hSMZ_lRETc" role="3uHU7B">
+                <node concept="2OqwBi" id="5hSMZ_lRETd" role="2Oq$k0">
+                  <node concept="13iPFW" id="5hSMZ_lRETe" role="2Oq$k0" />
+                  <node concept="I4A8Y" id="5hSMZ_lRETf" role="2OqNvi" />
+                </node>
+                <node concept="LkI2h" id="5hSMZ_lRETg" role="2OqNvi" />
+              </node>
+              <node concept="Xl_RD" id="5hSMZ_lRETh" role="3uHU7w">
+                <property role="Xl_RC" value="!" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5hSMZ_lRETi" role="3uHU7w">
+              <node concept="13iPFW" id="5hSMZ_lRETj" role="2Oq$k0" />
+              <node concept="2qgKlT" id="5hSMZ_lRETk" role="2OqNvi">
+                <ref role="37wK5l" node="5hSMZ_lRESV" resolve="runtimeClassName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="JOGAOsxidQ" role="13h7CW">
+      <node concept="3clFbS" id="JOGAOsxidR" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="JOGAOsxlgX">
+    <property role="3GE5qa" value="term" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxiLy" resolve="DataFormTemplate" />
+    <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:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5UYwY$H7MGp" role="3clF47">
+        <node concept="3cpWs6" id="5UYwY$H7Rvf" role="3cqZAp">
+          <node concept="2OqwBi" id="5UYwY$H7Tcb" role="3cqZAk">
+            <node concept="2OqwBi" id="5UYwY$H7RAL" role="2Oq$k0">
+              <node concept="13iPFW" id="5UYwY$H7RvB" role="2Oq$k0" />
+              <node concept="3Tsc0h" id="5UYwY$H7RGV" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
+              </node>
+            </node>
+            <node concept="3zZkjj" id="1GNw78$s224" role="2OqNvi">
+              <node concept="1bVj0M" id="1GNw78$s225" role="23t8la">
+                <node concept="3clFbS" id="1GNw78$s226" role="1bW5cS">
+                  <node concept="3clFbF" id="1GNw78$s227" role="3cqZAp">
+                    <node concept="2OqwBi" id="1GNw78$s22d" role="3clFbG">
+                      <node concept="37vLTw" id="1GNw78$s22e" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1GNw78$s22h" resolve="it" />
+                      </node>
+                      <node concept="1mIQ4w" id="1GNw78$s22f" role="2OqNvi">
+                        <node concept="chp4Y" id="JOGAOsxSBD" role="cj9EA">
+                          <ref role="cht4Q" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="1GNw78$s22h" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="1GNw78$s22i" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="5UYwY$H7TrL" role="13h7CS">
+      <property role="TrG5h" value="childFeatures" />
+      <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:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5UYwY$H7TrO" role="3clF47">
+        <node concept="3cpWs6" id="5UYwY$H7TE4" role="3cqZAp">
+          <node concept="2OqwBi" id="5UYwY$H7Vna" role="3cqZAk">
+            <node concept="2OqwBi" id="5UYwY$H7TLS" role="2Oq$k0">
+              <node concept="13iPFW" id="5UYwY$H7TEA" role="2Oq$k0" />
+              <node concept="3Tsc0h" id="5UYwY$H7TRU" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
+              </node>
+            </node>
+            <node concept="3zZkjj" id="1GNw78$s22E" role="2OqNvi">
+              <node concept="1bVj0M" id="1GNw78$s22F" role="23t8la">
+                <node concept="3clFbS" id="1GNw78$s22G" role="1bW5cS">
+                  <node concept="3clFbF" id="1GNw78$s22H" role="3cqZAp">
+                    <node concept="22lmx$" id="5YVpdhev4y1" role="3clFbG">
+                      <node concept="2OqwBi" id="1GNw78$s22I" role="3uHU7B">
+                        <node concept="37vLTw" id="1GNw78$s22J" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
+                        </node>
+                        <node concept="1mIQ4w" id="1GNw78$s22K" role="2OqNvi">
+                          <node concept="chp4Y" id="JOGAOsxSP6" role="cj9EA">
+                            <ref role="cht4Q" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="5YVpdhev4Hh" role="3uHU7w">
+                        <node concept="37vLTw" id="5YVpdhev4Hi" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
+                        </node>
+                        <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
+                          <node concept="chp4Y" id="JOGAOsxT7n" role="cj9EA">
+                            <ref role="cht4Q" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="1GNw78$s22M" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="1GNw78$s22N" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="JOGAOsxlgY" role="13h7CW">
+      <node concept="3clFbS" id="JOGAOsxlgZ" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 1ce25803..4dfd9573 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -6,6 +6,11 @@
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
@@ -19,8 +24,8 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -131,6 +136,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -139,6 +145,7 @@
       </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" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
@@ -155,6 +162,7 @@
       <concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
       <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
       <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
+      <concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
       <concept id="1159285995602" name="jetbrains.mps.lang.constraints.structure.NodeDefaultSearchScope" flags="ng" index="3EP7_v">
         <child id="1159286114227" name="searchScopeFactory" index="3EP$qY" />
       </concept>
@@ -196,6 +204,7 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
@@ -274,6 +283,7 @@
       <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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
   <node concept="1M2fIO" id="6ntBQ9KM5bM">
@@ -2208,5 +2218,191 @@
     <node concept="2tJIrI" id="5itBwM9UyZe" role="jymVt" />
     <node concept="3Tm1VV" id="5itBwM9UyB5" role="1B3o_S" />
   </node>
+  <node concept="1M2fIO" id="JOGAOsxTE1">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1M2myG" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:JOGAOsxTDo" resolve="feature" />
+      <node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfU2" role="2VODD2">
+          <node concept="3cpWs8" id="6fXjIfxgfU3" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
+              <property role="TrG5h" value="dfd" />
+              <node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+              </node>
+              <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
+                <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
+                  <node concept="2rP1CM" id="6fXjIfxgfU8" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
+                    <node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
+                      <node concept="chp4Y" id="JOGAOsxUUx" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                      </node>
+                    </node>
+                    <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="JOGAOsxVjr" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:JOGAOsxaC6" resolve="decl" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6fXjIfxgfUe" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfUf" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfUg" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfUh" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                  <node concept="2OqwBi" id="6fXjIfxgfUi" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfUj" role="2Oq$k0">
+                      <node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="dfd" />
+                      </node>
+                      <node concept="3TrEf2" id="JOGAOsxWhW" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="JOGAOsxW_V" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
+                    </node>
+                  </node>
+                  <node concept="3Tm1VV" id="6fXjIfxgfUp" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfUq" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="6fXjIfxgfUr" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfUs" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfUt" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfUu" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="6fXjIfxgfUv" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfUw" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfUx" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfUy" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="37vLTw" id="6fXjIfxgfUz" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfUt" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnfa" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="6fXjIfxgfU$" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="4vr5SAprtjH">
+    <property role="3GE5qa" value="term" />
+    <ref role="1M2myG" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="1N5Pfh" id="4vr5SAprtjI" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+      <node concept="3dgokm" id="4vr5SAprtjM" role="1N6uqs">
+        <node concept="3clFbS" id="4vr5SAprtjO" role="2VODD2">
+          <node concept="3clFbF" id="4vr5SAprAV$" role="3cqZAp">
+            <node concept="2ShNRf" id="4vr5SAprAVw" role="3clFbG">
+              <node concept="YeOm9" id="4vr5SAprCap" role="2ShVmc">
+                <node concept="1Y3b0j" id="4vr5SAprCas" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                  <node concept="3Tm1VV" id="4vr5SAprCat" role="1B3o_S" />
+                  <node concept="2OqwBi" id="4vr5SAprBxA" role="37wK5m">
+                    <node concept="2OqwBi" id="4vr5SAprBxB" role="2Oq$k0">
+                      <node concept="1PxgMI" id="4vr5SAprBxC" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="4vr5SAprBxD" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                        </node>
+                        <node concept="2OqwBi" id="4vr5SAprBxE" role="1m5AlR">
+                          <node concept="2rP1CM" id="4vr5SAprBxF" role="2Oq$k0" />
+                          <node concept="2Rxl7S" id="4vr5SAprBxG" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="4vr5SAprBxH" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
+                      </node>
+                    </node>
+                    <node concept="3zZkjj" id="4vr5SAprBxI" role="2OqNvi">
+                      <node concept="1bVj0M" id="4vr5SAprBxJ" role="23t8la">
+                        <node concept="3clFbS" id="4vr5SAprBxK" role="1bW5cS">
+                          <node concept="3clFbF" id="4vr5SAprBxL" role="3cqZAp">
+                            <node concept="1Wc70l" id="4vr5SAprBxM" role="3clFbG">
+                              <node concept="2OqwBi" id="4vr5SAprBxN" role="3uHU7w">
+                                <node concept="37vLTw" id="4vr5SAprBxO" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
+                                </node>
+                                <node concept="3TrcHB" id="4vr5SAprBxP" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                                </node>
+                              </node>
+                              <node concept="3y3z36" id="4vr5SAprBxQ" role="3uHU7B">
+                                <node concept="37vLTw" id="4vr5SAprBxR" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
+                                </node>
+                                <node concept="3kakTB" id="4vr5SAprBxS" role="3uHU7w" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="4vr5SAprBxT" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="4vr5SAprBxU" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="4vr5SAprCmQ" role="jymVt">
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="4vr5SAprCmR" role="3clF45" />
+                    <node concept="3Tm1VV" id="4vr5SAprCmS" role="1B3o_S" />
+                    <node concept="37vLTG" id="4vr5SAprCmU" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="4vr5SAprCmV" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="4vr5SAprCmX" role="3clF47">
+                      <node concept="3clFbF" id="4vr5SAprC_k" role="3cqZAp">
+                        <node concept="2OqwBi" id="4vr5SAprD8G" role="3clFbG">
+                          <node concept="1PxgMI" id="4vr5SAprCX0" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="4vr5SAprCZN" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                            <node concept="37vLTw" id="4vr5SAprC_j" role="1m5AlR">
+                              <ref role="3cqZAo" node="4vr5SAprCmU" resolve="child" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="4vr5SAprDhl" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="4vr5SAprCmY" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 8ff4d423..7e6e737d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -5,6 +5,10 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <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>
@@ -21,7 +25,7 @@
     <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="nprl" ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.coderules.constraints)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -417,6 +421,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -451,7 +456,12 @@
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
         <reference id="1139880128956" name="concept" index="1A9B2P" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1966870290088668520" name="jetbrains.mps.lang.smodel.structure.Enum_MembersOperation" flags="ng" index="2ViDtN" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
@@ -459,6 +469,9 @@
       <concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
         <child id="1180031783297" name="conceptArgument" index="2Zo12j" />
       </concept>
+      <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
+        <reference id="3562215692195600259" name="link" index="13MTZf" />
+      </concept>
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -471,6 +484,9 @@
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
+      <concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
+        <reference id="1182511038750" name="concept" index="1j9C0d" />
+      </concept>
       <concept id="1176109685393" name="jetbrains.mps.lang.smodel.structure.Model_RootsIncludingImportedOperation" flags="nn" index="3lApI0">
         <reference id="1176109685394" name="concept" index="3lApI3" />
       </concept>
@@ -492,6 +508,9 @@
       <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>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -557,6 +576,7 @@
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -8178,5 +8198,694 @@
     </node>
     <node concept="382kZG" id="7L5omgeruEj" role="lGtFl" />
   </node>
+  <node concept="24kQdi" id="JOGAOsxiLE">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
+      <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
+        <property role="3F0ifm" value="final" />
+        <ref role="1ERwB7" node="JOGAOsxj5_" resolve="DataFormFeature_final" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <node concept="pkWqt" id="1CcQBrPqjRc" role="pqm2j">
+          <node concept="3clFbS" id="1CcQBrPqjRd" role="2VODD2">
+            <node concept="3clFbF" id="1CcQBrPqjYq" role="3cqZAp">
+              <node concept="2OqwBi" id="1CcQBrPqkc9" role="3clFbG">
+                <node concept="pncrf" id="1CcQBrPqjYp" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1CcQBrPqkxi" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="1CcQBrPqjR5" role="2iSdaV" />
+      <node concept="PMmxH" id="JOGAOsx_Cg" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+      </node>
+      <node concept="3F0A7n" id="JOGAOsx_Ch" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <node concept="A1WHr" id="JOGAOsx_Ci" role="3vIgyS">
+          <ref role="2ZyFGn" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="JOGAOsx_Cj" role="3EZMnx">
+        <node concept="VPM3Z" id="JOGAOsx_Ck" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="l2Vlx" id="JOGAOsx_Cl" role="2iSdaV" />
+        <node concept="3F0ifn" id="JOGAOsx_Cm" role="3EZMnx">
+          <property role="3F0ifm" value="=" />
+        </node>
+        <node concept="3F1sOY" id="JOGAOsx_Cn" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxmrx" resolve="getter" />
+        </node>
+        <node concept="pkWqt" id="JOGAOsx_Co" role="pqm2j">
+          <node concept="3clFbS" id="JOGAOsx_Cp" role="2VODD2">
+            <node concept="3clFbF" id="JOGAOsx_Cq" role="3cqZAp">
+              <node concept="2OqwBi" id="JOGAOsx_Cr" role="3clFbG">
+                <node concept="2OqwBi" id="JOGAOsx_Cs" role="2Oq$k0">
+                  <node concept="pncrf" id="JOGAOsx_Ct" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="JOGAOsx_Cu" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="JOGAOsx_Cv" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1h_SRR" id="JOGAOsxj5_">
+    <property role="TrG5h" value="DataFormFeature_final" />
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1h_SK9" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
+      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
+        <node concept="3clFbS" id="1CcQBrPqIC7" role="2VODD2">
+          <node concept="3clFbF" id="1CcQBrPqJok" role="3cqZAp">
+            <node concept="2OqwBi" id="1CcQBrPqK8t" role="3clFbG">
+              <node concept="2OqwBi" id="1CcQBrPqJwy" role="2Oq$k0">
+                <node concept="0IXxy" id="1CcQBrPqJoj" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1CcQBrPqJF6" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
+                </node>
+              </node>
+              <node concept="tyxLq" id="1CcQBrPqKmJ" role="2OqNvi">
+                <node concept="3clFbT" id="1CcQBrPqKpf" role="tz02z">
+                  <property role="3clFbU" value="false" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="jK8Ss" id="1CcQBrPqICj" role="jK8aL">
+        <node concept="3clFbS" id="1CcQBrPqICk" role="2VODD2">
+          <node concept="3clFbF" id="1CcQBrPqIJx" role="3cqZAp">
+            <node concept="2OqwBi" id="1CcQBrPqIXg" role="3clFbG">
+              <node concept="0IXxy" id="1CcQBrPqIJw" role="2Oq$k0" />
+              <node concept="3TrcHB" id="1CcQBrPqJeO" role="2OqNvi">
+                <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="IW6AY" id="JOGAOsxkwf">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
+      <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
+        <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
+          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="1CcQBrPqlWZ" role="1Qtc8A">
+        <node concept="1hCUdq" id="1CcQBrPqlX0" role="1hCUd6">
+          <node concept="3clFbS" id="1CcQBrPqlX1" role="2VODD2">
+            <node concept="3clFbF" id="1CcQBrPqm5F" role="3cqZAp">
+              <node concept="Xl_RD" id="1CcQBrPqm5E" role="3clFbG">
+                <property role="Xl_RC" value="final" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="1CcQBrPqlX2" role="IWgqQ">
+          <node concept="3clFbS" id="1CcQBrPqlX3" role="2VODD2">
+            <node concept="3clFbF" id="1CcQBrPqnP6" role="3cqZAp">
+              <node concept="2OqwBi" id="1CcQBrPqoCB" role="3clFbG">
+                <node concept="2OqwBi" id="1CcQBrPqnXk" role="2Oq$k0">
+                  <node concept="7Obwk" id="1CcQBrPqnP5" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="1CcQBrPqo7Q" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
+                  </node>
+                </node>
+                <node concept="tyxLq" id="1CcQBrPqoQT" role="2OqNvi">
+                  <node concept="3clFbT" id="1CcQBrPqoUG" role="tz02z">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="1CcQBrPqmmK" role="2jiSrf">
+          <node concept="3clFbS" id="1CcQBrPqmmL" role="2VODD2">
+            <node concept="3clFbF" id="1CcQBrPqmu4" role="3cqZAp">
+              <node concept="3fqX7Q" id="1CcQBrPqnFp" role="3clFbG">
+                <node concept="2OqwBi" id="1CcQBrPqnFr" role="3fr31v">
+                  <node concept="7Obwk" id="1CcQBrPqnFs" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="1CcQBrPqnFt" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1Qtc8_" id="JOGAOsxAMn" role="IW6Ez">
+      <node concept="3cWJ9i" id="JOGAOsxAMo" role="1Qtc8$">
+        <node concept="CtIbL" id="JOGAOsxAMp" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="JOGAOsxAMq" role="1Qtc8A">
+        <node concept="1hCUdq" id="JOGAOsxAMr" role="1hCUd6">
+          <node concept="3clFbS" id="JOGAOsxAMs" role="2VODD2">
+            <node concept="3clFbF" id="JOGAOsxAMt" role="3cqZAp">
+              <node concept="Xl_RD" id="JOGAOsxAMu" role="3clFbG">
+                <property role="Xl_RC" value="=" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="JOGAOsxAMv" role="IWgqQ">
+          <node concept="3clFbS" id="JOGAOsxAMw" role="2VODD2">
+            <node concept="3clFbF" id="JOGAOsxAMx" role="3cqZAp">
+              <node concept="2OqwBi" id="JOGAOsxAMy" role="3clFbG">
+                <node concept="2OqwBi" id="JOGAOsxAMz" role="2Oq$k0">
+                  <node concept="7Obwk" id="JOGAOsxAM$" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="JOGAOsxAM_" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxmrx" resolve="getter" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="JOGAOsxAMA" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="JOGAOsxTDr">
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
+      <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:JOGAOsxTDo" resolve="feature" />
+        <node concept="1sVBvm" id="1L74NXFMBUe" role="1sWHZn">
+          <node concept="3F0A7n" id="1L74NXFMBUl" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <ref role="1k5W1q" to="qgy9:4bWqD4C9OIl" resolve="TermFeatureOverride" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="7LZcKzBBdCO" role="3EZMnx">
+        <property role="3F0ifm" value=":" />
+        <node concept="11L4FC" id="7LZcKzBBqUE" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F1sOY" id="1L74NXFMBX2" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:JOGAOsxTDm" resolve="getter" />
+      </node>
+      <node concept="l2Vlx" id="1L74NXFMBU8" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="JOGAOsxX6Q">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+    <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
+      <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
+      <node concept="1iCGBv" id="5hSMZ_l942J" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:JOGAOsxaC6" resolve="decl" />
+        <node concept="1sVBvm" id="5hSMZ_l942L" role="1sWHZn">
+          <node concept="3F0A7n" id="5hSMZ_l94mH" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <ref role="1k5W1q" to="qgy9:4bWqD4C2vDI" resolve="Term" />
+          </node>
+        </node>
+      </node>
+      <node concept="3EZMnI" id="1L74NXFNJ0S" role="3EZMnx">
+        <node concept="VPM3Z" id="1L74NXFNJ0U" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="l2Vlx" id="1L74NXFNJ0X" role="2iSdaV" />
+        <node concept="3F0ifn" id="1L74NXFNj3F" role="3EZMnx">
+          <property role="3F0ifm" value="(" />
+          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+        </node>
+        <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxaC4" resolve="override" />
+          <node concept="l2Vlx" id="1L74NXFNj7z" role="2czzBx" />
+          <node concept="lj46D" id="1L74NXFNj9o" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="2o9xnK" id="1L74NXFPnXQ" role="2gpyvW">
+            <node concept="3clFbS" id="1L74NXFPnXR" role="2VODD2">
+              <node concept="3clFbF" id="1L74NXFPoax" role="3cqZAp">
+                <node concept="Xl_RD" id="1L74NXFPoaw" role="3clFbG" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F0ifn" id="Lu45F8B7eI" role="2czzBI">
+            <property role="3F0ifm" value="" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="1L74NXFNj3T" role="3EZMnx">
+          <property role="3F0ifm" value=")" />
+          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="3p36aQ" id="JOGAOsxYtS">
+    <property role="3GE5qa" value="term" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+    <node concept="2F$Pav" id="7XmdqtdOhCF" role="3ft7WO">
+      <node concept="3eGOop" id="7XmdqtdOhD8" role="2$S_pN">
+        <node concept="ucgPf" id="7XmdqtdOhDa" role="3aKz83">
+          <node concept="3clFbS" id="7XmdqtdOhDc" role="2VODD2">
+            <node concept="3cpWs8" id="7XmdqtdOxrU" role="3cqZAp">
+              <node concept="3cpWsn" id="7XmdqtdOxrV" role="3cpWs9">
+                <property role="TrG5h" value="df" />
+                <node concept="3Tqbb2" id="7XmdqtdOxrT" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                </node>
+                <node concept="2ShNRf" id="7XmdqtdOxrW" role="33vP2m">
+                  <node concept="3zrR0B" id="7XmdqtdOxrX" role="2ShVmc">
+                    <node concept="3Tqbb2" id="7XmdqtdOxrY" role="3zrR0E">
+                      <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7XmdqtdOwqy" role="3cqZAp">
+              <node concept="2OqwBi" id="7XmdqtdOy$8" role="3clFbG">
+                <node concept="2OqwBi" id="7XmdqtdOxL6" role="2Oq$k0">
+                  <node concept="37vLTw" id="7XmdqtdOxrZ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
+                  </node>
+                  <node concept="3TrEf2" id="JOGAOsy1U2" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaC6" resolve="decl" />
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="7XmdqtdOyM9" role="2OqNvi">
+                  <node concept="2ZBlsa" id="7XmdqtdOzev" role="2oxUTC" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7XmdqtdOzwb" role="3cqZAp">
+              <node concept="37vLTw" id="7XmdqtdOzw9" role="3clFbG">
+                <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="7XmdqtdOhCX" role="2ZBHrp">
+        <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      </node>
+      <node concept="2$S_p_" id="7XmdqtdOhHi" role="2$S_pT">
+        <node concept="3clFbS" id="7XmdqtdOhHj" role="2VODD2">
+          <node concept="3clFbF" id="7XmdqtdOrin" role="3cqZAp">
+            <node concept="2OqwBi" id="7XmdqtdOu4E" role="3clFbG">
+              <node concept="2OqwBi" id="7XmdqtdOrx1" role="2Oq$k0">
+                <node concept="1rpKSd" id="7XmdqtdOril" role="2Oq$k0" />
+                <node concept="1j9C0f" id="7XmdqtdOrJl" role="2OqNvi">
+                  <ref role="1j9C0d" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                </node>
+              </node>
+              <node concept="13MTOL" id="JOGAOsy1e8" role="2OqNvi">
+                <ref role="13MTZf" to="wq2x:JOGAOsxaCx" resolve="contents" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="IW6AY" id="JOGAOsxCR1">
+    <property role="3GE5qa" value="term" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="1Qtc8_" id="4vr5SApqcy2" role="IW6Ez">
+      <node concept="3cWJ9i" id="4vr5SApqcOk" role="1Qtc8$">
+        <node concept="CtIbL" id="4vr5SApqcOm" role="CtIbM">
+          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="4vr5SApqdtK" role="1Qtc8A">
+        <node concept="1hCUdq" id="4vr5SApqdtL" role="1hCUd6">
+          <node concept="3clFbS" id="4vr5SApqdtM" role="2VODD2">
+            <node concept="3clFbF" id="4vr5SApqiha" role="3cqZAp">
+              <node concept="Xl_RD" id="4vr5SApqih9" role="3clFbG">
+                <property role="Xl_RC" value="open" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="4vr5SApqdtN" role="IWgqQ">
+          <node concept="3clFbS" id="4vr5SApqdtO" role="2VODD2">
+            <node concept="3clFbF" id="4vr5SApqjZs" role="3cqZAp">
+              <node concept="2OqwBi" id="4vr5SApqkCU" role="3clFbG">
+                <node concept="2OqwBi" id="4vr5SApqk7W" role="2Oq$k0">
+                  <node concept="7Obwk" id="4vr5SApqjZr" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="4vr5SApqkkh" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                  </node>
+                </node>
+                <node concept="tyxLq" id="4vr5SApqkSb" role="2OqNvi">
+                  <node concept="3clFbT" id="4vr5SApqkU2" role="tz02z">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="4vr5SApqiif" role="2jiSrf">
+          <node concept="3clFbS" id="4vr5SApqiig" role="2VODD2">
+            <node concept="3clFbF" id="4vr5SApqimm" role="3cqZAp">
+              <node concept="3fqX7Q" id="4vr5SApqiNL" role="3clFbG">
+                <node concept="2OqwBi" id="4vr5SApqiNN" role="3fr31v">
+                  <node concept="7Obwk" id="4vr5SApqiNO" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="4vr5SApqiNP" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1Qtc8_" id="7c96q9tzBpk" role="IW6Ez">
+      <node concept="3cWJ9i" id="7c96q9tzBpo" role="1Qtc8$">
+        <node concept="CtIbL" id="7c96q9tzBpq" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="1GhOrh" id="7c96q9tzBEG" role="1Qtc8A">
+        <node concept="1GhMSn" id="7c96q9tzBEH" role="1GhOrs">
+          <node concept="3clFbS" id="7c96q9tzBEI" role="2VODD2">
+            <node concept="3clFbF" id="7c96q9tzBTp" role="3cqZAp">
+              <node concept="2OqwBi" id="7c96q9tzG9T" role="3clFbG">
+                <node concept="2OqwBi" id="7c96q9tzDQK" role="2Oq$k0">
+                  <node concept="1PxgMI" id="7c96q9tzDxt" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                    </node>
+                    <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
+                      <node concept="7Obwk" id="7c96q9tzBTo" role="2Oq$k0" />
+                      <node concept="2Rxl7S" id="7c96q9tzCw$" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="JOGAOsxE0L" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="7c96q9tzR0w" role="2OqNvi">
+                  <node concept="1bVj0M" id="7c96q9tzR0y" role="23t8la">
+                    <node concept="3clFbS" id="7c96q9tzR0z" role="1bW5cS">
+                      <node concept="3clFbF" id="7c96q9tzR0$" role="3cqZAp">
+                        <node concept="1Wc70l" id="4vr5SApr8jn" role="3clFbG">
+                          <node concept="2OqwBi" id="4vr5SApr8BG" role="3uHU7w">
+                            <node concept="37vLTw" id="4vr5SApr8n_" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
+                            </node>
+                            <node concept="3TrcHB" id="4vr5SApr93N" role="2OqNvi">
+                              <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                            </node>
+                          </node>
+                          <node concept="3y3z36" id="7c96q9tzR0_" role="3uHU7B">
+                            <node concept="37vLTw" id="7c96q9tzR0B" role="3uHU7B">
+                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
+                            </node>
+                            <node concept="7Obwk" id="7c96q9tzR0A" role="3uHU7w" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7c96q9tzR0C" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="7c96q9tzR0D" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWgqT" id="7c96q9tzRbb" role="1GhOri">
+          <node concept="1hCUdq" id="7c96q9tzRbd" role="1hCUd6">
+            <node concept="3clFbS" id="7c96q9tzRbf" role="2VODD2">
+              <node concept="3clFbF" id="7c96q9tzSTy" role="3cqZAp">
+                <node concept="3cpWs3" id="7c96q9tzU1a" role="3clFbG">
+                  <node concept="2OqwBi" id="7c96q9tzUuJ" role="3uHU7w">
+                    <node concept="2ZBlsa" id="7c96q9tzU9N" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="7c96q9tzUM7" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="7c96q9tzSTx" role="3uHU7B">
+                    <property role="Xl_RC" value=":" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="IWg2L" id="7c96q9tzRbh" role="IWgqQ">
+            <node concept="3clFbS" id="7c96q9tzRbj" role="2VODD2">
+              <node concept="3clFbF" id="7c96q9tzRuk" role="3cqZAp">
+                <node concept="2OqwBi" id="7c96q9tzSoV" role="3clFbG">
+                  <node concept="2OqwBi" id="7c96q9tzRSM" role="2Oq$k0">
+                    <node concept="7Obwk" id="7c96q9tzRuj" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7c96q9tzS3S" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="7c96q9tzSBG" role="2OqNvi">
+                    <node concept="2ZBlsa" id="7c96q9tzSGf" role="2oxUTC" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tqbb2" id="7c96q9tzBJN" role="2ZBHrp">
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="JOGAOsxEW6">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
+      <node concept="3F0ifn" id="4vr5SApqlad" role="3EZMnx">
+        <property role="3F0ifm" value="open" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1ERwB7" node="4vr5SAprGdP" resolve="DataForm_open_DELETE" />
+        <node concept="pkWqt" id="4vr5SApqlag" role="pqm2j">
+          <node concept="3clFbS" id="4vr5SApqlah" role="2VODD2">
+            <node concept="3clFbF" id="4vr5SApqlas" role="3cqZAp">
+              <node concept="2OqwBi" id="4vr5SApqloG" role="3clFbG">
+                <node concept="pncrf" id="4vr5SApqlar" role="2Oq$k0" />
+                <node concept="3TrcHB" id="4vr5SApql_h" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0A7n" id="4MEOIDFttNA" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <ref role="1k5W1q" to="qgy9:4bWqD4C2vDI" resolve="Term" />
+        <node concept="A1WHr" id="7c96q9tzV90" role="3vIgyS">
+          <ref role="2ZyFGn" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="7c96q9t$nwo" role="3EZMnx">
+        <node concept="VPM3Z" id="7c96q9t$nwq" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="7c96q9t$nEV" role="3EZMnx">
+          <property role="3F0ifm" value=":" />
+        </node>
+        <node concept="1iCGBv" id="7c96q9t$nF1" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+          <node concept="1sVBvm" id="7c96q9t$nF3" role="1sWHZn">
+            <node concept="3F0A7n" id="7c96q9t$nFb" role="2wV5jI">
+              <property role="1Intyy" value="true" />
+              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            </node>
+          </node>
+        </node>
+        <node concept="l2Vlx" id="7c96q9t$nwt" role="2iSdaV" />
+        <node concept="pkWqt" id="7c96q9t$nFe" role="pqm2j">
+          <node concept="3clFbS" id="7c96q9t$nFf" role="2VODD2">
+            <node concept="3clFbF" id="7c96q9t$nMs" role="3cqZAp">
+              <node concept="2OqwBi" id="7c96q9t$oYZ" role="3clFbG">
+                <node concept="2OqwBi" id="7c96q9t$o0b" role="2Oq$k0">
+                  <node concept="pncrf" id="7c96q9t$nMr" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="7c96q9t$owX" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaCh" resolve="prototype" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="7c96q9t$p$B" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F1sOY" id="4MEOIDFttOZ" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:JOGAOsxaCc" resolve="template" />
+      </node>
+      <node concept="l2Vlx" id="4MEOIDFttNs" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="1h_SRR" id="4vr5SAprGdP">
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="DataForm_open_DELETE" />
+    <ref role="1h_SK9" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="1hA7zw" id="4vr5SAprGdQ" role="1h_SK8">
+      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <node concept="1hAIg9" id="4vr5SAprGdR" role="1hA7z_">
+        <node concept="3clFbS" id="4vr5SAprGdS" role="2VODD2">
+          <node concept="3clFbF" id="4vr5SAprGe9" role="3cqZAp">
+            <node concept="2OqwBi" id="4vr5SAprGRk" role="3clFbG">
+              <node concept="2OqwBi" id="4vr5SAprGmD" role="2Oq$k0">
+                <node concept="0IXxy" id="4vr5SAprGe8" role="2Oq$k0" />
+                <node concept="3TrcHB" id="4vr5SAprGyF" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                </node>
+              </node>
+              <node concept="tyxLq" id="4vr5SAprH6J" role="2OqNvi">
+                <node concept="3clFbT" id="4vr5SAprH8A" role="tz02z" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="JOGAOsxaCz">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+    <node concept="3EZMnI" id="5hSMZ_lNwqE" role="2wV5jI">
+      <node concept="3EZMnI" id="5hSMZ_lNwqF" role="3EZMnx">
+        <node concept="VPM3Z" id="5hSMZ_lNwqG" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="PMmxH" id="5hSMZ_lNwqH" role="3EZMnx">
+          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        </node>
+        <node concept="3F0A7n" id="5hSMZ_lNwqI" role="3EZMnx">
+          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        </node>
+        <node concept="3F0ifn" id="5hSMZ_lNwqJ" role="3EZMnx">
+          <property role="3F0ifm" value=" " />
+          <node concept="VPxyj" id="5hSMZ_lNwqK" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPM3Z" id="5hSMZ_lNwqL" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="pVoyu" id="5hSMZ_lNwqM" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="5hSMZ_lNwqN" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="5hSMZ_lNwqO" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="5hSMZ_lNwrb" role="3EZMnx">
+        <node concept="VPM3Z" id="5hSMZ_lNwrc" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F2HdR" id="5hSMZ_lNwrd" role="3EZMnx">
+          <property role="2czwfO" value=" " />
+          <ref role="1NtTu8" to="wq2x:JOGAOsxaCx" resolve="contents" />
+          <node concept="pj6Ft" id="5hSMZ_lNwre" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="l2Vlx" id="5hSMZ_lNwrf" role="2czzBx" />
+          <node concept="tppnM" id="4bWqD4CjBOI" role="sWeuL">
+            <node concept="ljvvj" id="4bWqD4CjBOK" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="l2Vlx" id="5hSMZ_lNwrg" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="5hSMZ_lNwrh" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="JOGAOsxlgm">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxiLy" resolve="DataFormTemplate" />
+    <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
+      <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
+      </node>
+      <node concept="3F2HdR" id="1pPth$m6c09" role="3EZMnx">
+        <property role="2czwfO" value=" " />
+        <ref role="1NtTu8" to="wq2x:JOGAOsxiLz" resolve="feature" />
+        <node concept="l2Vlx" id="1pPth$m6c0b" role="2czzBx" />
+        <node concept="lj46D" id="4MEOIDFC6i4" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="4MEOIDFC6kS" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="tppnM" id="1pPth$m6pwx" role="sWeuL">
+          <node concept="ljvvj" id="1pPth$m6pwB" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="7c96q9tVi07" role="2czzBI">
+          <property role="3F0ifm" value="" />
+          <property role="ilYzB" value="&lt;no features&gt;" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1pPth$m6c01" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
+        <node concept="pVoyu" id="4MEOIDFC6ny" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="1pPth$m6bZR" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4nUKN9YPlxW">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
+    <node concept="3EZMnI" id="4nUKN9YPlxY" role="2wV5jI">
+      <node concept="PMmxH" id="4nUKN9YPlxZ" role="3EZMnx">
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="l2Vlx" id="4nUKN9YPly0" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="24ciDNzqIwf">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="wq2x:24ciDNzqIuw" resolve="TermType" />
+    <node concept="3EZMnI" id="24ciDNzqIwk" role="2wV5jI">
+      <node concept="PMmxH" id="24ciDNzqIwr" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+      </node>
+      <node concept="l2Vlx" id="24ciDNzqIwn" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index d6e5cfa1..1ccdb53a 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -4732,7 +4732,7 @@
               <node concept="2OqwBi" id="5VJ3UjC9usA" role="3uHU7B">
                 <node concept="1mIQ4w" id="5VJ3UjC9uDf" role="2OqNvi">
                   <node concept="chp4Y" id="5VJ3UjC9uG6" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="5VJ3UjCclRj" role="2Oq$k0">
@@ -4742,7 +4742,7 @@
               <node concept="2OqwBi" id="5VJ3UjC9v9s" role="3uHU7w">
                 <node concept="1mIQ4w" id="5VJ3UjC9v9w" role="2OqNvi">
                   <node concept="chp4Y" id="5VJ3UjC9v9x" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="5VJ3UjCcm8F" role="2Oq$k0">
@@ -4757,7 +4757,7 @@
                   <node concept="1PxgMI" id="5VJ3UjC9GQV" role="37wK5m">
                     <property role="1BlNFB" value="true" />
                     <node concept="chp4Y" id="5VJ3UjC9GQW" role="3oSUPX">
-                      <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
                     </node>
                     <node concept="37vLTw" id="5VJ3UjCcoBD" role="1m5AlR">
                       <ref role="3cqZAo" node="1RMe_qTgvnI" resolve="l" />
@@ -4766,7 +4766,7 @@
                   <node concept="1PxgMI" id="5VJ3UjC9CbJ" role="37wK5m">
                     <property role="1BlNFB" value="true" />
                     <node concept="chp4Y" id="5VJ3UjC9EYR" role="3oSUPX">
-                      <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
                     </node>
                     <node concept="37vLTw" id="5VJ3UjCcsl2" role="1m5AlR">
                       <ref role="3cqZAo" node="1RMe_qTgtzY" resolve="r" />
@@ -5261,7 +5261,7 @@
               </node>
               <node concept="1mIQ4w" id="5VJ3UjC8x4C" role="2OqNvi">
                 <node concept="chp4Y" id="5VJ3UjC8xa6" role="cj9EA">
-                  <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+                  <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
                 </node>
               </node>
             </node>
@@ -5363,13 +5363,13 @@
       <node concept="37vLTG" id="5VJ3UjC8TZG" role="3clF46">
         <property role="TrG5h" value="df1" />
         <node concept="3Tqbb2" id="5VJ3UjC8TZH" role="1tU5fm">
-          <ref role="ehGHo" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
         </node>
       </node>
       <node concept="37vLTG" id="5VJ3UjC8TZI" role="3clF46">
         <property role="TrG5h" value="df2" />
         <node concept="3Tqbb2" id="5VJ3UjC8TZJ" role="1tU5fm">
-          <ref role="ehGHo" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
         </node>
       </node>
       <node concept="3clFbS" id="5VJ3UjC8TZK" role="3clF47">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 603a6bd6..b10e96d0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -2410,7 +2410,7 @@
                             </node>
                           </node>
                           <node concept="1_qnLN" id="4nUKN9YQ2HT" role="2OqNvi">
-                            <ref role="1_rbq0" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+                            <ref role="1_rbq0" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
                           </node>
                         </node>
                       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index d2580963..8011cec5 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -4,6 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -11,7 +12,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -28,6 +29,13 @@
         <child id="6491077959632463286" name="oldProperty" index="3l_iP" />
       </concept>
       <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
+      <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
+        <property id="7862711839422615217" name="text" index="t5JxN" />
+        <child id="7862711839422615224" name="seeAlso" index="t5JxU" />
+      </concept>
+      <concept id="7862711839422615221" name="jetbrains.mps.lang.structure.structure.DocumentationObjectiveRef" flags="ng" index="t5JxR">
+        <reference id="7862711839422615222" name="target" index="t5JxO" />
+      </concept>
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -1848,5 +1856,196 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="1TIwiD" id="JOGAOsxm2z">
+    <property role="EcuMT" value="861509610434289827" />
+    <property role="TrG5h" value="ChildFeature" />
+    <property role="34LRSv" value="child" />
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5vf" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of child term." />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxiL_">
+    <property role="EcuMT" value="861509610434276453" />
+    <property role="TrG5h" value="DataFormFeature" />
+    <property role="R5$K7" value="true" />
+    <property role="R5$K2" value="false" />
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="JOGAOsxiLC" role="1TKVEl">
+      <property role="IQ2nx" value="861509610434276456" />
+      <property role="TrG5h" value="final" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
+    <node concept="PrWs8" id="JOGAOsxiLA" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="1TJgyj" id="JOGAOsxmrx" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434291425" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="getter" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uK" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermFeature!! Defines a term feature." />
+      <node concept="t5JxR" id="3MfP0fwg5vc" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxiLy" resolve="DataFormTemplate" />
+      </node>
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxTDl">
+    <property role="EcuMT" value="861509610434435669" />
+    <property role="3GE5qa" value="term.feature" />
+    <property role="TrG5h" value="DataFormFeatureOverride" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxTDo" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434435672" />
+      <property role="20kJfa" value="feature" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    </node>
+    <node concept="1TJgyj" id="JOGAOsxTDm" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434435670" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="getter" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uI" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermFeatureOverride!! Allows to override default feature value in term constructor" />
+      <node concept="t5JxR" id="3MfP0fwg5uX" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+      </node>
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxpXw">
+    <property role="EcuMT" value="861509610434305888" />
+    <property role="3GE5qa" value="term.feature" />
+    <property role="TrG5h" value="ListFeature" />
+    <property role="34LRSv" value="list" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5w7" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of a list of child terms." />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxnj6">
+    <property role="EcuMT" value="861509610434294982" />
+    <property role="TrG5h" value="ValueFeature" />
+    <property role="34LRSv" value="value" />
+    <property role="3GE5qa" value="term.feature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5w9" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of an Object value." />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxanH">
+    <property role="EcuMT" value="861509610434242029" />
+    <property role="TrG5h" value="DataFormConstructor" />
+    <property role="3GE5qa" value="term" />
+    <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+    <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243078" />
+      <property role="20kJfa" value="decl" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+    </node>
+    <node concept="1TJgyj" id="JOGAOsxaC4" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243076" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="override" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uG" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermConstructor!! Creates a term using the template. Enables to override features." />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxaC9">
+    <property role="EcuMT" value="861509610434243081" />
+    <property role="TrG5h" value="DataFormDeclaration" />
+    <property role="3GE5qa" value="term" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="4vr5SApqc6O" role="1TKVEl">
+      <property role="IQ2nx" value="5177758076344254900" />
+      <property role="TrG5h" value="open" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
+    <node concept="1TJgyj" id="JOGAOsxaCc" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243084" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="template" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="JOGAOsxiLy" resolve="DataFormTemplate" />
+    </node>
+    <node concept="PrWs8" id="JOGAOsxaCa" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="1TJgyj" id="JOGAOsxaCh" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243089" />
+      <property role="20kJfa" value="prototype" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uQ" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermDeclaration!! Contains term template. Provides possibility to extend another term declaration." />
+      <node concept="t5JxR" id="3MfP0fwg5v7" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxaCw" resolve="DataFormTable" />
+      </node>
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxaCw">
+    <property role="EcuMT" value="861509610434243104" />
+    <property role="TrG5h" value="DataFormTable" />
+    <property role="34LRSv" value="DataForm Table" />
+    <property role="19KtqR" value="true" />
+    <property role="3GE5qa" value="term" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243105" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="contents" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+    </node>
+    <node concept="PrWs8" id="JOGAOsxfAQ" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uO" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermTable!! Contains term declarations." />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxiLy">
+    <property role="EcuMT" value="861509610434276450" />
+    <property role="TrG5h" value="DataFormTemplate" />
+    <property role="3GE5qa" value="term" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434276451" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="feature" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5uM" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermTemplate!! Defines a term structure by enumerating features." />
+      <node concept="t5JxR" id="3MfP0fwg5v2" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+      </node>
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4nUKN9YPlxw">
+    <property role="EcuMT" value="5042557354438383712" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="TermListType" />
+    <property role="34LRSv" value="termlist" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
+  </node>
+  <node concept="1TIwiD" id="24ciDNzqIuw">
+    <property role="EcuMT" value="2381360340662937504" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="TermType" />
+    <property role="34LRSv" value="term" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index a387b052..7669d863 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -3,6 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="4" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
@@ -15,6 +18,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -139,6 +143,11 @@
         <child id="1185805056450" name="argument" index="nvjzm" />
         <child id="1205761991995" name="argumentRepresentator" index="2X0Ygz" />
       </concept>
+      <concept id="1175147569072" name="jetbrains.mps.lang.typesystem.structure.AbstractSubtypingRule" flags="ig" index="2sgdUx">
+        <property id="1175607673137" name="isWeak" index="2RFo0w" />
+        <child id="1175147624276" name="body" index="2sgrp5" />
+      </concept>
+      <concept id="1175147670730" name="jetbrains.mps.lang.typesystem.structure.SubtypingRule" flags="ig" index="2sgARr" />
       <concept id="1179479408386" name="jetbrains.mps.lang.typesystem.structure.JoinType" flags="ng" index="2usRSg">
         <child id="1179479418730" name="argument" index="2usUpS" />
       </concept>
@@ -1742,5 +1751,40 @@
       <ref role="1YaFvo" to="wq2x:5itBwM7J4Oh" resolve="ExpandMacroInputReference" />
     </node>
   </node>
+  <node concept="2sgARr" id="4nUKN9YPlyX">
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="supertypesOf_TermListType" />
+    <node concept="3clFbS" id="4nUKN9YPlyY" role="2sgrp5">
+      <node concept="3clFbF" id="4nUKN9YPlzW" role="3cqZAp">
+        <node concept="2c44tf" id="4nUKN9YPlzX" role="3clFbG">
+          <node concept="3uibUv" id="4nUKN9YPl$t" role="2c44tc">
+            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="4nUKN9YPlz0" role="1YuTPh">
+      <property role="TrG5h" value="termListType" />
+      <ref role="1YaFvo" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
+    </node>
+  </node>
+  <node concept="2sgARr" id="24ciDNzqUsw">
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="supertypesOf_TermType" />
+    <property role="2RFo0w" value="true" />
+    <node concept="3clFbS" id="24ciDNzqUsx" role="2sgrp5">
+      <node concept="3clFbF" id="24ciDNzqUu6" role="3cqZAp">
+        <node concept="2c44tf" id="24ciDNzqUu4" role="3clFbG">
+          <node concept="3uibUv" id="24ciDNzqUv3" role="2c44tc">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="24ciDNzqUtF" role="1YuTPh">
+      <property role="TrG5h" value="termType" />
+      <ref role="1YaFvo" to="wq2x:24ciDNzqIuw" resolve="TermType" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 23956bfc..e33087b5 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -98,7 +98,6 @@
     <dependency reexport="false">e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
@@ -163,7 +162,6 @@
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
-    <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 82a49d6a..eb62e2a8 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -19,7 +19,6 @@
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
-      <concept id="6496299201655527393" name="jetbrains.mps.lang.behavior.structure.LocalBehaviorMethodCall" flags="nn" index="BsUDl" />
       <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
         <reference id="1225194240799" name="concept" index="13h7C2" />
         <child id="1225194240805" name="method" index="13h7CS" />
@@ -34,31 +33,13 @@
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
     </language>
     <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="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="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
-        <child id="1076505808688" name="condition" index="2$JKZa" />
-      </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" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -67,8 +48,6 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -82,7 +61,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -90,16 +68,9 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -108,12 +79,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </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="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
@@ -123,32 +88,19 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="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="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="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" />
@@ -163,15 +115,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -190,26 +136,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <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="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
-        <child id="1151688676805" name="elementType" index="_ZDj9" />
-      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
-      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435807" name="elementType" index="HW$YZ" />
-      </concept>
-      <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
   <node concept="13h7C7" id="7E86$tKAuhI">
@@ -488,375 +417,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="JOGAOsxFgi">
-    <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="13i0hz" id="4lCLOtww4qi" role="13h7CS">
-      <property role="TrG5h" value="prototypesStack" />
-      <node concept="3Tm1VV" id="4lCLOtww4qj" role="1B3o_S" />
-      <node concept="2BANLN" id="4lCLOtww4G2" role="3clF45">
-        <node concept="3Tqbb2" id="4lCLOtww4H2" role="_ZDj9">
-          <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4lCLOtww4ql" role="3clF47">
-        <node concept="3cpWs8" id="4lCLOtww5ju" role="3cqZAp">
-          <node concept="3cpWsn" id="4lCLOtww5jv" role="3cpWs9">
-            <property role="TrG5h" value="stack" />
-            <node concept="2BANLN" id="4lCLOtww5ji" role="1tU5fm">
-              <node concept="3Tqbb2" id="4lCLOtww5jl" role="_ZDj9">
-                <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="4lCLOtww5jw" role="33vP2m">
-              <node concept="2Jqq0_" id="4lCLOtww5jx" role="2ShVmc">
-                <node concept="3Tqbb2" id="4lCLOtww5jy" role="HW$YZ">
-                  <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4lCLOtww5EW" role="3cqZAp">
-          <node concept="3cpWsn" id="4lCLOtww5EX" role="3cpWs9">
-            <property role="TrG5h" value="prototype" />
-            <node concept="3Tqbb2" id="4lCLOtww5CJ" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-            </node>
-            <node concept="2OqwBi" id="4lCLOtww5EY" role="33vP2m">
-              <node concept="13iPFW" id="4lCLOtww5EZ" role="2Oq$k0" />
-              <node concept="3TrEf2" id="4lCLOtww5F0" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2$JKZl" id="4lCLOtww5KA" role="3cqZAp">
-          <node concept="3clFbS" id="4lCLOtww5KC" role="2LFqv$">
-            <node concept="3clFbF" id="4lCLOtww69v" role="3cqZAp">
-              <node concept="2OqwBi" id="4lCLOtww7ug" role="3clFbG">
-                <node concept="37vLTw" id="4lCLOtww69u" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4lCLOtww5jv" resolve="stack" />
-                </node>
-                <node concept="2Ke4WJ" id="4lCLOtww8YI" role="2OqNvi">
-                  <node concept="37vLTw" id="4lCLOtww96p" role="25WWJ7">
-                    <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4lCLOtww9bJ" role="3cqZAp">
-              <node concept="37vLTI" id="4lCLOtww9kA" role="3clFbG">
-                <node concept="2OqwBi" id="4lCLOtww9lB" role="37vLTx">
-                  <node concept="37vLTw" id="4lCLOtww9lb" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
-                  </node>
-                  <node concept="3TrEf2" id="4lCLOtww9vN" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4lCLOtww9bH" role="37vLTJ">
-                  <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="4lCLOtww5Wm" role="2$JKZa">
-            <node concept="37vLTw" id="4lCLOtww5Lx" role="2Oq$k0">
-              <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
-            </node>
-            <node concept="3x8VRR" id="4lCLOtww66w" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="4lCLOtww4I3" role="3cqZAp">
-          <node concept="37vLTw" id="4lCLOtww5jz" role="3clFbG">
-            <ref role="3cqZAo" node="4lCLOtww5jv" resolve="stack" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="7c96q9t$Nk0" role="13h7CS">
-      <property role="TrG5h" value="symbol" />
-      <node concept="3Tm1VV" id="7c96q9t$Nk1" role="1B3o_S" />
-      <node concept="17QB3L" id="7c96q9t$SiM" role="3clF45" />
-      <node concept="3clFbS" id="7c96q9t$Nk3" role="3clF47">
-        <node concept="3cpWs6" id="7c96q9t$QdM" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9t$Q_A" role="3cqZAk">
-            <node concept="13iPFW" id="7c96q9t$Qns" role="2Oq$k0" />
-            <node concept="3TrcHB" id="7c96q9t$QMZ" role="2OqNvi">
-              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="7c96q9tALRr" role="13h7CS">
-      <property role="TrG5h" value="valueFeatures" />
-      <node concept="3Tm1VV" id="7c96q9tALRs" role="1B3o_S" />
-      <node concept="A3Dl8" id="7c96q9tAM63" role="3clF45">
-        <node concept="3Tqbb2" id="7c96q9tAM6o" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7c96q9tALRu" role="3clF47">
-        <node concept="3clFbF" id="7c96q9tIw7w" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9tIw7x" role="3clFbG">
-            <node concept="2OqwBi" id="7c96q9tIw7y" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9tIw7z" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9tIw7$" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
-              </node>
-            </node>
-            <node concept="2qgKlT" id="7c96q9tIw7_" role="2OqNvi">
-              <ref role="37wK5l" node="5UYwY$H7MGm" resolve="valueFeatures" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="7c96q9tCSX_" role="13h7CS">
-      <property role="TrG5h" value="childFeatures" />
-      <node concept="3Tm1VV" id="7c96q9tCSXA" role="1B3o_S" />
-      <node concept="A3Dl8" id="7c96q9tCSXB" role="3clF45">
-        <node concept="3Tqbb2" id="7c96q9tCSXC" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7c96q9tCSXD" role="3clF47">
-        <node concept="3clFbF" id="7c96q9tIynM" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9tIynN" role="3clFbG">
-            <node concept="2OqwBi" id="7c96q9tIynO" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9tIynP" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9tIynQ" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
-              </node>
-            </node>
-            <node concept="2qgKlT" id="7c96q9tLmeG" role="2OqNvi">
-              <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="4MEOIDG83_h" role="13h7CS">
-      <property role="TrG5h" value="runtimeClassName" />
-      <node concept="3Tm1VV" id="4MEOIDG83_i" role="1B3o_S" />
-      <node concept="17QB3L" id="4MEOIDG83_x" role="3clF45" />
-      <node concept="3clFbS" id="4MEOIDG83_k" role="3clF47">
-        <node concept="3clFbF" id="4MEOIDG8lha" role="3cqZAp">
-          <node concept="3cpWs3" id="4MEOIDG8moh" role="3clFbG">
-            <node concept="Xl_RD" id="4MEOIDG8mok" role="3uHU7w">
-              <property role="Xl_RC" value="_dataform" />
-            </node>
-            <node concept="2OqwBi" id="4MEOIDG8lrk" role="3uHU7B">
-              <node concept="13iPFW" id="4MEOIDG8lh8" role="2Oq$k0" />
-              <node concept="3TrcHB" id="4MEOIDG8lzW" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="4MEOIDG8lgz" role="13h7CS">
-      <property role="TrG5h" value="runtimeClassFqName" />
-      <node concept="3Tm1VV" id="4MEOIDG8lg$" role="1B3o_S" />
-      <node concept="17QB3L" id="4MEOIDG8lg_" role="3clF45" />
-      <node concept="3clFbS" id="4MEOIDG8lgA" role="3clF47">
-        <node concept="3clFbF" id="4MEOIDG8mMv" role="3cqZAp">
-          <node concept="3cpWs3" id="4MEOIDG8po4" role="3clFbG">
-            <node concept="BsUDl" id="4MEOIDG8pxn" role="3uHU7w">
-              <ref role="37wK5l" node="4MEOIDG83_h" resolve="runtimeClassName" />
-            </node>
-            <node concept="3cpWs3" id="4MEOIDG8oGY" role="3uHU7B">
-              <node concept="2OqwBi" id="4MEOIDG8nA1" role="3uHU7B">
-                <node concept="2OqwBi" id="4MEOIDG8mWD" role="2Oq$k0">
-                  <node concept="13iPFW" id="4MEOIDG8mMt" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
-                    <node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
-                      <node concept="chp4Y" id="JOGAOsX26P" role="ri$Ld">
-                        <ref role="cht4Q" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="JOGAOsXW3x" role="2OqNvi">
-                  <ref role="37wK5l" node="5hSMZ_lRET5" resolve="runtimeClassFqName" />
-                </node>
-              </node>
-              <node concept="Xl_RD" id="4MEOIDG8oH1" role="3uHU7w">
-                <property role="Xl_RC" value="." />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13hLZK" id="JOGAOsxFgj" role="13h7CW">
-      <node concept="3clFbS" id="JOGAOsxFgk" role="2VODD2" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="JOGAOsxidP">
-    <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-    <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
-      <property role="TrG5h" value="runtimeClassName" />
-      <node concept="3Tm1VV" id="5hSMZ_lRESW" role="1B3o_S" />
-      <node concept="17QB3L" id="5hSMZ_lRESX" role="3clF45" />
-      <node concept="3clFbS" id="5hSMZ_lRESY" role="3clF47">
-        <node concept="3clFbF" id="5hSMZ_lRESZ" role="3cqZAp">
-          <node concept="3cpWs3" id="5hSMZ_lRET0" role="3clFbG">
-            <node concept="Xl_RD" id="5hSMZ_lRET1" role="3uHU7w">
-              <property role="Xl_RC" value="_DFTable" />
-            </node>
-            <node concept="2OqwBi" id="5hSMZ_lRET2" role="3uHU7B">
-              <node concept="13iPFW" id="5hSMZ_lRET3" role="2Oq$k0" />
-              <node concept="3TrcHB" id="5hSMZ_lRET4" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="5hSMZ_lRET5" role="13h7CS">
-      <property role="TrG5h" value="runtimeClassFqName" />
-      <node concept="3Tm1VV" id="5hSMZ_lRET6" role="1B3o_S" />
-      <node concept="17QB3L" id="5hSMZ_lRET7" role="3clF45" />
-      <node concept="3clFbS" id="5hSMZ_lRET8" role="3clF47">
-        <node concept="3clFbF" id="5hSMZ_lRET9" role="3cqZAp">
-          <node concept="3cpWs3" id="5hSMZ_lRETa" role="3clFbG">
-            <node concept="3cpWs3" id="5hSMZ_lRETb" role="3uHU7B">
-              <node concept="2OqwBi" id="5hSMZ_lRETc" role="3uHU7B">
-                <node concept="2OqwBi" id="5hSMZ_lRETd" role="2Oq$k0">
-                  <node concept="13iPFW" id="5hSMZ_lRETe" role="2Oq$k0" />
-                  <node concept="I4A8Y" id="5hSMZ_lRETf" role="2OqNvi" />
-                </node>
-                <node concept="LkI2h" id="5hSMZ_lRETg" role="2OqNvi" />
-              </node>
-              <node concept="Xl_RD" id="5hSMZ_lRETh" role="3uHU7w">
-                <property role="Xl_RC" value="!" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5hSMZ_lRETi" role="3uHU7w">
-              <node concept="13iPFW" id="5hSMZ_lRETj" role="2Oq$k0" />
-              <node concept="2qgKlT" id="5hSMZ_lRETk" role="2OqNvi">
-                <ref role="37wK5l" node="5hSMZ_lRESV" resolve="runtimeClassName" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13hLZK" id="JOGAOsxidQ" role="13h7CW">
-      <node concept="3clFbS" id="JOGAOsxidR" role="2VODD2" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="JOGAOsxlgX">
-    <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="5j4j:JOGAOsxiLy" resolve="DataFormTemplate" />
-    <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="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5UYwY$H7MGp" role="3clF47">
-        <node concept="3cpWs6" id="5UYwY$H7Rvf" role="3cqZAp">
-          <node concept="2OqwBi" id="5UYwY$H7Tcb" role="3cqZAk">
-            <node concept="2OqwBi" id="5UYwY$H7RAL" role="2Oq$k0">
-              <node concept="13iPFW" id="5UYwY$H7RvB" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="5UYwY$H7RGV" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
-              </node>
-            </node>
-            <node concept="3zZkjj" id="1GNw78$s224" role="2OqNvi">
-              <node concept="1bVj0M" id="1GNw78$s225" role="23t8la">
-                <node concept="3clFbS" id="1GNw78$s226" role="1bW5cS">
-                  <node concept="3clFbF" id="1GNw78$s227" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$s22d" role="3clFbG">
-                      <node concept="37vLTw" id="1GNw78$s22e" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1GNw78$s22h" resolve="it" />
-                      </node>
-                      <node concept="1mIQ4w" id="1GNw78$s22f" role="2OqNvi">
-                        <node concept="chp4Y" id="JOGAOsxSBD" role="cj9EA">
-                          <ref role="cht4Q" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="1GNw78$s22h" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1GNw78$s22i" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="5UYwY$H7TrL" role="13h7CS">
-      <property role="TrG5h" value="childFeatures" />
-      <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="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5UYwY$H7TrO" role="3clF47">
-        <node concept="3cpWs6" id="5UYwY$H7TE4" role="3cqZAp">
-          <node concept="2OqwBi" id="5UYwY$H7Vna" role="3cqZAk">
-            <node concept="2OqwBi" id="5UYwY$H7TLS" role="2Oq$k0">
-              <node concept="13iPFW" id="5UYwY$H7TEA" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="5UYwY$H7TRU" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
-              </node>
-            </node>
-            <node concept="3zZkjj" id="1GNw78$s22E" role="2OqNvi">
-              <node concept="1bVj0M" id="1GNw78$s22F" role="23t8la">
-                <node concept="3clFbS" id="1GNw78$s22G" role="1bW5cS">
-                  <node concept="3clFbF" id="1GNw78$s22H" role="3cqZAp">
-                    <node concept="22lmx$" id="5YVpdhev4y1" role="3clFbG">
-                      <node concept="2OqwBi" id="1GNw78$s22I" role="3uHU7B">
-                        <node concept="37vLTw" id="1GNw78$s22J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
-                        </node>
-                        <node concept="1mIQ4w" id="1GNw78$s22K" role="2OqNvi">
-                          <node concept="chp4Y" id="JOGAOsxSP6" role="cj9EA">
-                            <ref role="cht4Q" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="5YVpdhev4Hh" role="3uHU7w">
-                        <node concept="37vLTw" id="5YVpdhev4Hi" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
-                        </node>
-                        <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
-                          <node concept="chp4Y" id="JOGAOsxT7n" role="cj9EA">
-                            <ref role="cht4Q" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="1GNw78$s22M" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="1GNw78$s22N" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13hLZK" id="JOGAOsxlgY" role="13h7CW">
-      <node concept="3clFbS" id="JOGAOsxlgZ" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="7zIaasjACz8">
     <property role="3GE5qa" value="logical.item.expression" />
     <ref role="13h7C2" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 9f3af231..b1f6f2e0 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -16,7 +16,6 @@
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -29,12 +28,6 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -122,7 +115,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -146,7 +138,6 @@
       <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
       <concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
       <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
-      <concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
         <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
@@ -190,7 +181,6 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
         <child id="1180031783297" name="conceptArgument" index="2Zo12j" />
@@ -223,18 +213,10 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -298,7 +280,6 @@
       <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="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
   <node concept="1M2fIO" id="3qvzBqWDzqQ">
@@ -839,192 +820,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="JOGAOsxTE1">
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1M2myG" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
-      <ref role="1N5Vy1" to="5j4j:JOGAOsxTDo" resolve="feature" />
-      <node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
-        <node concept="3clFbS" id="6fXjIfxgfU2" role="2VODD2">
-          <node concept="3cpWs8" id="6fXjIfxgfU3" role="3cqZAp">
-            <node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
-              <property role="TrG5h" value="dfd" />
-              <node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-              </node>
-              <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
-                <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
-                  <node concept="2rP1CM" id="6fXjIfxgfU8" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
-                    <node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
-                      <node concept="chp4Y" id="JOGAOsxUUx" role="ri$Ld">
-                        <ref role="cht4Q" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="JOGAOsxVjr" role="2OqNvi">
-                  <ref role="3Tt5mk" to="5j4j:JOGAOsxaC6" resolve="decl" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6fXjIfxgfUe" role="3cqZAp">
-            <node concept="2ShNRf" id="6fXjIfxgfUf" role="3clFbG">
-              <node concept="YeOm9" id="6fXjIfxgfUg" role="2ShVmc">
-                <node concept="1Y3b0j" id="6fXjIfxgfUh" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="6fXjIfxgfUi" role="37wK5m">
-                    <node concept="2OqwBi" id="6fXjIfxgfUj" role="2Oq$k0">
-                      <node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="dfd" />
-                      </node>
-                      <node concept="3TrEf2" id="JOGAOsxWhW" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="JOGAOsxW_V" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="6fXjIfxgfUp" role="1B3o_S" />
-                  <node concept="3clFb_" id="6fXjIfxgfUq" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="6fXjIfxgfUr" role="3clF45" />
-                    <node concept="3Tm1VV" id="6fXjIfxgfUs" role="1B3o_S" />
-                    <node concept="37vLTG" id="6fXjIfxgfUt" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="6fXjIfxgfUu" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="6fXjIfxgfUv" role="3clF47">
-                      <node concept="3clFbF" id="6fXjIfxgfUw" role="3cqZAp">
-                        <node concept="2OqwBi" id="6fXjIfxgfUx" role="3clFbG">
-                          <node concept="1PxgMI" id="6fXjIfxgfUy" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="37vLTw" id="6fXjIfxgfUz" role="1m5AlR">
-                              <ref role="3cqZAo" node="6fXjIfxgfUt" resolve="child" />
-                            </node>
-                            <node concept="chp4Y" id="6fXjIfxgnfa" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="6fXjIfxgfU$" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="4vr5SAprtjH">
-    <property role="3GE5qa" value="term" />
-    <ref role="1M2myG" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="1N5Pfh" id="4vr5SAprtjI" role="1Mr941">
-      <ref role="1N5Vy1" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-      <node concept="3dgokm" id="4vr5SAprtjM" role="1N6uqs">
-        <node concept="3clFbS" id="4vr5SAprtjO" role="2VODD2">
-          <node concept="3clFbF" id="4vr5SAprAV$" role="3cqZAp">
-            <node concept="2ShNRf" id="4vr5SAprAVw" role="3clFbG">
-              <node concept="YeOm9" id="4vr5SAprCap" role="2ShVmc">
-                <node concept="1Y3b0j" id="4vr5SAprCas" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <node concept="3Tm1VV" id="4vr5SAprCat" role="1B3o_S" />
-                  <node concept="2OqwBi" id="4vr5SAprBxA" role="37wK5m">
-                    <node concept="2OqwBi" id="4vr5SAprBxB" role="2Oq$k0">
-                      <node concept="1PxgMI" id="4vr5SAprBxC" role="2Oq$k0">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="4vr5SAprBxD" role="3oSUPX">
-                          <ref role="cht4Q" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-                        </node>
-                        <node concept="2OqwBi" id="4vr5SAprBxE" role="1m5AlR">
-                          <node concept="2rP1CM" id="4vr5SAprBxF" role="2Oq$k0" />
-                          <node concept="2Rxl7S" id="4vr5SAprBxG" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="4vr5SAprBxH" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:JOGAOsxaCx" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="3zZkjj" id="4vr5SAprBxI" role="2OqNvi">
-                      <node concept="1bVj0M" id="4vr5SAprBxJ" role="23t8la">
-                        <node concept="3clFbS" id="4vr5SAprBxK" role="1bW5cS">
-                          <node concept="3clFbF" id="4vr5SAprBxL" role="3cqZAp">
-                            <node concept="1Wc70l" id="4vr5SAprBxM" role="3clFbG">
-                              <node concept="2OqwBi" id="4vr5SAprBxN" role="3uHU7w">
-                                <node concept="37vLTw" id="4vr5SAprBxO" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
-                                </node>
-                                <node concept="3TrcHB" id="4vr5SAprBxP" role="2OqNvi">
-                                  <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                                </node>
-                              </node>
-                              <node concept="3y3z36" id="4vr5SAprBxQ" role="3uHU7B">
-                                <node concept="37vLTw" id="4vr5SAprBxR" role="3uHU7B">
-                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
-                                </node>
-                                <node concept="3kakTB" id="4vr5SAprBxS" role="3uHU7w" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="4vr5SAprBxT" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4vr5SAprBxU" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="4vr5SAprCmQ" role="jymVt">
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="4vr5SAprCmR" role="3clF45" />
-                    <node concept="3Tm1VV" id="4vr5SAprCmS" role="1B3o_S" />
-                    <node concept="37vLTG" id="4vr5SAprCmU" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="4vr5SAprCmV" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="4vr5SAprCmX" role="3clF47">
-                      <node concept="3clFbF" id="4vr5SAprC_k" role="3cqZAp">
-                        <node concept="2OqwBi" id="4vr5SAprD8G" role="3clFbG">
-                          <node concept="1PxgMI" id="4vr5SAprCX0" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="4vr5SAprCZN" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                            <node concept="37vLTw" id="4vr5SAprC_j" role="1m5AlR">
-                              <ref role="3cqZAo" node="4vr5SAprCmU" resolve="child" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="4vr5SAprDhl" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="4vr5SAprCmY" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="7zIaasjUSKd">
     <property role="3GE5qa" value="logical.item.expression" />
     <ref role="1M2myG" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 4a0bd129..b3460eb4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -32,6 +32,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -56,7 +57,6 @@
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
         <child id="1140524464359" name="emptyCellModel" index="2czzBI" />
-        <child id="928328222691832421" name="separatorTextQuery" index="2gpyvW" />
         <child id="1233141163694" name="separatorStyle" index="sWeuL" />
       </concept>
       <concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
@@ -64,7 +64,6 @@
       </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
-      <concept id="3459162043708467089" name="jetbrains.mps.lang.editor.structure.CellActionMap_CanExecuteFunction" flags="in" index="jK8Ss" />
       <concept id="6089045305654894366" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Default" flags="ng" index="2kknPJ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
@@ -74,11 +73,8 @@
         <child id="784421273959492606" name="nodeFunction" index="mvV$0" />
       </concept>
       <concept id="784421273959493166" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_TargetNode" flags="ig" index="mvVNg" />
-      <concept id="709996738298806197" name="jetbrains.mps.lang.editor.structure.QueryFunction_SeparatorText" flags="in" index="2o9xnK" />
-      <concept id="1237375020029" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineChildrenStyleClassItem" flags="ln" index="pj6Ft" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
-      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
       <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
@@ -98,7 +94,6 @@
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="8371900013785948369" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Parameter" flags="ig" index="2$S_p_" />
-      <concept id="6718020819487620876" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Default" flags="ng" index="A1WHr" />
       <concept id="5944657839000868711" name="jetbrains.mps.lang.editor.structure.ConceptEditorContextHints" flags="ig" index="2ABfQD">
         <child id="5944657839000877563" name="hints" index="2ABdcP" />
       </concept>
@@ -206,7 +201,6 @@
       </concept>
       <concept id="1139535280617" name="jetbrains.mps.lang.editor.structure.CellActionMapItem" flags="lg" index="1hA7zw">
         <property id="1139535298778" name="actionId" index="1hAc7j" />
-        <child id="3459162043708468028" name="canExecuteFunction" index="jK8aL" />
         <child id="1139535280620" name="executeFunction" index="1hA7z_" />
       </concept>
       <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
@@ -229,7 +223,6 @@
       </concept>
       <concept id="1223387125302" name="jetbrains.mps.lang.editor.structure.QueryFunction_Boolean" flags="in" index="3nzxsE" />
       <concept id="3308396621974580100" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Default" flags="ng" index="3p36aQ" />
-      <concept id="7580468736840446506" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_model" flags="nn" index="1rpKSd" />
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
       <concept id="1219226236603" name="jetbrains.mps.lang.editor.structure.DrawBracketsStyleClassItem" flags="ln" index="3vyZuw" />
       <concept id="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
@@ -250,7 +243,6 @@
         <reference id="1139959269582" name="actionMap" index="1ERwB7" />
         <child id="1142887637401" name="renderingCondition" index="pqm2j" />
         <child id="4323500428121274054" name="id" index="2SqHTX" />
-        <child id="4202667662392416064" name="transformationMenu" index="3vIgyS" />
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
@@ -271,11 +263,6 @@
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR">
         <child id="1182233390675" name="filter" index="12AuX0" />
       </concept>
-      <concept id="4233361609415247331" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Parameter" flags="ig" index="1GhMSn" />
-      <concept id="4233361609415240997" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Parameterized" flags="ng" index="1GhOrh">
-        <child id="4233361609415240998" name="part" index="1GhOri" />
-        <child id="4233361609415241000" name="parameterQuery" index="1GhOrs" />
-      </concept>
       <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
         <child id="1225898971709" name="getter" index="1Hhtcw" />
       </concept>
@@ -312,7 +299,6 @@
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
         <property id="1179360856892" name="value" index="2noCCI" />
@@ -410,7 +396,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -421,12 +406,6 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </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="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
@@ -456,23 +435,16 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="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="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <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="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
-        <reference id="3562215692195600259" name="link" index="13MTZf" />
-      </concept>
       <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
         <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
         <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
@@ -490,9 +462,6 @@
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
-      <concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
-        <reference id="1182511038750" name="concept" index="1j9C0d" />
-      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -522,15 +491,10 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -564,15 +528,10 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
@@ -2838,648 +2797,6 @@
       <node concept="l2Vlx" id="49obaclcC23" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="JOGAOsxiLE">
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
-      <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
-        <property role="3F0ifm" value="final" />
-        <ref role="1ERwB7" node="JOGAOsxj5_" resolve="DataFormFeature_final" />
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="pkWqt" id="1CcQBrPqjRc" role="pqm2j">
-          <node concept="3clFbS" id="1CcQBrPqjRd" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqjYq" role="3cqZAp">
-              <node concept="2OqwBi" id="1CcQBrPqkc9" role="3clFbG">
-                <node concept="pncrf" id="1CcQBrPqjYp" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1CcQBrPqkxi" role="2OqNvi">
-                  <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1CcQBrPqjR5" role="2iSdaV" />
-      <node concept="PMmxH" id="JOGAOsx_Cg" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-      </node>
-      <node concept="3F0A7n" id="JOGAOsx_Ch" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <node concept="A1WHr" id="JOGAOsx_Ci" role="3vIgyS">
-          <ref role="2ZyFGn" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="JOGAOsx_Cj" role="3EZMnx">
-        <node concept="VPM3Z" id="JOGAOsx_Ck" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="JOGAOsx_Cl" role="2iSdaV" />
-        <node concept="3F0ifn" id="JOGAOsx_Cm" role="3EZMnx">
-          <property role="3F0ifm" value="=" />
-        </node>
-        <node concept="3F1sOY" id="JOGAOsx_Cn" role="3EZMnx">
-          <ref role="1NtTu8" to="5j4j:JOGAOsxmrx" resolve="getter" />
-        </node>
-        <node concept="pkWqt" id="JOGAOsx_Co" role="pqm2j">
-          <node concept="3clFbS" id="JOGAOsx_Cp" role="2VODD2">
-            <node concept="3clFbF" id="JOGAOsx_Cq" role="3cqZAp">
-              <node concept="2OqwBi" id="JOGAOsx_Cr" role="3clFbG">
-                <node concept="2OqwBi" id="JOGAOsx_Cs" role="2Oq$k0">
-                  <node concept="pncrf" id="JOGAOsx_Ct" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="JOGAOsx_Cu" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="JOGAOsx_Cv" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1h_SRR" id="JOGAOsxj5_">
-    <property role="TrG5h" value="DataFormFeature_final" />
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1h_SK9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
-      <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
-        <node concept="3clFbS" id="1CcQBrPqIC7" role="2VODD2">
-          <node concept="3clFbF" id="1CcQBrPqJok" role="3cqZAp">
-            <node concept="2OqwBi" id="1CcQBrPqK8t" role="3clFbG">
-              <node concept="2OqwBi" id="1CcQBrPqJwy" role="2Oq$k0">
-                <node concept="0IXxy" id="1CcQBrPqJoj" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1CcQBrPqJF6" role="2OqNvi">
-                  <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
-                </node>
-              </node>
-              <node concept="tyxLq" id="1CcQBrPqKmJ" role="2OqNvi">
-                <node concept="3clFbT" id="1CcQBrPqKpf" role="tz02z">
-                  <property role="3clFbU" value="false" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="jK8Ss" id="1CcQBrPqICj" role="jK8aL">
-        <node concept="3clFbS" id="1CcQBrPqICk" role="2VODD2">
-          <node concept="3clFbF" id="1CcQBrPqIJx" role="3cqZAp">
-            <node concept="2OqwBi" id="1CcQBrPqIXg" role="3clFbG">
-              <node concept="0IXxy" id="1CcQBrPqIJw" role="2Oq$k0" />
-              <node concept="3TrcHB" id="1CcQBrPqJeO" role="2OqNvi">
-                <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="IW6AY" id="JOGAOsxkwf">
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="aqKnT" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
-      <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
-        <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
-        </node>
-      </node>
-      <node concept="IWgqT" id="1CcQBrPqlWZ" role="1Qtc8A">
-        <node concept="1hCUdq" id="1CcQBrPqlX0" role="1hCUd6">
-          <node concept="3clFbS" id="1CcQBrPqlX1" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqm5F" role="3cqZAp">
-              <node concept="Xl_RD" id="1CcQBrPqm5E" role="3clFbG">
-                <property role="Xl_RC" value="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="1CcQBrPqlX2" role="IWgqQ">
-          <node concept="3clFbS" id="1CcQBrPqlX3" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqnP6" role="3cqZAp">
-              <node concept="2OqwBi" id="1CcQBrPqoCB" role="3clFbG">
-                <node concept="2OqwBi" id="1CcQBrPqnXk" role="2Oq$k0">
-                  <node concept="7Obwk" id="1CcQBrPqnP5" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="1CcQBrPqo7Q" role="2OqNvi">
-                    <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
-                  </node>
-                </node>
-                <node concept="tyxLq" id="1CcQBrPqoQT" role="2OqNvi">
-                  <node concept="3clFbT" id="1CcQBrPqoUG" role="tz02z">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="27VH4U" id="1CcQBrPqmmK" role="2jiSrf">
-          <node concept="3clFbS" id="1CcQBrPqmmL" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqmu4" role="3cqZAp">
-              <node concept="3fqX7Q" id="1CcQBrPqnFp" role="3clFbG">
-                <node concept="2OqwBi" id="1CcQBrPqnFr" role="3fr31v">
-                  <node concept="7Obwk" id="1CcQBrPqnFs" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="1CcQBrPqnFt" role="2OqNvi">
-                    <ref role="3TsBF5" to="5j4j:JOGAOsxiLC" resolve="final" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1Qtc8_" id="JOGAOsxAMn" role="IW6Ez">
-      <node concept="3cWJ9i" id="JOGAOsxAMo" role="1Qtc8$">
-        <node concept="CtIbL" id="JOGAOsxAMp" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-      <node concept="IWgqT" id="JOGAOsxAMq" role="1Qtc8A">
-        <node concept="1hCUdq" id="JOGAOsxAMr" role="1hCUd6">
-          <node concept="3clFbS" id="JOGAOsxAMs" role="2VODD2">
-            <node concept="3clFbF" id="JOGAOsxAMt" role="3cqZAp">
-              <node concept="Xl_RD" id="JOGAOsxAMu" role="3clFbG">
-                <property role="Xl_RC" value="=" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="JOGAOsxAMv" role="IWgqQ">
-          <node concept="3clFbS" id="JOGAOsxAMw" role="2VODD2">
-            <node concept="3clFbF" id="JOGAOsxAMx" role="3cqZAp">
-              <node concept="2OqwBi" id="JOGAOsxAMy" role="3clFbG">
-                <node concept="2OqwBi" id="JOGAOsxAMz" role="2Oq$k0">
-                  <node concept="7Obwk" id="JOGAOsxAM$" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="JOGAOsxAM_" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="JOGAOsxAMA" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxTDr">
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
-      <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:JOGAOsxTDo" resolve="feature" />
-        <node concept="1sVBvm" id="1L74NXFMBUe" role="1sWHZn">
-          <node concept="3F0A7n" id="1L74NXFMBUl" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="4bWqD4C9OIl" resolve="TermFeatureOverride" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="7LZcKzBBdCO" role="3EZMnx">
-        <property role="3F0ifm" value=":" />
-        <node concept="11L4FC" id="7LZcKzBBqUE" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="1L74NXFMBX2" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:JOGAOsxTDm" resolve="getter" />
-      </node>
-      <node concept="l2Vlx" id="1L74NXFMBU8" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxX6Q">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
-    <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
-      <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
-      <node concept="1iCGBv" id="5hSMZ_l942J" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:JOGAOsxaC6" resolve="decl" />
-        <node concept="1sVBvm" id="5hSMZ_l942L" role="1sWHZn">
-          <node concept="3F0A7n" id="5hSMZ_l94mH" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="4bWqD4C2vDI" resolve="Term" />
-          </node>
-        </node>
-      </node>
-      <node concept="3EZMnI" id="1L74NXFNJ0S" role="3EZMnx">
-        <node concept="VPM3Z" id="1L74NXFNJ0U" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="1L74NXFNJ0X" role="2iSdaV" />
-        <node concept="3F0ifn" id="1L74NXFNj3F" role="3EZMnx">
-          <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-        </node>
-        <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
-          <ref role="1NtTu8" to="5j4j:JOGAOsxaC4" resolve="override" />
-          <node concept="l2Vlx" id="1L74NXFNj7z" role="2czzBx" />
-          <node concept="lj46D" id="1L74NXFNj9o" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="2o9xnK" id="1L74NXFPnXQ" role="2gpyvW">
-            <node concept="3clFbS" id="1L74NXFPnXR" role="2VODD2">
-              <node concept="3clFbF" id="1L74NXFPoax" role="3cqZAp">
-                <node concept="Xl_RD" id="1L74NXFPoaw" role="3clFbG" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F0ifn" id="Lu45F8B7eI" role="2czzBI">
-            <property role="3F0ifm" value="" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="1L74NXFNj3T" role="3EZMnx">
-          <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3p36aQ" id="JOGAOsxYtS">
-    <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
-    <node concept="2F$Pav" id="7XmdqtdOhCF" role="3ft7WO">
-      <node concept="3eGOop" id="7XmdqtdOhD8" role="2$S_pN">
-        <node concept="ucgPf" id="7XmdqtdOhDa" role="3aKz83">
-          <node concept="3clFbS" id="7XmdqtdOhDc" role="2VODD2">
-            <node concept="3cpWs8" id="7XmdqtdOxrU" role="3cqZAp">
-              <node concept="3cpWsn" id="7XmdqtdOxrV" role="3cpWs9">
-                <property role="TrG5h" value="df" />
-                <node concept="3Tqbb2" id="7XmdqtdOxrT" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
-                </node>
-                <node concept="2ShNRf" id="7XmdqtdOxrW" role="33vP2m">
-                  <node concept="3zrR0B" id="7XmdqtdOxrX" role="2ShVmc">
-                    <node concept="3Tqbb2" id="7XmdqtdOxrY" role="3zrR0E">
-                      <ref role="ehGHo" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7XmdqtdOwqy" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdOy$8" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdOxL6" role="2Oq$k0">
-                  <node concept="37vLTw" id="7XmdqtdOxrZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
-                  </node>
-                  <node concept="3TrEf2" id="JOGAOsy1U2" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:JOGAOsxaC6" resolve="decl" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="7XmdqtdOyM9" role="2OqNvi">
-                  <node concept="2ZBlsa" id="7XmdqtdOzev" role="2oxUTC" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7XmdqtdOzwb" role="3cqZAp">
-              <node concept="37vLTw" id="7XmdqtdOzw9" role="3clFbG">
-                <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="7XmdqtdOhCX" role="2ZBHrp">
-        <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-      </node>
-      <node concept="2$S_p_" id="7XmdqtdOhHi" role="2$S_pT">
-        <node concept="3clFbS" id="7XmdqtdOhHj" role="2VODD2">
-          <node concept="3clFbF" id="7XmdqtdOrin" role="3cqZAp">
-            <node concept="2OqwBi" id="7XmdqtdOu4E" role="3clFbG">
-              <node concept="2OqwBi" id="7XmdqtdOrx1" role="2Oq$k0">
-                <node concept="1rpKSd" id="7XmdqtdOril" role="2Oq$k0" />
-                <node concept="1j9C0f" id="7XmdqtdOrJl" role="2OqNvi">
-                  <ref role="1j9C0d" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-                </node>
-              </node>
-              <node concept="13MTOL" id="JOGAOsy1e8" role="2OqNvi">
-                <ref role="13MTZf" to="5j4j:JOGAOsxaCx" resolve="contents" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="IW6AY" id="JOGAOsxCR1">
-    <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="1Qtc8_" id="4vr5SApqcy2" role="IW6Ez">
-      <node concept="3cWJ9i" id="4vr5SApqcOk" role="1Qtc8$">
-        <node concept="CtIbL" id="4vr5SApqcOm" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
-        </node>
-      </node>
-      <node concept="IWgqT" id="4vr5SApqdtK" role="1Qtc8A">
-        <node concept="1hCUdq" id="4vr5SApqdtL" role="1hCUd6">
-          <node concept="3clFbS" id="4vr5SApqdtM" role="2VODD2">
-            <node concept="3clFbF" id="4vr5SApqiha" role="3cqZAp">
-              <node concept="Xl_RD" id="4vr5SApqih9" role="3clFbG">
-                <property role="Xl_RC" value="open" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="4vr5SApqdtN" role="IWgqQ">
-          <node concept="3clFbS" id="4vr5SApqdtO" role="2VODD2">
-            <node concept="3clFbF" id="4vr5SApqjZs" role="3cqZAp">
-              <node concept="2OqwBi" id="4vr5SApqkCU" role="3clFbG">
-                <node concept="2OqwBi" id="4vr5SApqk7W" role="2Oq$k0">
-                  <node concept="7Obwk" id="4vr5SApqjZr" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="4vr5SApqkkh" role="2OqNvi">
-                    <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                  </node>
-                </node>
-                <node concept="tyxLq" id="4vr5SApqkSb" role="2OqNvi">
-                  <node concept="3clFbT" id="4vr5SApqkU2" role="tz02z">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="27VH4U" id="4vr5SApqiif" role="2jiSrf">
-          <node concept="3clFbS" id="4vr5SApqiig" role="2VODD2">
-            <node concept="3clFbF" id="4vr5SApqimm" role="3cqZAp">
-              <node concept="3fqX7Q" id="4vr5SApqiNL" role="3clFbG">
-                <node concept="2OqwBi" id="4vr5SApqiNN" role="3fr31v">
-                  <node concept="7Obwk" id="4vr5SApqiNO" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="4vr5SApqiNP" role="2OqNvi">
-                    <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1Qtc8_" id="7c96q9tzBpk" role="IW6Ez">
-      <node concept="3cWJ9i" id="7c96q9tzBpo" role="1Qtc8$">
-        <node concept="CtIbL" id="7c96q9tzBpq" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-      <node concept="1GhOrh" id="7c96q9tzBEG" role="1Qtc8A">
-        <node concept="1GhMSn" id="7c96q9tzBEH" role="1GhOrs">
-          <node concept="3clFbS" id="7c96q9tzBEI" role="2VODD2">
-            <node concept="3clFbF" id="7c96q9tzBTp" role="3cqZAp">
-              <node concept="2OqwBi" id="7c96q9tzG9T" role="3clFbG">
-                <node concept="2OqwBi" id="7c96q9tzDQK" role="2Oq$k0">
-                  <node concept="1PxgMI" id="7c96q9tzDxt" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
-                      <ref role="cht4Q" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-                    </node>
-                    <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
-                      <node concept="7Obwk" id="7c96q9tzBTo" role="2Oq$k0" />
-                      <node concept="2Rxl7S" id="7c96q9tzCw$" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="JOGAOsxE0L" role="2OqNvi">
-                    <ref role="3TtcxE" to="5j4j:JOGAOsxaCx" resolve="contents" />
-                  </node>
-                </node>
-                <node concept="3zZkjj" id="7c96q9tzR0w" role="2OqNvi">
-                  <node concept="1bVj0M" id="7c96q9tzR0y" role="23t8la">
-                    <node concept="3clFbS" id="7c96q9tzR0z" role="1bW5cS">
-                      <node concept="3clFbF" id="7c96q9tzR0$" role="3cqZAp">
-                        <node concept="1Wc70l" id="4vr5SApr8jn" role="3clFbG">
-                          <node concept="2OqwBi" id="4vr5SApr8BG" role="3uHU7w">
-                            <node concept="37vLTw" id="4vr5SApr8n_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
-                            </node>
-                            <node concept="3TrcHB" id="4vr5SApr93N" role="2OqNvi">
-                              <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                            </node>
-                          </node>
-                          <node concept="3y3z36" id="7c96q9tzR0_" role="3uHU7B">
-                            <node concept="37vLTw" id="7c96q9tzR0B" role="3uHU7B">
-                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
-                            </node>
-                            <node concept="7Obwk" id="7c96q9tzR0A" role="3uHU7w" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="7c96q9tzR0C" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7c96q9tzR0D" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWgqT" id="7c96q9tzRbb" role="1GhOri">
-          <node concept="1hCUdq" id="7c96q9tzRbd" role="1hCUd6">
-            <node concept="3clFbS" id="7c96q9tzRbf" role="2VODD2">
-              <node concept="3clFbF" id="7c96q9tzSTy" role="3cqZAp">
-                <node concept="3cpWs3" id="7c96q9tzU1a" role="3clFbG">
-                  <node concept="2OqwBi" id="7c96q9tzUuJ" role="3uHU7w">
-                    <node concept="2ZBlsa" id="7c96q9tzU9N" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="7c96q9tzUM7" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="Xl_RD" id="7c96q9tzSTx" role="3uHU7B">
-                    <property role="Xl_RC" value=":" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="IWg2L" id="7c96q9tzRbh" role="IWgqQ">
-            <node concept="3clFbS" id="7c96q9tzRbj" role="2VODD2">
-              <node concept="3clFbF" id="7c96q9tzRuk" role="3cqZAp">
-                <node concept="2OqwBi" id="7c96q9tzSoV" role="3clFbG">
-                  <node concept="2OqwBi" id="7c96q9tzRSM" role="2Oq$k0">
-                    <node concept="7Obwk" id="7c96q9tzRuj" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="7c96q9tzS3S" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-                    </node>
-                  </node>
-                  <node concept="2oxUTD" id="7c96q9tzSBG" role="2OqNvi">
-                    <node concept="2ZBlsa" id="7c96q9tzSGf" role="2oxUTC" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tqbb2" id="7c96q9tzBJN" role="2ZBHrp">
-          <ref role="ehGHo" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxEW6">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
-      <node concept="3F0ifn" id="4vr5SApqlad" role="3EZMnx">
-        <property role="3F0ifm" value="open" />
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-        <ref role="1ERwB7" node="4vr5SAprGdP" resolve="DataForm_open_DELETE" />
-        <node concept="pkWqt" id="4vr5SApqlag" role="pqm2j">
-          <node concept="3clFbS" id="4vr5SApqlah" role="2VODD2">
-            <node concept="3clFbF" id="4vr5SApqlas" role="3cqZAp">
-              <node concept="2OqwBi" id="4vr5SApqloG" role="3clFbG">
-                <node concept="pncrf" id="4vr5SApqlar" role="2Oq$k0" />
-                <node concept="3TrcHB" id="4vr5SApql_h" role="2OqNvi">
-                  <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F0A7n" id="4MEOIDFttNA" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <ref role="1k5W1q" node="4bWqD4C2vDI" resolve="Term" />
-        <node concept="A1WHr" id="7c96q9tzV90" role="3vIgyS">
-          <ref role="2ZyFGn" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="7c96q9t$nwo" role="3EZMnx">
-        <node concept="VPM3Z" id="7c96q9t$nwq" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7c96q9t$nEV" role="3EZMnx">
-          <property role="3F0ifm" value=":" />
-        </node>
-        <node concept="1iCGBv" id="7c96q9t$nF1" role="3EZMnx">
-          <ref role="1NtTu8" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-          <node concept="1sVBvm" id="7c96q9t$nF3" role="1sWHZn">
-            <node concept="3F0A7n" id="7c96q9t$nFb" role="2wV5jI">
-              <property role="1Intyy" value="true" />
-              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            </node>
-          </node>
-        </node>
-        <node concept="l2Vlx" id="7c96q9t$nwt" role="2iSdaV" />
-        <node concept="pkWqt" id="7c96q9t$nFe" role="pqm2j">
-          <node concept="3clFbS" id="7c96q9t$nFf" role="2VODD2">
-            <node concept="3clFbF" id="7c96q9t$nMs" role="3cqZAp">
-              <node concept="2OqwBi" id="7c96q9t$oYZ" role="3clFbG">
-                <node concept="2OqwBi" id="7c96q9t$o0b" role="2Oq$k0">
-                  <node concept="pncrf" id="7c96q9t$nMr" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="7c96q9t$owX" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="7c96q9t$p$B" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F1sOY" id="4MEOIDFttOZ" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:JOGAOsxaCc" resolve="template" />
-      </node>
-      <node concept="l2Vlx" id="4MEOIDFttNs" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxaCz">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
-    <node concept="3EZMnI" id="5hSMZ_lNwqE" role="2wV5jI">
-      <node concept="3EZMnI" id="5hSMZ_lNwqF" role="3EZMnx">
-        <node concept="VPM3Z" id="5hSMZ_lNwqG" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="PMmxH" id="5hSMZ_lNwqH" role="3EZMnx">
-          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-          <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-        </node>
-        <node concept="3F0A7n" id="5hSMZ_lNwqI" role="3EZMnx">
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-        <node concept="3F0ifn" id="5hSMZ_lNwqJ" role="3EZMnx">
-          <property role="3F0ifm" value=" " />
-          <node concept="VPxyj" id="5hSMZ_lNwqK" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="VPM3Z" id="5hSMZ_lNwqL" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="pVoyu" id="5hSMZ_lNwqM" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="ljvvj" id="5hSMZ_lNwqN" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="l2Vlx" id="5hSMZ_lNwqO" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="5hSMZ_lNwrb" role="3EZMnx">
-        <node concept="VPM3Z" id="5hSMZ_lNwrc" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F2HdR" id="5hSMZ_lNwrd" role="3EZMnx">
-          <property role="2czwfO" value=" " />
-          <ref role="1NtTu8" to="5j4j:JOGAOsxaCx" resolve="contents" />
-          <node concept="pj6Ft" id="5hSMZ_lNwre" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="l2Vlx" id="5hSMZ_lNwrf" role="2czzBx" />
-          <node concept="tppnM" id="4bWqD4CjBOI" role="sWeuL">
-            <node concept="ljvvj" id="4bWqD4CjBOK" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-          </node>
-        </node>
-        <node concept="l2Vlx" id="5hSMZ_lNwrg" role="2iSdaV" />
-      </node>
-      <node concept="l2Vlx" id="5hSMZ_lNwrh" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxlgm">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:JOGAOsxiLy" resolve="DataFormTemplate" />
-    <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
-      <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-      </node>
-      <node concept="3F2HdR" id="1pPth$m6c09" role="3EZMnx">
-        <property role="2czwfO" value=" " />
-        <ref role="1NtTu8" to="5j4j:JOGAOsxiLz" resolve="feature" />
-        <node concept="l2Vlx" id="1pPth$m6c0b" role="2czzBx" />
-        <node concept="lj46D" id="4MEOIDFC6i4" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="4MEOIDFC6kS" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="tppnM" id="1pPth$m6pwx" role="sWeuL">
-          <node concept="ljvvj" id="1pPth$m6pwB" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="7c96q9tVi07" role="2czzBI">
-          <property role="3F0ifm" value="" />
-          <property role="ilYzB" value="&lt;no features&gt;" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1pPth$m6c01" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        <node concept="pVoyu" id="4MEOIDFC6ny" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1pPth$m6bZR" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="V5hpn" id="JOGAOsxbBZ">
     <property role="TrG5h" value="DataForm" />
     <node concept="14StLt" id="4aJUH_hW38r" role="V601i">
@@ -4024,31 +3341,6 @@
       </node>
     </node>
   </node>
-  <node concept="1h_SRR" id="4vr5SAprGdP">
-    <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="DataForm_open_DELETE" />
-    <ref role="1h_SK9" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="1hA7zw" id="4vr5SAprGdQ" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
-      <node concept="1hAIg9" id="4vr5SAprGdR" role="1hA7z_">
-        <node concept="3clFbS" id="4vr5SAprGdS" role="2VODD2">
-          <node concept="3clFbF" id="4vr5SAprGe9" role="3cqZAp">
-            <node concept="2OqwBi" id="4vr5SAprGRk" role="3clFbG">
-              <node concept="2OqwBi" id="4vr5SAprGmD" role="2Oq$k0">
-                <node concept="0IXxy" id="4vr5SAprGe8" role="2Oq$k0" />
-                <node concept="3TrcHB" id="4vr5SAprGyF" role="2OqNvi">
-                  <ref role="3TsBF5" to="5j4j:4vr5SApqc6O" resolve="open" />
-                </node>
-              </node>
-              <node concept="tyxLq" id="4vr5SAprH6J" role="2OqNvi">
-                <node concept="3clFbT" id="4vr5SAprH8A" role="tz02z" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="IW6AY" id="59P$gGg4wpJ">
     <property role="3GE5qa" value="logical.item" />
     <ref role="aqKnT" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
@@ -4283,17 +3575,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="24ciDNzqIwf">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:24ciDNzqIuw" resolve="TermType" />
-    <node concept="3EZMnI" id="24ciDNzqIwk" role="2wV5jI">
-      <node concept="PMmxH" id="24ciDNzqIwr" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-      </node>
-      <node concept="l2Vlx" id="24ciDNzqIwn" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7zIaasjAKs0">
     <property role="3GE5qa" value="logical.item.expression" />
     <ref role="1XX52x" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
@@ -4933,6 +4214,59 @@
       <ref role="4PJHt" to="5j4j:1fvYCPAmuWc" resolve="ConsListNode" />
     </node>
   </node>
+  <node concept="24kQdi" id="4nUKN9YNYrP">
+    <property role="3GE5qa" value="logical.type" />
+    <ref role="1XX52x" to="5j4j:7HUwyZb1HXL" resolve="MultiLogicalType" />
+    <node concept="3EZMnI" id="4nUKN9YNYrR" role="2wV5jI">
+      <node concept="PMmxH" id="4nUKN9YNYwz" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3EZMnI" id="4nUKN9YNYw$" role="3EZMnx">
+        <node concept="VPM3Z" id="4nUKN9YNYw_" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="4nUKN9YNYwA" role="3EZMnx">
+          <property role="3F0ifm" value="&lt;" />
+          <ref role="1k5W1q" to="tpen:75A9veqzBn9" resolve="LeftAngleBracket" />
+          <node concept="11L4FC" id="4nUKN9YNYwB" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F1sOY" id="4nUKN9YNYwC" role="3EZMnx">
+          <ref role="1NtTu8" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+        </node>
+        <node concept="3F0ifn" id="4nUKN9YNYwD" role="3EZMnx">
+          <property role="3F0ifm" value="&gt;" />
+          <ref role="1k5W1q" to="tpen:75A9veqzBna" resolve="RightAngleBracket" />
+          <node concept="11LMrY" id="4nUKN9YNYwE" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="4nUKN9YNYwF" role="2iSdaV" />
+        <node concept="pkWqt" id="4nUKN9YNYwG" role="pqm2j">
+          <node concept="3clFbS" id="4nUKN9YNYwH" role="2VODD2">
+            <node concept="3clFbF" id="4nUKN9YNYwI" role="3cqZAp">
+              <node concept="2OqwBi" id="4nUKN9YNYwJ" role="3clFbG">
+                <node concept="2OqwBi" id="4nUKN9YNYwK" role="2Oq$k0">
+                  <node concept="pncrf" id="4nUKN9YNYwL" role="2Oq$k0" />
+                  <node concept="Bykcj" id="4nUKN9YNYwM" role="2OqNvi">
+                    <node concept="1aIX9F" id="4nUKN9YNYwN" role="1xVPHs">
+                      <node concept="26LbJo" id="4nUKN9YNYwO" role="1aIX9E">
+                        <ref role="26LbJp" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4nUKN9YNYwP" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="4nUKN9YNYrU" role="2iSdaV" />
+    </node>
+  </node>
   <node concept="24kQdi" id="3MfP0fwgGcn">
     <property role="3GE5qa" value="dataform" />
     <ref role="1XX52x" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
@@ -4987,73 +4321,9 @@
         </node>
       </node>
       <node concept="2kknPJ" id="3MfP0fwgGs$" role="2klrvf">
-        <ref role="2ZyFGn" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
+        <ref role="2ZyFGn" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="4nUKN9YNYrP">
-    <property role="3GE5qa" value="logical.type" />
-    <ref role="1XX52x" to="5j4j:7HUwyZb1HXL" resolve="MultiLogicalType" />
-    <node concept="3EZMnI" id="4nUKN9YNYrR" role="2wV5jI">
-      <node concept="PMmxH" id="4nUKN9YNYwz" role="3EZMnx">
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3EZMnI" id="4nUKN9YNYw$" role="3EZMnx">
-        <node concept="VPM3Z" id="4nUKN9YNYw_" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4nUKN9YNYwA" role="3EZMnx">
-          <property role="3F0ifm" value="&lt;" />
-          <ref role="1k5W1q" to="tpen:75A9veqzBn9" resolve="LeftAngleBracket" />
-          <node concept="11L4FC" id="4nUKN9YNYwB" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F1sOY" id="4nUKN9YNYwC" role="3EZMnx">
-          <ref role="1NtTu8" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-        </node>
-        <node concept="3F0ifn" id="4nUKN9YNYwD" role="3EZMnx">
-          <property role="3F0ifm" value="&gt;" />
-          <ref role="1k5W1q" to="tpen:75A9veqzBna" resolve="RightAngleBracket" />
-          <node concept="11LMrY" id="4nUKN9YNYwE" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="l2Vlx" id="4nUKN9YNYwF" role="2iSdaV" />
-        <node concept="pkWqt" id="4nUKN9YNYwG" role="pqm2j">
-          <node concept="3clFbS" id="4nUKN9YNYwH" role="2VODD2">
-            <node concept="3clFbF" id="4nUKN9YNYwI" role="3cqZAp">
-              <node concept="2OqwBi" id="4nUKN9YNYwJ" role="3clFbG">
-                <node concept="2OqwBi" id="4nUKN9YNYwK" role="2Oq$k0">
-                  <node concept="pncrf" id="4nUKN9YNYwL" role="2Oq$k0" />
-                  <node concept="Bykcj" id="4nUKN9YNYwM" role="2OqNvi">
-                    <node concept="1aIX9F" id="4nUKN9YNYwN" role="1xVPHs">
-                      <node concept="26LbJo" id="4nUKN9YNYwO" role="1aIX9E">
-                        <ref role="26LbJp" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="4nUKN9YNYwP" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="4nUKN9YNYrU" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="4nUKN9YPlxW">
-    <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
-    <node concept="3EZMnI" id="4nUKN9YPlxY" role="2wV5jI">
-      <node concept="PMmxH" id="4nUKN9YPlxZ" role="3EZMnx">
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="l2Vlx" id="4nUKN9YPly0" role="2iSdaV" />
-    </node>
-  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index e20d6d7e..411ac7e1 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -20,7 +20,6 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
   </imports>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 99329dae..dc4a65d4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -9,6 +9,7 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -46,7 +47,6 @@
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
-        <property id="1096454100552" name="rootable" index="19KtqR" />
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
@@ -377,188 +377,11 @@
       <property role="t5JxN" value="An abstraction of data nodes and variables." />
     </node>
   </node>
-  <node concept="1TIwiD" id="JOGAOsxm2z">
-    <property role="EcuMT" value="861509610434289827" />
-    <property role="TrG5h" value="ChildFeature" />
-    <property role="34LRSv" value="child" />
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="t5JxF" id="3MfP0fwg5vf" role="lGtFl">
-      <property role="t5JxN" value="Feature declaration of child term." />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxiL_">
-    <property role="EcuMT" value="861509610434276453" />
-    <property role="TrG5h" value="DataFormFeature" />
-    <property role="R5$K7" value="true" />
-    <property role="R5$K2" value="false" />
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyi" id="JOGAOsxiLC" role="1TKVEl">
-      <property role="IQ2nx" value="861509610434276456" />
-      <property role="TrG5h" value="final" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
-    <node concept="PrWs8" id="JOGAOsxiLA" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="1TJgyj" id="JOGAOsxmrx" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434291425" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="getter" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uK" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermFeature!! Defines a term feature." />
-      <node concept="t5JxR" id="3MfP0fwg5vc" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxiLy" resolve="DataFormTemplate" />
-      </node>
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxTDl">
-    <property role="EcuMT" value="861509610434435669" />
-    <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="DataFormFeatureOverride" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxTDo" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434435672" />
-      <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    </node>
-    <node concept="1TJgyj" id="JOGAOsxTDm" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434435670" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="getter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uI" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermFeatureOverride!! Allows to override default feature value in term constructor" />
-      <node concept="t5JxR" id="3MfP0fwg5uX" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
-      </node>
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxpXw">
-    <property role="EcuMT" value="861509610434305888" />
-    <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="ListFeature" />
-    <property role="34LRSv" value="list" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="t5JxF" id="3MfP0fwg5w7" role="lGtFl">
-      <property role="t5JxN" value="Feature declaration of a list of child terms." />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxnj6">
-    <property role="EcuMT" value="861509610434294982" />
-    <property role="TrG5h" value="ValueFeature" />
-    <property role="34LRSv" value="value" />
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="t5JxF" id="3MfP0fwg5w9" role="lGtFl">
-      <property role="t5JxN" value="Feature declaration of an Object value." />
-    </node>
-  </node>
   <node concept="PlHQZ" id="JOGAOsIRhm">
     <property role="EcuMT" value="861509610437833814" />
     <property role="TrG5h" value="Capture" />
     <property role="3GE5qa" value="logical" />
   </node>
-  <node concept="1TIwiD" id="JOGAOsxanH">
-    <property role="EcuMT" value="861509610434242029" />
-    <property role="TrG5h" value="DataFormConstructor" />
-    <property role="3GE5qa" value="term" />
-    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243078" />
-      <property role="20kJfa" value="decl" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="JOGAOsxaC4" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243076" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="override" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uG" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermConstructor!! Creates a term using the template. Enables to override features." />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxaC9">
-    <property role="EcuMT" value="861509610434243081" />
-    <property role="TrG5h" value="DataFormDeclaration" />
-    <property role="3GE5qa" value="term" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyi" id="4vr5SApqc6O" role="1TKVEl">
-      <property role="IQ2nx" value="5177758076344254900" />
-      <property role="TrG5h" value="open" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
-    <node concept="1TJgyj" id="JOGAOsxaCc" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243084" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxiLy" resolve="DataFormTemplate" />
-    </node>
-    <node concept="PrWs8" id="JOGAOsxaCa" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="1TJgyj" id="JOGAOsxaCh" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243089" />
-      <property role="20kJfa" value="prototype" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uQ" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermDeclaration!! Contains term template. Provides possibility to extend another term declaration." />
-      <node concept="t5JxR" id="3MfP0fwg5v7" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxaCw" resolve="DataFormTable" />
-      </node>
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxaCw">
-    <property role="EcuMT" value="861509610434243104" />
-    <property role="TrG5h" value="DataFormTable" />
-    <property role="34LRSv" value="DataForm Table" />
-    <property role="19KtqR" value="true" />
-    <property role="3GE5qa" value="term" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243105" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
-    </node>
-    <node concept="PrWs8" id="JOGAOsxfAQ" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uO" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermTable!! Contains term declarations." />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxiLy">
-    <property role="EcuMT" value="861509610434276450" />
-    <property role="TrG5h" value="DataFormTemplate" />
-    <property role="3GE5qa" value="term" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434276451" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    </node>
-    <node concept="t5JxF" id="3MfP0fwg5uM" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermTemplate!! Defines a term structure by enumerating features." />
-      <node concept="t5JxR" id="3MfP0fwg5v2" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
-      </node>
-    </node>
-  </node>
   <node concept="1TIwiD" id="7lt0LtQg3tE">
     <property role="EcuMT" value="8456919074574710634" />
     <property role="TrG5h" value="ExpressionItem" />
@@ -610,13 +433,6 @@
       <property role="t5JxN" value="!!FIXME rename to LogicalVariableDataForm!! Allows to use a logical variable that represents a data form." />
     </node>
   </node>
-  <node concept="1TIwiD" id="24ciDNzqIuw">
-    <property role="EcuMT" value="2381360340662937504" />
-    <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TermType" />
-    <property role="34LRSv" value="term" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
-  </node>
   <node concept="1TIwiD" id="7zIaasjAAux">
     <property role="EcuMT" value="8713947027062024097" />
     <property role="3GE5qa" value="logical.item.expression" />
@@ -689,15 +505,8 @@
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="constructor" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxanH" resolve="DataFormConstructor" />
+      <ref role="20lvS9" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
     </node>
   </node>
-  <node concept="1TIwiD" id="4nUKN9YPlxw">
-    <property role="EcuMT" value="5042557354438383712" />
-    <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="TermListType" />
-    <property role="34LRSv" value="termlist" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
-  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index ca6b73ef..73f750f2 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -122,7 +122,6 @@
         <child id="1205761991995" name="argumentRepresentator" index="2X0Ygz" />
       </concept>
       <concept id="1175147569072" name="jetbrains.mps.lang.typesystem.structure.AbstractSubtypingRule" flags="ig" index="2sgdUx">
-        <property id="1175607673137" name="isWeak" index="2RFo0w" />
         <child id="1175147624276" name="body" index="2sgrp5" />
       </concept>
       <concept id="1175147670730" name="jetbrains.mps.lang.typesystem.structure.SubtypingRule" flags="ig" index="2sgARr" />
@@ -1225,24 +1224,6 @@
       </node>
     </node>
   </node>
-  <node concept="2sgARr" id="24ciDNzqUsw">
-    <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="supertypesOf_TermType" />
-    <property role="2RFo0w" value="true" />
-    <node concept="3clFbS" id="24ciDNzqUsx" role="2sgrp5">
-      <node concept="3clFbF" id="24ciDNzqUu6" role="3cqZAp">
-        <node concept="2c44tf" id="24ciDNzqUu4" role="3clFbG">
-          <node concept="3uibUv" id="24ciDNzqUv3" role="2c44tc">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="24ciDNzqUtF" role="1YuTPh">
-      <property role="TrG5h" value="termType" />
-      <ref role="1YaFvo" to="5j4j:24ciDNzqIuw" resolve="TermType" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7zIaasjBj$L">
     <property role="TrG5h" value="typeof_LogicalItemValueExpression" />
     <property role="3GE5qa" value="logical.item.expression" />
@@ -1385,22 +1366,5 @@
       <ref role="1YaFvo" to="5j4j:hYA4REbm1C" resolve="LogicalVariableRefExpression" />
     </node>
   </node>
-  <node concept="2sgARr" id="4nUKN9YPlyX">
-    <property role="3GE5qa" value="term" />
-    <property role="TrG5h" value="supertypesOf_TermListType" />
-    <node concept="3clFbS" id="4nUKN9YPlyY" role="2sgrp5">
-      <node concept="3clFbF" id="4nUKN9YPlzW" role="3cqZAp">
-        <node concept="2c44tf" id="4nUKN9YPlzX" role="3clFbG">
-          <node concept="3uibUv" id="4nUKN9YPl$t" role="2c44tc">
-            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="4nUKN9YPlz0" role="1YuTPh">
-      <property role="TrG5h" value="termListType" />
-      <ref role="1YaFvo" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
-    </node>
-  </node>
 </model>