diff --git a/.mps/modules.xml b/.mps/modules.xml
index 33f32ed9..7dca51d2 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" folder="controlflow" />
@@ -28,11 +27,11 @@
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.ui" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.service" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.sandbox/jetbrains.mps.fitch.sandbox.msd" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd" folder="samples.fitch" />
+      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.sandbox/jetbrains.mps.fitch.sandbox.msd" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/build/build.msd" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/sample.demo/sample.demo.msd" folder="samples.lambdacalc" />
@@ -43,4 +42,4 @@
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="samples.mpscore.samples" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 32c4464c..575421bc 100644
--- a/build.xml
+++ b/build.xml
@@ -56,84 +56,6 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.build-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.dataform.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.dataform" type="language" uuid="942985d5-7bcf-46ee-8b79-7b662eaebb4e">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.dataform.jar" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.dataform-generator.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.dataform#01" type="generator" uuid="f4b71823-159e-4008-bbeb-35dd1c907ab2">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-generator-template">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.jar/META-INF/module.xml">
@@ -184,6 +106,7 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <classpath>
@@ -1087,6 +1010,7 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@@ -1376,84 +1300,6 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.build-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.dataform.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.dataform" type="language" uuid="942985d5-7bcf-46ee-8b79-7b662eaebb4e">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.dataform.jar1" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.dataform#01" type="generator" uuid="f4b71823-159e-4008-bbeb-35dd1c907ab2">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-generator-template1">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models1">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-generator-template1" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models1" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF/module.xml">
@@ -1504,6 +1350,7 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
         <classpath>
@@ -2322,6 +2169,7 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@@ -2530,7 +2378,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.typechecking.build, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.typechecking.testlang.sandbox, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.typechecking.reporting" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.typechecking.build, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.typechecking.testlang.sandbox, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.typechecking.reporting" />
   
   <target name="processResources" />
   
@@ -2644,22 +2492,23 @@
       <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <chunk>
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" />
-        <module file="${basedir}/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
       </chunk>
+      <chunk bootstrap="true">
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" bootstrap="true" />
+        <module file="${basedir}/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
+      </chunk>
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" />
-        <module file="${basedir}/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" />
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" />
@@ -2705,108 +2554,6 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.dataform" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.dataform" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
-        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.dataform#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.dataform#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
-        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
   <target name="java.compile.jetbrains.mps.logic.runtime" depends="fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -2843,7 +2590,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2863,7 +2610,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2895,7 +2644,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2908,19 +2657,22 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
@@ -3015,7 +2767,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3040,7 +2792,6 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
@@ -3069,7 +2820,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3094,7 +2845,6 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
@@ -3591,7 +3341,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.controlflow" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.controlflow" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3616,7 +3366,6 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
@@ -3645,7 +3394,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.controlflow#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.controlflow#01" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3670,7 +3419,6 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
@@ -3814,7 +3562,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3842,7 +3590,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
@@ -3891,7 +3638,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3919,7 +3666,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
@@ -4270,7 +4016,6 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.jar" />
-      <pathelement location="${build.layout}/deploy/jetbrains.mps.dataform.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.template.jar" />
@@ -4351,8 +4096,6 @@
   
   <target name="cleanSources">
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.build/source_gen" />
@@ -4361,19 +4104,16 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" />
diff --git a/coderules/languages/jetbrains.mps.dataform/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.dataform/generator/template/main@generator.mps
deleted file mode 100644
index 6745166d..00000000
--- a/coderules/languages/jetbrains.mps.dataform/generator/template/main@generator.mps
+++ /dev/null
@@ -1,1508 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:91bd301f-2422-43ff-a65a-164ce5612bdc(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.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="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
-    <import index="tluy" ref="r:f64e5caa-8a67-46ab-9011-edcf818c4d24(jetbrains.mps.dataform.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">
-      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <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" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </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="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
-        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
-      </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="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-        <child id="1107880067339" name="method" index="3MN40a" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </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="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
-        <reference id="1116615189566" name="classifier" index="3VsUkX" />
-      </concept>
-    </language>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
-      </concept>
-      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
-        <child id="1177093586806" name="templateNode" index="gfFT$" />
-      </concept>
-      <concept id="1168559512253" name="jetbrains.mps.lang.generator.structure.DismissTopMappingRule" flags="lg" index="j$LIH">
-        <child id="1169669152123" name="generatorMessage" index="1lHHLF" />
-      </concept>
-      <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
-        <child id="1168558750579" name="defaultConsequence" index="jxRDz" />
-        <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
-      </concept>
-      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
-        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
-      </concept>
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
-        <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
-        <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
-      </concept>
-      <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
-        <reference id="5005282049925926522" name="parameter" index="v3LJV" />
-      </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
-        <reference id="1722980698497626483" name="template" index="v9R2y" />
-        <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
-      </concept>
-      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
-      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
-        <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
-        <reference id="1200917515464" name="labelDeclaration" index="2sgKRv" />
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
-      </concept>
-      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
-        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
-        <child id="1195158408710" name="case" index="14ZwWg" />
-      </concept>
-      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
-        <child id="1195158608805" name="conditionFunction" index="150hEN" />
-        <child id="1195158637244" name="caseConsequence" index="150oIE" />
-      </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
-        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
-      </concept>
-      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
-        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
-        <reference id="1167514355421" name="template" index="3lhOvi" />
-      </concept>
-      <concept id="1169670156577" name="jetbrains.mps.lang.generator.structure.GeneratorMessage" flags="lg" index="1lLz0L">
-        <property id="1169670173015" name="messageText" index="1lLB17" />
-        <property id="1169670356567" name="messageType" index="1lMjX7" />
-      </concept>
-      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
-        <child id="982871510064032342" name="parameter" index="1s_3oS" />
-      </concept>
-      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX" />
-      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
-      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
-      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
-      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
-        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
-      </concept>
-      <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
-        <child id="1805153994415893199" name="type" index="1N15GL" />
-      </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
-        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
-      </concept>
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
-        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
-      </concept>
-    </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
-        <child id="1229477520175" name="outputNode" index="12$y8L" />
-      </concept>
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
-    </language>
-    <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
-      <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
-        <child id="238586457668550958" name="expression" index="22Ky0K" />
-      </concept>
-      <concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
-        <child id="2105510410850136264" name="contents" index="KCVpo" />
-      </concept>
-      <concept id="6694277639409954681" name="jetbrains.mps.logic.structure.ListRole" flags="ng" index="38e3lM">
-        <child id="6694277639409954746" name="list" index="38e3mL" />
-      </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
-        <child id="7571593955706125526" name="root" index="1oi0x0" />
-      </concept>
-      <concept id="7571593955706137263" name="jetbrains.mps.logic.structure.ChildRole" flags="ng" index="1oi5ST">
-        <child id="7571593955706137319" name="contents" index="1oi5TL" />
-      </concept>
-      <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN">
-        <child id="7571593955706284441" name="role" index="1ojpOf" />
-      </concept>
-      <concept id="7571593955706137472" name="jetbrains.mps.logic.structure.ValueRole" flags="ng" index="1oi5Wm">
-        <child id="7571593955706137672" name="contents" index="1oi5zu" />
-      </concept>
-      <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
-        <property id="7571593955706137638" name="value" index="1oi5yK" />
-      </concept>
-    </language>
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
-      <concept id="1173996401517" name="jetbrains.mps.baseLanguageInternal.structure.InternalNewExpression" flags="nn" index="1nCR9W">
-        <property id="1173996588177" name="fqClassName" index="1nD$Q0" />
-        <child id="1179332974947" name="type" index="2lIhxL" />
-        <child id="319021450862590135" name="actualArgument" index="2U2pNA" />
-      </concept>
-      <concept id="3421461530438559752" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClassCreator" flags="nn" index="1L3L4E">
-        <child id="3421461530438560031" name="cls" index="1L3L0X" />
-      </concept>
-      <concept id="3421461530438559753" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClass" flags="ig" index="1L3L4F">
-        <property id="3421461530438559973" name="fqClassName" index="1L3L77" />
-        <child id="3421461530438559756" name="constructorArgument" index="1L3L4I" />
-        <child id="3421461530438559974" name="type" index="1L3L74" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="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="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="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <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="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="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">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
-        <property id="1757699476691236117" name="propertyName" index="2qtEX9" />
-        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
-      </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
-    </language>
-  </registry>
-  <node concept="bUwia" id="JOGAOsxaig">
-    <property role="TrG5h" value="main" />
-    <node concept="3lhOvk" id="JOGAOsHmdz" role="3lj3bC">
-      <ref role="30HIoZ" to="dff3:JOGAOsxaCw" resolve="DataFormTable" />
-      <ref role="3lhOvi" node="JOGAOsG6LJ" resolve="_DataFormTable" />
-      <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="dataformtable_class" />
-    </node>
-    <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
-      <ref role="30HIoZ" to="dff3:JOGAOsxanH" resolve="DataForm" />
-      <node concept="14YyZ8" id="5hSMZ_lfXvV" role="1lVwrX">
-        <node concept="14ZrTv" id="5hSMZ_ljA5j" role="14ZwWg">
-          <node concept="30G5F_" id="5hSMZ_ljA5k" role="150hEN">
-            <node concept="3clFbS" id="5hSMZ_ljA5l" role="2VODD2">
-              <node concept="3clFbF" id="5hSMZ_ljA5m" role="3cqZAp">
-                <node concept="2OqwBi" id="5hSMZ_ljXun" role="3clFbG">
-                  <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="dff3:JOGAOsxaC4" resolve="override" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="5hSMZ_ljA5E" role="150oIE">
-            <node concept="3clFbS" id="5hSMZ_ljA5F" role="1Koe22">
-              <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
-                <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
-                  <node concept="liA8E" id="5hSMZ_ljA5I" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
-                  </node>
-                  <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
-                    <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
-                      <node concept="1L3L4E" id="5hSMZ_ljA5L" role="2ShVmc">
-                        <node concept="1L3L4F" id="5hSMZ_ljA5M" role="1L3L0X">
-                          <property role="2bfB8j" value="true" />
-                          <property role="1L3L77" value="TermDeclaration" />
-                          <node concept="3clFbT" id="5hSMZ_ljA5N" role="1L3L4I">
-                            <property role="3clFbU" value="true" />
-                            <node concept="17Uvod" id="5hSMZ_ljI$V" role="lGtFl">
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
-                              <property role="2qtEX9" value="value" />
-                              <node concept="3zFVjK" id="5hSMZ_ljI$W" role="3zH0cK">
-                                <node concept="3clFbS" id="5hSMZ_ljI$X" role="2VODD2">
-                                  <node concept="3clFbF" id="JOGAOt3DqL" role="3cqZAp">
-                                    <node concept="2OqwBi" id="JOGAOt3Fjr" role="3clFbG">
-                                      <node concept="2OqwBi" id="JOGAOt3Ezk" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="JOGAOt3DEh" role="2Oq$k0">
-                                          <node concept="1iwH7S" id="JOGAOt3DqK" role="2Oq$k0" />
-                                          <node concept="12$id9" id="JOGAOt3EaC" role="2OqNvi">
-                                            <node concept="30H73N" id="JOGAOt3EjQ" role="12$y8L" />
-                                          </node>
-                                        </node>
-                                        <node concept="2Xjw5R" id="JOGAOt3ET8" role="2OqNvi">
-                                          <node concept="1xMEDy" id="JOGAOt3ETa" role="1xVPHs">
-                                            <node concept="chp4Y" id="JOGAOt3F2s" role="ri$Ld">
-                                              <ref role="cht4Q" to="dff3:JOGAOsIRhm" resolve="Capture" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3x8VRR" id="JOGAOt3FE4" role="2OqNvi" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
-                            <property role="TrG5h" value="feature" />
-                            <node concept="3uibUv" id="5hSMZ_ljA5Z" role="3clF45">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                            </node>
-                            <node concept="3Tm1VV" id="7c96q9tP8pA" role="1B3o_S" />
-                            <node concept="3clFbS" id="5hSMZ_ljA61" role="3clF47">
-                              <node concept="3clFbF" id="5hSMZ_ljA62" role="3cqZAp">
-                                <node concept="10Nm6u" id="5hSMZ_ljA63" role="3clFbG">
-                                  <node concept="1sPUBX" id="5hSMZ_ljA64" role="lGtFl">
-                                    <ref role="v9R2y" node="3kjrYXAPkJB" resolve="dataform_feature_override" />
-                                    <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="dff3: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="dff3:JOGAOsxTDo" resolve="feature" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="17Uvod" id="5hSMZ_ljA6e" role="lGtFl">
-                              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                              <property role="2qtEX9" value="name" />
-                              <node concept="3zFVjK" id="5hSMZ_ljA6f" role="3zH0cK">
-                                <node concept="3clFbS" id="5hSMZ_ljA6g" role="2VODD2">
-                                  <node concept="3clFbF" id="5hSMZ_ljA6h" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5hSMZ_ljA6i" role="3clFbG">
-                                      <node concept="2OqwBi" id="5hSMZ_ljA6j" role="2Oq$k0">
-                                        <node concept="30H73N" id="5hSMZ_ljA6k" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="JOGAOsGRPZ" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="dff3:JOGAOsxTDo" resolve="feature" />
-                                        </node>
-                                      </node>
-                                      <node concept="3TrcHB" id="5hSMZ_ljA6m" role="2OqNvi">
-                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="1WS0z7" id="5hSMZ_ljA6n" role="lGtFl">
-                              <node concept="3JmXsc" id="5hSMZ_ljA6o" role="3Jn$fo">
-                                <node concept="3clFbS" id="5hSMZ_ljA6p" role="2VODD2">
-                                  <node concept="3clFbF" id="5hSMZ_ljA6q" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5hSMZ_ljA6r" role="3clFbG">
-                                      <node concept="30H73N" id="5hSMZ_ljA6s" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="JOGAOsGNB4" role="2OqNvi">
-                                        <ref role="3TtcxE" to="dff3:JOGAOsxaC4" resolve="override" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3Tm1VV" id="5hSMZ_ljA6u" role="1B3o_S" />
-                          <node concept="3uibUv" id="5hSMZ_ljA6v" role="1L3L74">
-                            <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-                          </node>
-                          <node concept="17Uvod" id="5hSMZ_ljA6w" role="lGtFl">
-                            <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
-                            <property role="2qtEX9" value="fqClassName" />
-                            <node concept="3zFVjK" id="5hSMZ_ljA6x" role="3zH0cK">
-                              <node concept="3clFbS" id="5hSMZ_ljA6y" role="2VODD2">
-                                <node concept="3clFbF" id="3kjrYXAJz9I" role="3cqZAp">
-                                  <node concept="2OqwBi" id="3kjrYXAJAQJ" role="3clFbG">
-                                    <node concept="1PxgMI" id="3kjrYXAJAdN" role="2Oq$k0">
-                                      <property role="1BlNFB" value="true" />
-                                      <node concept="chp4Y" id="JOGAOsGSXE" role="3oSUPX">
-                                        <ref role="cht4Q" to="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-                                      </node>
-                                      <node concept="2OqwBi" id="3kjrYXAJ$7j" role="1m5AlR">
-                                        <node concept="1iwH7S" id="3kjrYXAJz9G" role="2Oq$k0" />
-                                        <node concept="12$id9" id="3kjrYXAJ$tR" role="2OqNvi">
-                                          <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="dff3:JOGAOsxaC6" resolve="decl" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2qgKlT" id="JOGAOsGXNz" role="2OqNvi">
-                                      <ref role="37wK5l" to="tluy:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="5hSMZ_ljA6D" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="5hSMZ_lfXyG" role="14YRTM">
-          <node concept="3clFbF" id="5hSMZ_ljTTK" role="1Koe22">
-            <node concept="2OqwBi" id="5hSMZ_ljTTL" role="3clFbG">
-              <node concept="1eOMI4" id="5hSMZ_ljTTM" role="2Oq$k0">
-                <node concept="1nCR9W" id="5hSMZ_ljTTN" role="1eOMHV">
-                  <property role="1nD$Q0" value="TermDeclaration" />
-                  <node concept="3clFbT" id="5hSMZ_ljTTO" role="2U2pNA">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                  <node concept="3uibUv" id="5hSMZ_ljTTZ" role="2lIhxL">
-                    <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-                  </node>
-                  <node concept="17Uvod" id="5hSMZ_ljTU0" role="lGtFl">
-                    <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
-                    <property role="2qtEX9" value="fqClassName" />
-                    <node concept="3zFVjK" id="5hSMZ_ljTU1" role="3zH0cK">
-                      <node concept="3clFbS" id="5hSMZ_ljTU2" role="2VODD2">
-                        <node concept="3clFbF" id="3kjrYXAJFsn" role="3cqZAp">
-                          <node concept="2OqwBi" id="3kjrYXAJFsp" role="3clFbG">
-                            <node concept="1PxgMI" id="3kjrYXAJFsq" role="2Oq$k0">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="chp4Y" id="JOGAOsGY9c" role="3oSUPX">
-                                <ref role="cht4Q" to="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-                              </node>
-                              <node concept="2OqwBi" id="3kjrYXAJFss" role="1m5AlR">
-                                <node concept="1iwH7S" id="3kjrYXAJFst" role="2Oq$k0" />
-                                <node concept="12$id9" id="3kjrYXAJFsu" role="2OqNvi">
-                                  <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="dff3:JOGAOsxaC6" resolve="decl" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="JOGAOsGYCo" role="2OqNvi">
-                              <ref role="37wK5l" to="tluy:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
-              </node>
-              <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <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="dff3: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="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-    </node>
-  </node>
-  <node concept="312cEu" id="JOGAOsG6LJ">
-    <property role="TrG5h" value="_DataFormTable" />
-    <node concept="2tJIrI" id="JOGAOsG6Ml" role="jymVt" />
-    <node concept="312cEu" id="5hSMZ_lNZg9" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="_DataForm" />
-      <node concept="2tJIrI" id="5hSMZ_lNZga" role="jymVt" />
-      <node concept="3clFbW" id="5hSMZ_lNZgb" role="jymVt">
-        <node concept="37vLTG" id="5hSMZ_lNZgc" role="3clF46">
-          <property role="TrG5h" value="pattern" />
-          <node concept="10P_77" id="5hSMZ_lNZgd" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="5hSMZ_lNZgu" role="3clF45" />
-        <node concept="3Tm1VV" id="5hSMZ_lNZgv" role="1B3o_S" />
-        <node concept="3clFbS" id="5hSMZ_lNZgw" role="3clF47">
-          <node concept="3clFbF" id="5hSMZ_lNZgx" role="3cqZAp">
-            <node concept="37vLTI" id="5hSMZ_lNZgy" role="3clFbG">
-              <node concept="37vLTw" id="5hSMZ_lNZgz" role="37vLTx">
-                <ref role="3cqZAo" node="5hSMZ_lNZgc" resolve="pattern" />
-              </node>
-              <node concept="2OqwBi" id="5hSMZ_lNZg$" role="37vLTJ">
-                <node concept="Xjq3P" id="5hSMZ_lNZg_" role="2Oq$k0" />
-                <node concept="2OwXpG" id="5hSMZ_lNZgA" role="2OqNvi">
-                  <ref role="2Oxat5" node="5hSMZ_lNZgX" resolve="pattern" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7c96q9tN0Kt" role="jymVt" />
-      <node concept="3clFb_" id="5hSMZ_lNZhp" role="jymVt">
-        <property role="TrG5h" value="feature" />
-        <node concept="3uibUv" id="5hSMZ_lNZhq" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-        <node concept="3Tm1VV" id="7c96q9tN7xJ" role="1B3o_S" />
-        <node concept="3clFbS" id="5hSMZ_lNZhs" role="3clF47">
-          <node concept="3clFbJ" id="5hSMZ_lNZht" role="3cqZAp">
-            <node concept="37vLTw" id="5hSMZ_lNZhz" role="3clFbw">
-              <ref role="3cqZAo" node="5hSMZ_lNZgX" resolve="pattern" />
-            </node>
-            <node concept="3clFbS" id="5hSMZ_lNZhu" role="3clFbx">
-              <node concept="3cpWs6" id="5hSMZ_lNZhv" role="3cqZAp">
-                <node concept="10Nm6u" id="5hSMZ_lNZhw" role="3cqZAk">
-                  <node concept="1sPUBX" id="5hSMZ_lNZhx" role="lGtFl">
-                    <ref role="v9R2y" node="JOGAOsGlpT" resolve="dataform_pattern" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5hSMZ_lNZhy" role="3cqZAp" />
-            </node>
-            <node concept="9aQIb" id="5hSMZ_lNZh$" role="9aQIa">
-              <node concept="3clFbS" id="5hSMZ_lNZh_" role="9aQI4">
-                <node concept="3cpWs6" id="5hSMZ_lNZhA" role="3cqZAp">
-                  <node concept="10Nm6u" id="5hSMZ_lNZhB" role="3cqZAk">
-                    <node concept="1sPUBX" id="5hSMZ_lNZhC" role="lGtFl">
-                      <ref role="v9R2y" node="1L74NXFa1BL" resolve="dataform_getter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1WS0z7" id="5hSMZ_lNZhD" role="lGtFl">
-          <ref role="2rW$FS" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-          <node concept="3JmXsc" id="5hSMZ_lNZhE" role="3Jn$fo">
-            <node concept="3clFbS" id="5hSMZ_lNZhF" role="2VODD2">
-              <node concept="3clFbF" id="5hSMZ_lNZhG" role="3cqZAp">
-                <node concept="2OqwBi" id="5hSMZ_lNZhH" role="3clFbG">
-                  <node concept="3Tsc0h" id="JOGAOsGeIA" role="2OqNvi">
-                    <ref role="3TtcxE" to="dff3: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="dff3:JOGAOsxaCc" resolve="template" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="17Uvod" id="5hSMZ_lNZhM" role="lGtFl">
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <property role="2qtEX9" value="name" />
-          <node concept="3zFVjK" id="5hSMZ_lNZhN" role="3zH0cK">
-            <node concept="3clFbS" id="5hSMZ_lNZhO" role="2VODD2">
-              <node concept="3clFbF" id="5hSMZ_lNZhP" role="3cqZAp">
-                <node concept="2OqwBi" id="5hSMZ_lNZhQ" role="3clFbG">
-                  <node concept="30H73N" id="5hSMZ_lNZhR" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="5hSMZ_lNZhS" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="5hSMZ_lNZhT" role="jymVt" />
-      <node concept="3clFb_" id="5hSMZ_lNZhU" role="jymVt">
-        <property role="TrG5h" value="getTerm" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="3uibUv" id="5hSMZ_lNZhV" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-        <node concept="3Tm1VV" id="5hSMZ_lNZhW" role="1B3o_S" />
-        <node concept="3clFbS" id="5hSMZ_lNZhX" role="3clF47">
-          <node concept="3cpWs6" id="5hSMZ_lNZhY" role="3cqZAp">
-            <node concept="1oi1Uc" id="5hSMZ_lNZhZ" role="3cqZAk">
-              <node concept="1oi5UN" id="5hSMZ_lNZi0" role="1oi0x0">
-                <node concept="1oi5Wm" id="7c96q9twtFA" role="1ojpOf">
-                  <property role="TrG5h" value="_term" />
-                  <node concept="1oi5XN" id="7c96q9twuu3" role="1oi5zu">
-                    <property role="1oi5yK" value="symbol" />
-                    <node concept="17Uvod" id="7c96q9twv9A" role="lGtFl">
-                      <property role="P4ACc" value="35320f26-77cb-4c55-be9f-a97a27770af1/7571593955706137573/7571593955706137638" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="7c96q9twv9D" role="3zH0cK">
-                        <node concept="3clFbS" id="7c96q9twv9E" role="2VODD2">
-                          <node concept="3clFbF" id="7c96q9twv9K" role="3cqZAp">
-                            <node concept="2OqwBi" id="7c96q9twv9F" role="3clFbG">
-                              <node concept="2qgKlT" id="7c96q9t$RYJ" role="2OqNvi">
-                                <ref role="37wK5l" to="tluy:7c96q9t$Nk0" resolve="symbol" />
-                              </node>
-                              <node concept="30H73N" id="7c96q9twv9J" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1oi5Wm" id="5hSMZ_lNZi1" role="1ojpOf">
-                  <property role="TrG5h" value="name" />
-                  <node concept="1WS0z7" id="5hSMZ_lNZi2" role="lGtFl">
-                    <node concept="3JmXsc" id="5hSMZ_lNZi3" role="3Jn$fo">
-                      <node concept="3clFbS" id="5hSMZ_lNZi4" role="2VODD2">
-                        <node concept="3clFbF" id="5hSMZ_lNZi5" role="3cqZAp">
-                          <node concept="2OqwBi" id="5hSMZ_lNZi7" role="3clFbG">
-                            <node concept="30H73N" id="5hSMZ_lNZi8" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="7c96q9tG5wV" role="2OqNvi">
-                              <ref role="37wK5l" to="tluy:7c96q9tALRr" resolve="valueFeatures" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="22Ky0T" id="5hSMZ_lNZib" role="lGtFl">
-                    <node concept="2OqwBi" id="5hSMZ_lNZic" role="22Ky0K">
-                      <node concept="Xjq3P" id="5hSMZ_lNZid" role="2Oq$k0">
-                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_DataFormTable._DataForm" />
-                      </node>
-                      <node concept="liA8E" id="5hSMZ_lNZie" role="2OqNvi">
-                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                        <node concept="1ZhdrF" id="5hSMZ_lNZif" role="lGtFl">
-                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                          <property role="2qtEX8" value="baseMethodDeclaration" />
-                          <node concept="3$xsQk" id="5hSMZ_lNZig" role="3$ytzL">
-                            <node concept="3clFbS" id="5hSMZ_lNZih" role="2VODD2">
-                              <node concept="3clFbF" id="5hSMZ_lNZii" role="3cqZAp">
-                                <node concept="2OqwBi" id="5hSMZ_lNZij" role="3clFbG">
-                                  <node concept="1iwH7S" id="5hSMZ_lNZik" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="5hSMZ_lNZil" role="2OqNvi">
-                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                    <node concept="30H73N" id="5hSMZ_lNZim" role="1iwH7V" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1oi5ST" id="5hSMZ_lNZin" role="1ojpOf">
-                  <property role="TrG5h" value="name" />
-                  <node concept="1WS0z7" id="5hSMZ_lNZio" role="lGtFl">
-                    <node concept="3JmXsc" id="5hSMZ_lNZip" role="3Jn$fo">
-                      <node concept="3clFbS" id="5hSMZ_lNZiq" role="2VODD2">
-                        <node concept="3clFbF" id="5hSMZ_lNZir" role="3cqZAp">
-                          <node concept="2OqwBi" id="5hSMZ_lNZit" role="3clFbG">
-                            <node concept="30H73N" id="5hSMZ_lNZiu" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="7c96q9tG6hO" role="2OqNvi">
-                              <ref role="37wK5l" to="tluy:7c96q9tCSX_" resolve="childFeatures" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="22Ky0T" id="5hSMZ_lNZix" role="lGtFl">
-                    <node concept="2OqwBi" id="5hSMZ_lNZiy" role="22Ky0K">
-                      <node concept="Xjq3P" id="5hSMZ_lNZiz" role="2Oq$k0">
-                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_DataFormTable._DataForm" />
-                      </node>
-                      <node concept="liA8E" id="5hSMZ_lNZi$" role="2OqNvi">
-                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                        <node concept="1ZhdrF" id="5hSMZ_lNZi_" role="lGtFl">
-                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                          <property role="2qtEX8" value="baseMethodDeclaration" />
-                          <node concept="3$xsQk" id="5hSMZ_lNZiA" role="3$ytzL">
-                            <node concept="3clFbS" id="5hSMZ_lNZiB" role="2VODD2">
-                              <node concept="3clFbF" id="5hSMZ_lNZiC" role="3cqZAp">
-                                <node concept="2OqwBi" id="5hSMZ_lNZiD" role="3clFbG">
-                                  <node concept="1iwH7S" id="5hSMZ_lNZiE" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="5hSMZ_lNZiF" role="2OqNvi">
-                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                    <node concept="30H73N" id="5hSMZ_lNZiG" role="1iwH7V" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="5hSMZ_lNZiH" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7c96q9tNeHh" role="jymVt" />
-      <node concept="312cEg" id="5hSMZ_lNZgX" role="jymVt">
-        <property role="TrG5h" value="pattern" />
-        <node concept="3Tm6S6" id="5hSMZ_lNZgY" role="1B3o_S" />
-        <node concept="10P_77" id="5hSMZ_lNZgZ" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="5hSMZ_lNZiI" role="1B3o_S" />
-      <node concept="raruj" id="5hSMZ_lNZiJ" role="lGtFl" />
-      <node concept="1WS0z7" id="5hSMZ_lNZiK" role="lGtFl">
-        <node concept="3JmXsc" id="5hSMZ_lNZiL" role="3Jn$fo">
-          <node concept="3clFbS" id="5hSMZ_lNZiM" role="2VODD2">
-            <node concept="3clFbF" id="5hSMZ_lNZiN" role="3cqZAp">
-              <node concept="2OqwBi" id="5hSMZ_lNZiO" role="3clFbG">
-                <node concept="30H73N" id="5hSMZ_lNZiP" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="JOGAOsG9cr" role="2OqNvi">
-                  <ref role="3TtcxE" to="dff3:JOGAOsxaCx" resolve="contents" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5hSMZ_lNZiR" role="1zkMxy">
-        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-      </node>
-      <node concept="17Uvod" id="5hSMZ_lNZiS" role="lGtFl">
-        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-        <property role="2qtEX9" value="name" />
-        <node concept="3zFVjK" id="5hSMZ_lNZiT" role="3zH0cK">
-          <node concept="3clFbS" id="5hSMZ_lNZiU" role="2VODD2">
-            <node concept="3clFbF" id="5hSMZ_lNZiV" role="3cqZAp">
-              <node concept="2OqwBi" id="5hSMZ_lNZiW" role="3clFbG">
-                <node concept="30H73N" id="5hSMZ_lNZiX" role="2Oq$k0" />
-                <node concept="2qgKlT" id="5hSMZ_lNZiY" role="2OqNvi">
-                  <ref role="37wK5l" to="tluy:4MEOIDG83_h" resolve="runtimeClassName" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="JOGAOsG6Mn" role="jymVt" />
-    <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="dff3:JOGAOsxaCw" resolve="DataFormTable" />
-    </node>
-    <node concept="17Uvod" id="JOGAOt0ycr" role="lGtFl">
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-      <property role="2qtEX9" value="name" />
-      <node concept="3zFVjK" id="JOGAOt0ycs" role="3zH0cK">
-        <node concept="3clFbS" id="JOGAOt0yct" role="2VODD2">
-          <node concept="3clFbF" id="JOGAOt0z9n" role="3cqZAp">
-            <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="tluy:5hSMZ_lRESV" resolve="runtimeClassName" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="jVnub" id="JOGAOsGlpT">
-    <property role="TrG5h" value="dataform_pattern" />
-    <node concept="3aamgX" id="JOGAOsGlpV" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-      <node concept="gft3U" id="JOGAOsGmnd" role="1lVwrX">
-        <node concept="1oi5Wm" id="JOGAOsGmwQ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="1sPUBX" id="JOGAOsGmwU" role="lGtFl">
-            <ref role="v9R2y" node="1L74NXFa1BL" resolve="dataform_getter" />
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="JOGAOsGlpZ" role="30HLyM">
-        <node concept="3clFbS" id="JOGAOsGlq0" role="2VODD2">
-          <node concept="3clFbF" id="JOGAOsGlxj" role="3cqZAp">
-            <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="dff3:JOGAOsxiLC" resolve="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="gft3U" id="JOGAOsGmwX" role="jxRDz">
-      <node concept="10Nm6u" id="JOGAOsGmE$" role="gfFT$">
-        <node concept="1sPUBX" id="JOGAOsGmEI" role="lGtFl">
-          <ref role="v9R2y" node="1CcQBrPQape" resolve="dataform_pattern_feature" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="jVnub" id="1CcQBrPQape">
-    <property role="3GE5qa" value="" />
-    <property role="TrG5h" value="dataform_pattern_feature" />
-    <node concept="3aamgX" id="1CcQBrPQapf" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxnj6" resolve="ValueFeature" />
-      <node concept="gft3U" id="1CcQBrPQapg" role="1lVwrX">
-        <node concept="1oi5Wm" id="1CcQBrPQaph" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="17Uvod" id="1CcQBrPQapi" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="1CcQBrPQapj" role="3zH0cK">
-              <node concept="3clFbS" id="1CcQBrPQapk" role="2VODD2">
-                <node concept="3clFbF" id="1CcQBrPQapl" role="3cqZAp">
-                  <node concept="2OqwBi" id="1CcQBrPQapm" role="3clFbG">
-                    <node concept="3TrcHB" id="1CcQBrPQapn" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="30H73N" id="1CcQBrPQapo" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2IllgU" id="1CcQBrPQapp" role="1oi5zu" />
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="1CcQBrPQap_" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxm2z" resolve="ChildFeature" />
-      <node concept="gft3U" id="1CcQBrPQapA" role="1lVwrX">
-        <node concept="1oi5ST" id="1CcQBrPQapB" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="17Uvod" id="1CcQBrPQapC" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="1CcQBrPQapD" role="3zH0cK">
-              <node concept="3clFbS" id="1CcQBrPQapE" role="2VODD2">
-                <node concept="3clFbF" id="1CcQBrPQapF" role="3cqZAp">
-                  <node concept="2OqwBi" id="1CcQBrPQapG" role="3clFbG">
-                    <node concept="3TrcHB" id="1CcQBrPQapH" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="30H73N" id="1CcQBrPQapI" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2IllgU" id="1CcQBrPQapJ" role="1oi5TL" />
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="1CcQBrPQapK" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxpXw" resolve="ListFeature" />
-      <node concept="gft3U" id="1CcQBrPQapL" role="1lVwrX">
-        <node concept="38e3lM" id="428_4iYbsiO" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="KCUsM" id="1CcQBrPQapU" role="38e3mL">
-            <node concept="2IllgU" id="1CcQBrPQapV" role="KCVpo" />
-          </node>
-          <node concept="17Uvod" id="1CcQBrPQapN" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="1CcQBrPQapO" role="3zH0cK">
-              <node concept="3clFbS" id="1CcQBrPQapP" role="2VODD2">
-                <node concept="3clFbF" id="1CcQBrPQapQ" role="3cqZAp">
-                  <node concept="2OqwBi" id="1CcQBrPQapR" role="3clFbG">
-                    <node concept="3TrcHB" id="1CcQBrPQapS" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="30H73N" id="1CcQBrPQapT" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="j$LIH" id="1CcQBrPQaZT" role="jxRDz">
-      <node concept="1lLz0L" id="1CcQBrPQaZU" role="1lHHLF">
-        <property role="1lMjX7" value="error" />
-        <property role="1lLB17" value="invalid usage" />
-      </node>
-    </node>
-  </node>
-  <node concept="jVnub" id="1L74NXFa1BL">
-    <property role="3GE5qa" value="" />
-    <property role="TrG5h" value="dataform_getter" />
-    <node concept="j$LIH" id="1L74NXFa6j1" role="jxRDz">
-      <node concept="1lLz0L" id="1L74NXFa6jO" role="1lHHLF">
-        <property role="1lMjX7" value="error" />
-        <property role="1lLB17" value="invalid usage (type_term)" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="Lu45F877I6" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxnj6" resolve="ValueFeature" />
-      <node concept="14YyZ8" id="Lu45F8oWCN" role="1lVwrX">
-        <node concept="14ZrTv" id="Lu45F8oWOz" role="14ZwWg">
-          <node concept="30G5F_" id="Lu45F8oWO$" role="150hEN">
-            <node concept="3clFbS" id="Lu45F8oWO_" role="2VODD2">
-              <node concept="3clFbF" id="Lu45F877Is" role="3cqZAp">
-                <node concept="2OqwBi" id="Lu45F877It" role="3clFbG">
-                  <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="dff3:JOGAOsxmrx" resolve="getter" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="Lu45F877Ix" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="Lu45F877I7" role="150oIE">
-            <node concept="1oi1Uc" id="Lu45F878lu" role="gfFT$">
-              <node concept="1oi5Wm" id="Lu45F877I8" role="1oi0x0">
-                <property role="TrG5h" value="name" />
-                <node concept="1oi5XN" id="Lu45F877I9" role="1oi5zu">
-                  <node concept="22Ky0T" id="Lu45F877Ia" role="lGtFl">
-                    <node concept="10Nm6u" id="Lu45F877Ib" role="22Ky0K">
-                      <node concept="29HgVG" id="Lu45F877Ic" role="lGtFl">
-                        <node concept="3NFfHV" id="Lu45F877Id" role="3NFExx">
-                          <node concept="3clFbS" id="Lu45F877Ie" role="2VODD2">
-                            <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="dff3:JOGAOsxmrx" resolve="getter" />
-                                </node>
-                                <node concept="30H73N" id="Lu45F877Ii" role="2Oq$k0" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="17Uvod" id="Lu45F877Ij" role="lGtFl">
-                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                  <property role="2qtEX9" value="name" />
-                  <node concept="3zFVjK" id="Lu45F877Ik" role="3zH0cK">
-                    <node concept="3clFbS" id="Lu45F877Il" role="2VODD2">
-                      <node concept="3clFbF" id="Lu45F877Im" role="3cqZAp">
-                        <node concept="2OqwBi" id="Lu45F877In" role="3clFbG">
-                          <node concept="3TrcHB" id="Lu45F877Io" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="Lu45F877Ip" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="Lu45F8oXbF" role="14YRTM">
-          <node concept="1oi1Uc" id="Lu45F8oXbH" role="gfFT$">
-            <node concept="1oi5Wm" id="Lu45F8oXbI" role="1oi0x0">
-              <property role="TrG5h" value="name" />
-              <node concept="1oi5XN" id="Lu45F8oXbJ" role="1oi5zu">
-                <node concept="22Ky0T" id="Lu45F8oXbK" role="lGtFl">
-                  <node concept="2YIFZM" id="W6bnNelN58" role="22Ky0K">
-                    <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
-                    <ref role="37wK5l" to="6pyv:7nPD14NOHGU" resolve="wildcardMetaLogical" />
-                    <node concept="3VsKOn" id="W6bnNelN8X" role="37wK5m">
-                      <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="17Uvod" id="Lu45F8oXbT" role="lGtFl">
-                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                <property role="2qtEX9" value="name" />
-                <node concept="3zFVjK" id="Lu45F8oXbU" role="3zH0cK">
-                  <node concept="3clFbS" id="Lu45F8oXbV" role="2VODD2">
-                    <node concept="3clFbF" id="Lu45F8oXbW" role="3cqZAp">
-                      <node concept="2OqwBi" id="Lu45F8oXbX" role="3clFbG">
-                        <node concept="3TrcHB" id="Lu45F8oXbY" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                        <node concept="30H73N" id="Lu45F8oXbZ" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="Lu45F8795V" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxm2z" resolve="ChildFeature" />
-      <node concept="14YyZ8" id="Lu45F8iYP0" role="1lVwrX">
-        <node concept="14ZrTv" id="Lu45F8iZ0K" role="14ZwWg">
-          <node concept="30G5F_" id="Lu45F8iZ0L" role="150hEN">
-            <node concept="3clFbS" id="Lu45F8iZ0M" role="2VODD2">
-              <node concept="3clFbF" id="Lu45F8796h" role="3cqZAp">
-                <node concept="2OqwBi" id="Lu45F8796i" role="3clFbG">
-                  <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="dff3:JOGAOsxmrx" resolve="getter" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="Lu45F8796m" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="Lu45F8795W" role="150oIE">
-            <node concept="1oi1Uc" id="Lu45F879Ie" role="gfFT$">
-              <node concept="1oi5ST" id="Lu45F8795X" role="1oi0x0">
-                <property role="TrG5h" value="name" />
-                <node concept="1oi5UN" id="Lu45F8795Y" role="1oi5TL">
-                  <node concept="22Ky0T" id="Lu45F8795Z" role="lGtFl">
-                    <node concept="10Nm6u" id="Lu45F87960" role="22Ky0K">
-                      <node concept="29HgVG" id="Lu45F87961" role="lGtFl">
-                        <node concept="3NFfHV" id="Lu45F87962" role="3NFExx">
-                          <node concept="3clFbS" id="Lu45F87963" role="2VODD2">
-                            <node concept="3clFbF" id="Lu45F87964" role="3cqZAp">
-                              <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="dff3:JOGAOsxmrx" resolve="getter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="17Uvod" id="Lu45F87968" role="lGtFl">
-                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                  <property role="2qtEX9" value="name" />
-                  <node concept="3zFVjK" id="Lu45F87969" role="3zH0cK">
-                    <node concept="3clFbS" id="Lu45F8796a" role="2VODD2">
-                      <node concept="3clFbF" id="Lu45F8796b" role="3cqZAp">
-                        <node concept="2OqwBi" id="Lu45F8796c" role="3clFbG">
-                          <node concept="3TrcHB" id="Lu45F8796d" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="Lu45F8796e" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="Lu45F8j02F" role="14YRTM">
-          <node concept="1oi1Uc" id="Lu45F8j02H" role="gfFT$">
-            <node concept="1oi5ST" id="Lu45F8j02I" role="1oi0x0">
-              <property role="TrG5h" value="name" />
-              <node concept="1oi5UN" id="Lu45F8j02J" role="1oi5TL">
-                <node concept="22Ky0T" id="Lu45F8j02K" role="lGtFl">
-                  <node concept="2YIFZM" id="6YPNC4OjWja" role="22Ky0K">
-                    <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
-                    <ref role="37wK5l" to="6pyv:7nPD14NOHGU" resolve="wildcardMetaLogical" />
-                    <node concept="3VsKOn" id="6YPNC4OjWjb" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="17Uvod" id="Lu45F8j02T" role="lGtFl">
-                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                <property role="2qtEX9" value="name" />
-                <node concept="3zFVjK" id="Lu45F8j02U" role="3zH0cK">
-                  <node concept="3clFbS" id="Lu45F8j02V" role="2VODD2">
-                    <node concept="3clFbF" id="Lu45F8j02W" role="3cqZAp">
-                      <node concept="2OqwBi" id="Lu45F8j02X" role="3clFbG">
-                        <node concept="3TrcHB" id="Lu45F8j02Y" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                        <node concept="30H73N" id="Lu45F8j02Z" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="Lu45F87avA" role="3aUrZf">
-      <ref role="30HIoZ" to="dff3:JOGAOsxpXw" resolve="ListFeature" />
-      <node concept="14YyZ8" id="Lu45F8gLLG" role="1lVwrX">
-        <node concept="14ZrTv" id="Lu45F8gLXs" role="14ZwWg">
-          <node concept="30G5F_" id="Lu45F8gLXt" role="150hEN">
-            <node concept="3clFbS" id="Lu45F8gLXu" role="2VODD2">
-              <node concept="3clFbF" id="Lu45F8gMny" role="3cqZAp">
-                <node concept="2OqwBi" id="Lu45F8gMnz" role="3clFbG">
-                  <node concept="2OqwBi" id="Lu45F8gMn$" role="2Oq$k0">
-                    <node concept="30H73N" id="Lu45F8gMn_" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="Lu45F8gMnA" role="2OqNvi">
-                      <ref role="3Tt5mk" to="dff3:JOGAOsxmrx" resolve="getter" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="Lu45F8gMnB" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="Lu45F87avB" role="150oIE">
-            <node concept="1oi1Uc" id="Lu45F87bco" role="gfFT$">
-              <node concept="38e3lM" id="Lu45F87avC" role="1oi0x0">
-                <property role="TrG5h" value="name" />
-                <node concept="KCUsM" id="Lu45F87avD" role="38e3mL">
-                  <node concept="1oi5UN" id="Lu45F87avE" role="KCVpo">
-                    <node concept="22Ky0T" id="Lu45F87avF" role="lGtFl">
-                      <node concept="10Nm6u" id="Lu45F87avG" role="22Ky0K">
-                        <node concept="29HgVG" id="Lu45F87avH" role="lGtFl">
-                          <node concept="3NFfHV" id="Lu45F87avI" role="3NFExx">
-                            <node concept="3clFbS" id="Lu45F87avJ" role="2VODD2">
-                              <node concept="3clFbF" id="Lu45F87avK" role="3cqZAp">
-                                <node concept="2OqwBi" id="Lu45F87avL" role="3clFbG">
-                                  <node concept="3TrEf2" id="Lu45F87avM" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="dff3:JOGAOsxmrx" resolve="getter" />
-                                  </node>
-                                  <node concept="30H73N" id="Lu45F87avN" role="2Oq$k0" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="17Uvod" id="Lu45F87avO" role="lGtFl">
-                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                  <property role="2qtEX9" value="name" />
-                  <node concept="3zFVjK" id="Lu45F87avP" role="3zH0cK">
-                    <node concept="3clFbS" id="Lu45F87avQ" role="2VODD2">
-                      <node concept="3clFbF" id="Lu45F87avR" role="3cqZAp">
-                        <node concept="2OqwBi" id="Lu45F87avS" role="3clFbG">
-                          <node concept="3TrcHB" id="Lu45F87avT" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                          <node concept="30H73N" id="Lu45F87avU" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="Lu45F8gMzA" role="14YRTM">
-          <node concept="1oi1Uc" id="Lu45F8gMVO" role="gfFT$">
-            <node concept="38e3lM" id="Lu45F8gMWd" role="1oi0x0">
-              <property role="TrG5h" value="name" />
-              <node concept="KCUsM" id="Lu45F8gMWf" role="38e3mL">
-                <node concept="1oi5UN" id="Lu45F8gNFj" role="KCVpo">
-                  <node concept="22Ky0T" id="Lu45F8gNTx" role="lGtFl">
-                    <node concept="2YIFZM" id="4MEOIDFP4Me" role="22Ky0K">
-                      <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
-                      <ref role="37wK5l" to="6pyv:7nPD14NOI_T" resolve="multiMetaLogical" />
-                      <node concept="Xl_RD" id="4MEOIDFP4Mf" role="37wK5m">
-                        <property role="Xl_RC" value="_" />
-                      </node>
-                      <node concept="3VsKOn" id="4MEOIDFP4Mg" role="37wK5m">
-                        <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                      </node>
-                      <node concept="3cmrfG" id="Lu45F8dPJB" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="17Uvod" id="Lu45F8gMWG" role="lGtFl">
-                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                <property role="2qtEX9" value="name" />
-                <node concept="3zFVjK" id="Lu45F8gMWJ" role="3zH0cK">
-                  <node concept="3clFbS" id="Lu45F8gMWK" role="2VODD2">
-                    <node concept="3clFbF" id="Lu45F8gMWQ" role="3cqZAp">
-                      <node concept="2OqwBi" id="Lu45F8gMWL" role="3clFbG">
-                        <node concept="3TrcHB" id="Lu45F8gMWO" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                        <node concept="30H73N" id="Lu45F8gMWP" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="jVnub" id="3kjrYXAPkJB">
-    <property role="3GE5qa" value="" />
-    <property role="TrG5h" value="dataform_feature_override" />
-    <node concept="3aamgX" id="3kjrYXAPmgG" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="dff3:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-      <node concept="30G5F_" id="3kjrYXAPmwz" role="30HLyM">
-        <node concept="3clFbS" id="3kjrYXAPmw$" role="2VODD2">
-          <node concept="3clFbF" id="3kjrYXAPmBH" role="3cqZAp">
-            <node concept="2OqwBi" id="3kjrYXAPmPt" role="3clFbG">
-              <node concept="v3LJS" id="3kjrYXAPmBG" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-              </node>
-              <node concept="1mIQ4w" id="3kjrYXAPndi" role="2OqNvi">
-                <node concept="chp4Y" id="JOGAOsGIOM" role="cj9EA">
-                  <ref role="cht4Q" to="dff3:JOGAOsxnj6" resolve="ValueFeature" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="3kjrYXAPnzY" role="1lVwrX">
-        <node concept="1oi5Wm" id="3kjrYXAPnzZ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="17Uvod" id="3kjrYXAPn$0" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="3kjrYXAPn$1" role="3zH0cK">
-              <node concept="3clFbS" id="3kjrYXAPn$2" role="2VODD2">
-                <node concept="3clFbF" id="3kjrYXAPn$3" role="3cqZAp">
-                  <node concept="2OqwBi" id="3kjrYXAPn$4" role="3clFbG">
-                    <node concept="3TrcHB" id="3kjrYXAPn$5" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="v3LJS" id="3kjrYXAPotq" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1oi5XN" id="3kjrYXAPn$7" role="1oi5zu">
-            <node concept="22Ky0T" id="3kjrYXAPn$8" role="lGtFl">
-              <node concept="10Nm6u" id="3kjrYXAPn$9" role="22Ky0K">
-                <node concept="29HgVG" id="3kjrYXAPn$a" role="lGtFl">
-                  <node concept="3NFfHV" id="3kjrYXAPn$b" role="3NFExx">
-                    <node concept="3clFbS" id="3kjrYXAPn$c" role="2VODD2">
-                      <node concept="3clFbF" id="3kjrYXAPn$d" role="3cqZAp">
-                        <node concept="v3LJS" id="3kjrYXAPn$e" role="3clFbG">
-                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="3kjrYXAPsCJ" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="dff3:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-      <node concept="30G5F_" id="3kjrYXAPsCK" role="30HLyM">
-        <node concept="3clFbS" id="3kjrYXAPsCL" role="2VODD2">
-          <node concept="3clFbF" id="3kjrYXAPsCM" role="3cqZAp">
-            <node concept="2OqwBi" id="3kjrYXAPsCN" role="3clFbG">
-              <node concept="v3LJS" id="3kjrYXAPsCO" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-              </node>
-              <node concept="1mIQ4w" id="3kjrYXAPsCP" role="2OqNvi">
-                <node concept="chp4Y" id="JOGAOsGJpk" role="cj9EA">
-                  <ref role="cht4Q" to="dff3:JOGAOsxm2z" resolve="ChildFeature" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="3kjrYXAPulY" role="1lVwrX">
-        <node concept="1oi5ST" id="3kjrYXAPulZ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="1oi5UN" id="3kjrYXAPum0" role="1oi5TL">
-            <node concept="22Ky0T" id="3kjrYXAPum1" role="lGtFl">
-              <node concept="10Nm6u" id="3kjrYXAPum2" role="22Ky0K">
-                <node concept="29HgVG" id="3kjrYXAPum3" role="lGtFl">
-                  <node concept="3NFfHV" id="3kjrYXAPum4" role="3NFExx">
-                    <node concept="3clFbS" id="3kjrYXAPum5" role="2VODD2">
-                      <node concept="3clFbF" id="3kjrYXAPum6" role="3cqZAp">
-                        <node concept="v3LJS" id="3kjrYXAPum7" role="3clFbG">
-                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="3kjrYXAPum8" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="3kjrYXAPum9" role="3zH0cK">
-              <node concept="3clFbS" id="3kjrYXAPuma" role="2VODD2">
-                <node concept="3clFbF" id="3kjrYXAPumb" role="3cqZAp">
-                  <node concept="2OqwBi" id="3kjrYXAPumc" role="3clFbG">
-                    <node concept="3TrcHB" id="3kjrYXAPumd" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="v3LJS" id="3kjrYXAPuXF" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="3kjrYXAPvs1" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="dff3:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-      <node concept="30G5F_" id="3kjrYXAPvs2" role="30HLyM">
-        <node concept="3clFbS" id="3kjrYXAPvs3" role="2VODD2">
-          <node concept="3clFbF" id="3kjrYXAPvs4" role="3cqZAp">
-            <node concept="2OqwBi" id="3kjrYXAPvs5" role="3clFbG">
-              <node concept="v3LJS" id="3kjrYXAPvs6" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-              </node>
-              <node concept="1mIQ4w" id="3kjrYXAPvs7" role="2OqNvi">
-                <node concept="chp4Y" id="JOGAOsGJVV" role="cj9EA">
-                  <ref role="cht4Q" to="dff3:JOGAOsxpXw" resolve="ListFeature" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="3kjrYXAPx50" role="1lVwrX">
-        <node concept="38e3lM" id="428_4iYbsiL" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="KCUsM" id="3kjrYXAPx59" role="38e3mL">
-            <node concept="1oi5UN" id="3kjrYXAPx5a" role="KCVpo">
-              <node concept="22Ky0T" id="3kjrYXAPx5b" role="lGtFl">
-                <node concept="10Nm6u" id="3kjrYXAPx5c" role="22Ky0K">
-                  <node concept="29HgVG" id="3kjrYXAPx5d" role="lGtFl">
-                    <node concept="3NFfHV" id="3kjrYXAPx5e" role="3NFExx">
-                      <node concept="3clFbS" id="3kjrYXAPx5f" role="2VODD2">
-                        <node concept="3clFbF" id="3kjrYXAPx5g" role="3cqZAp">
-                          <node concept="v3LJS" id="3kjrYXAPx5h" role="3clFbG">
-                            <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="3kjrYXAPx52" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="3kjrYXAPx53" role="3zH0cK">
-              <node concept="3clFbS" id="3kjrYXAPx54" role="2VODD2">
-                <node concept="3clFbF" id="3kjrYXAPx55" role="3cqZAp">
-                  <node concept="2OqwBi" id="3kjrYXAPx56" role="3clFbG">
-                    <node concept="3TrcHB" id="3kjrYXAPx57" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="v3LJS" id="3kjrYXAPxtp" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1N15co" id="3kjrYXAPkK6" role="1s_3oS">
-      <property role="TrG5h" value="getter" />
-      <node concept="3Tqbb2" id="3kjrYXAPkK7" role="1N15GL">
-        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
-      </node>
-    </node>
-    <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="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-      </node>
-    </node>
-    <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
-      <node concept="1lLz0L" id="3kjrYXAPkLi" role="1lHHLF">
-        <property role="1lMjX7" value="error" />
-        <property role="1lLB17" value="invalid usage (type_term_feature)" />
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl b/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl
deleted file mode 100644
index a3d4ac1f..00000000
--- a/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.dataform" uuid="942985d5-7bcf-46ee-8b79-7b662eaebb4e" languageVersion="0" moduleVersion="0">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="jetbrains.mps.dataform#01" uuid="f4b71823-159e-4008-bbeb-35dd1c907ab2">
-      <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
-          <sourceRoot location="." />
-        </modelRoot>
-      </models>
-      <external-templates />
-      <dependencies>
-        <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">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-        <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
-      </dependencies>
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
-        <module reference="f4b71823-159e-4008-bbeb-35dd1c907ab2(jetbrains.mps.dataform#01)" version="0" />
-        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" 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" />
-        <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
-        <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
-    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="11" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
-    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <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="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
-  </dependencyVersions>
-  <extendedLanguages>
-    <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
-    <extendedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</extendedLanguage>
-  </extendedLanguages>
-</language>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/models/behavior.mps b/coderules/languages/jetbrains.mps.dataform/models/behavior.mps
deleted file mode 100644
index 8b0e6b0e..00000000
--- a/coderules/languages/jetbrains.mps.dataform/models/behavior.mps
+++ /dev/null
@@ -1,789 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f64e5caa-8a67-46ab-9011-edcf818c4d24(jetbrains.mps.dataform.behavior)">
-  <persistence version="9" />
-  <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)" implicit="true" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </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" />
-        <child id="1225194240801" name="constructor" index="13h7CW" />
-      </concept>
-      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
-      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz" />
-      <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="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <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="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="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <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>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </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>
-      <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" />
-    </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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="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="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="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="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="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </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="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-    </language>
-  </registry>
-  <node concept="13h7C7" id="JOGAOsxidP">
-    <ref role="13h7C2" to="dff3: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">
-    <ref role="13h7C2" to="dff3: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="dff3: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="dff3: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="dff3: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="dff3: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="dff3: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="dff3: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="dff3: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="JOGAOsxFgi">
-    <ref role="13h7C2" to="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <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="3clFbJ" id="7c96q9t$N$B" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9t$OnM" role="3clFbw">
-            <node concept="2OqwBi" id="7c96q9t$NJr" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9t$N_3" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9t$O0W" role="2OqNvi">
-                <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="7c96q9t$OKw" role="2OqNvi" />
-          </node>
-          <node concept="3clFbS" id="7c96q9t$N$D" role="3clFbx">
-            <node concept="3cpWs6" id="7c96q9t$OOY" role="3cqZAp">
-              <node concept="2OqwBi" id="7c96q9t$PFJ" role="3cqZAk">
-                <node concept="2OqwBi" id="7c96q9t$P1_" role="2Oq$k0">
-                  <node concept="13iPFW" id="7c96q9t$ORQ" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="7c96q9t$Plg" role="2OqNvi">
-                    <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="7c96q9t$Q0r" role="2OqNvi">
-                  <ref role="37wK5l" node="7c96q9t$Nk0" resolve="symbol" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <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="JOGAOsR58r" role="13h7CS">
-      <property role="TrG5h" value="allFeatures" />
-      <node concept="3Tm1VV" id="JOGAOsR58s" role="1B3o_S" />
-      <node concept="A3Dl8" id="JOGAOsR5_4" role="3clF45">
-        <node concept="3Tqbb2" id="JOGAOsR5_h" role="A3Ik2">
-          <ref role="ehGHo" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="JOGAOsR58u" role="3clF47">
-        <node concept="3clFbJ" id="JOGAOsR5_O" role="3cqZAp">
-          <node concept="2OqwBi" id="JOGAOsR6qe" role="3clFbw">
-            <node concept="2OqwBi" id="JOGAOsR5Ks" role="2Oq$k0">
-              <node concept="13iPFW" id="JOGAOsR5A8" role="2Oq$k0" />
-              <node concept="3TrEf2" id="JOGAOsR641" role="2OqNvi">
-                <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="JOGAOsR6Nh" role="2OqNvi" />
-          </node>
-          <node concept="3clFbS" id="JOGAOsR5_Q" role="3clFbx">
-            <node concept="3cpWs6" id="JOGAOsR6PO" role="3cqZAp">
-              <node concept="BsUDl" id="JOGAOsR6SF" role="3cqZAk">
-                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
-                <node concept="2OqwBi" id="JOGAOsRaQP" role="37wK5m">
-                  <node concept="2OqwBi" id="JOGAOsR8_x" role="2Oq$k0">
-                    <node concept="2OqwBi" id="JOGAOsR7OS" role="2Oq$k0">
-                      <node concept="2OqwBi" id="JOGAOsR77E" role="2Oq$k0">
-                        <node concept="13iPFW" id="JOGAOsR6WE" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="JOGAOsR7tY" role="2OqNvi">
-                          <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="JOGAOsR8ez" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="JOGAOsR8Tf" role="2OqNvi">
-                      <ref role="3TtcxE" to="dff3:JOGAOsxiLz" resolve="feature" />
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="JOGAOsRe1t" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="JOGAOsRhDt" role="37wK5m">
-                  <node concept="2OqwBi" id="JOGAOsRf2y" role="2Oq$k0">
-                    <node concept="2OqwBi" id="JOGAOsRel8" role="2Oq$k0">
-                      <node concept="13iPFW" id="JOGAOsRe9f" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="JOGAOsReIL" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="JOGAOsRfpm" role="2OqNvi">
-                      <ref role="3TtcxE" to="dff3:JOGAOsxiLz" resolve="feature" />
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="JOGAOsRkKB" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="JOGAOsRl03" role="3cqZAp">
-          <node concept="2OqwBi" id="JOGAOsRlSs" role="3clFbG">
-            <node concept="2OqwBi" id="JOGAOsRlcT" role="2Oq$k0">
-              <node concept="13iPFW" id="JOGAOsRl01" role="2Oq$k0" />
-              <node concept="3TrEf2" id="JOGAOsRl_R" role="2OqNvi">
-                <ref role="3Tt5mk" to="dff3:JOGAOsxaCc" resolve="template" />
-              </node>
-            </node>
-            <node concept="3Tsc0h" id="JOGAOsRmbs" role="2OqNvi">
-              <ref role="3TtcxE" to="dff3:JOGAOsxiLz" resolve="feature" />
-            </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="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7c96q9tALRu" role="3clF47">
-        <node concept="3clFbJ" id="7c96q9tIw76" role="3cqZAp">
-          <node concept="3clFbS" id="7c96q9tIw77" role="3clFbx">
-            <node concept="3cpWs6" id="7c96q9tIw78" role="3cqZAp">
-              <node concept="BsUDl" id="7c96q9tIw79" role="3cqZAk">
-                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
-                <node concept="2OqwBi" id="7c96q9tIw7a" role="37wK5m">
-                  <node concept="2OqwBi" id="7c96q9tIw7b" role="2Oq$k0">
-                    <node concept="2qgKlT" id="7c96q9tIy8v" role="2OqNvi">
-                      <ref role="37wK5l" node="7c96q9tALRr" resolve="valueFeatures" />
-                    </node>
-                    <node concept="2OqwBi" id="7c96q9tIw7e" role="2Oq$k0">
-                      <node concept="13iPFW" id="7c96q9tIw7f" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7c96q9tIxw$" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="7c96q9tIw7i" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="7c96q9tIw7j" role="37wK5m">
-                  <node concept="2OqwBi" id="7c96q9tIw7k" role="2Oq$k0">
-                    <node concept="2OqwBi" id="7c96q9tIw7l" role="2Oq$k0">
-                      <node concept="13iPFW" id="7c96q9tIw7m" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7c96q9tIw7n" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="7c96q9tIw7o" role="2OqNvi">
-                      <ref role="37wK5l" node="5UYwY$H7MGm" resolve="valueFeatures" />
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="7c96q9tIw7p" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="7c96q9tIw7q" role="3clFbw">
-            <node concept="2OqwBi" id="7c96q9tIw7r" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9tIw7s" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9tIx1c" role="2OqNvi">
-                <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="7c96q9tIw7v" role="2OqNvi" />
-          </node>
-        </node>
-        <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="dff3: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="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7c96q9tCSXD" role="3clF47">
-        <node concept="3clFbJ" id="7c96q9tIyno" role="3cqZAp">
-          <node concept="3clFbS" id="7c96q9tIynp" role="3clFbx">
-            <node concept="3cpWs6" id="7c96q9tIynq" role="3cqZAp">
-              <node concept="BsUDl" id="7c96q9tIynr" role="3cqZAk">
-                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
-                <node concept="2OqwBi" id="7c96q9tIyns" role="37wK5m">
-                  <node concept="2OqwBi" id="7c96q9tIynt" role="2Oq$k0">
-                    <node concept="2qgKlT" id="7c96q9tI$4S" role="2OqNvi">
-                      <ref role="37wK5l" node="7c96q9tCSX_" resolve="childFeatures" />
-                    </node>
-                    <node concept="2OqwBi" id="7c96q9tIynw" role="2Oq$k0">
-                      <node concept="13iPFW" id="7c96q9tIynx" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7c96q9tIzsX" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="7c96q9tIyn$" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="7c96q9tIyn_" role="37wK5m">
-                  <node concept="2OqwBi" id="7c96q9tIynA" role="2Oq$k0">
-                    <node concept="2OqwBi" id="7c96q9tIynB" role="2Oq$k0">
-                      <node concept="13iPFW" id="7c96q9tIynC" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7c96q9tIynD" role="2OqNvi">
-                        <ref role="3Tt5mk" to="dff3:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="7c96q9tIynE" role="2OqNvi">
-                      <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="7c96q9tIynF" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="7c96q9tIynG" role="3clFbw">
-            <node concept="2OqwBi" id="7c96q9tIynH" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9tIynI" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9tIyXt" role="2OqNvi">
-                <ref role="3Tt5mk" to="dff3:JOGAOsxaCh" resolve="prototype" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="7c96q9tIynL" role="2OqNvi" />
-          </node>
-        </node>
-        <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="dff3: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="7c96q9tCfic" role="13h7CS">
-      <property role="TrG5h" value="merge" />
-      <node concept="37vLTG" id="7c96q9tCh60" role="3clF46">
-        <property role="TrG5h" value="first" />
-        <node concept="2I9FWS" id="7c96q9tChcv" role="1tU5fm">
-          <ref role="2I9WkF" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7c96q9tCh7H" role="3clF46">
-        <property role="TrG5h" value="second" />
-        <node concept="2I9FWS" id="7c96q9tChdC" role="1tU5fm">
-          <ref role="2I9WkF" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="7c96q9tCh4d" role="1B3o_S" />
-      <node concept="2I9FWS" id="7c96q9tChek" role="3clF45">
-        <ref role="2I9WkF" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-      </node>
-      <node concept="3clFbS" id="7c96q9tCfif" role="3clF47">
-        <node concept="3cpWs8" id="7c96q9tCheC" role="3cqZAp">
-          <node concept="3cpWsn" id="7c96q9tCheD" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="_YKpA" id="7c96q9tCheE" role="1tU5fm">
-              <node concept="3Tqbb2" id="7c96q9tCheF" role="_ZDj9">
-                <ref role="ehGHo" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="7c96q9tCheG" role="33vP2m">
-              <node concept="2OqwBi" id="7c96q9tCheH" role="2Oq$k0">
-                <node concept="37vLTw" id="7c96q9tCh$H" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7c96q9tCh60" resolve="first" />
-                </node>
-                <node concept="3zZkjj" id="7c96q9tCheJ" role="2OqNvi">
-                  <node concept="1bVj0M" id="7c96q9tCheK" role="23t8la">
-                    <node concept="3clFbS" id="7c96q9tCheL" role="1bW5cS">
-                      <node concept="3clFbF" id="7c96q9tCheM" role="3cqZAp">
-                        <node concept="3fqX7Q" id="7c96q9tCheN" role="3clFbG">
-                          <node concept="2OqwBi" id="7c96q9tCheO" role="3fr31v">
-                            <node concept="37vLTw" id="7c96q9tChIp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7c96q9tCh7H" resolve="second" />
-                            </node>
-                            <node concept="2HwmR7" id="7c96q9tCheQ" role="2OqNvi">
-                              <node concept="1bVj0M" id="7c96q9tCheR" role="23t8la">
-                                <node concept="3clFbS" id="7c96q9tCheS" role="1bW5cS">
-                                  <node concept="3clFbF" id="7c96q9tCheT" role="3cqZAp">
-                                    <node concept="17R0WA" id="7c96q9tCheU" role="3clFbG">
-                                      <node concept="2OqwBi" id="7c96q9tCheV" role="3uHU7B">
-                                        <node concept="37vLTw" id="7c96q9tCheW" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7c96q9tChf1" resolve="it" />
-                                        </node>
-                                        <node concept="3TrcHB" id="7c96q9tCheX" role="2OqNvi">
-                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                        </node>
-                                      </node>
-                                      <node concept="2OqwBi" id="7c96q9tCheY" role="3uHU7w">
-                                        <node concept="37vLTw" id="7c96q9tCheZ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7c96q9tChf3" resolve="f" />
-                                        </node>
-                                        <node concept="3TrcHB" id="7c96q9tChf0" role="2OqNvi">
-                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="7c96q9tChf1" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="7c96q9tChf2" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="7c96q9tChf3" role="1bW2Oz">
-                      <property role="TrG5h" value="f" />
-                      <node concept="2jxLKc" id="7c96q9tChf4" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="ANE8D" id="7c96q9tChf5" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7c96q9tCmJX" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9tCovv" role="3clFbG">
-            <node concept="37vLTw" id="7c96q9tCmJV" role="2Oq$k0">
-              <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
-            </node>
-            <node concept="X8dFx" id="7c96q9tCv2_" role="2OqNvi">
-              <node concept="2OqwBi" id="7c96q9tC_I$" role="25WWJ7">
-                <node concept="2OqwBi" id="7c96q9tC_0x" role="2Oq$k0">
-                  <node concept="37vLTw" id="7c96q9tC_0y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7c96q9tCh7H" resolve="second" />
-                  </node>
-                  <node concept="3zZkjj" id="7c96q9tC_0z" role="2OqNvi">
-                    <node concept="1bVj0M" id="7c96q9tC_0$" role="23t8la">
-                      <node concept="3clFbS" id="7c96q9tC_0_" role="1bW5cS">
-                        <node concept="3clFbF" id="7c96q9tC_0A" role="3cqZAp">
-                          <node concept="3fqX7Q" id="7c96q9tC_0B" role="3clFbG">
-                            <node concept="2OqwBi" id="7c96q9tC_0C" role="3fr31v">
-                              <node concept="37vLTw" id="7c96q9tC_0D" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
-                              </node>
-                              <node concept="2HwmR7" id="7c96q9tC_0E" role="2OqNvi">
-                                <node concept="1bVj0M" id="7c96q9tC_0F" role="23t8la">
-                                  <node concept="3clFbS" id="7c96q9tC_0G" role="1bW5cS">
-                                    <node concept="3clFbF" id="7c96q9tC_0H" role="3cqZAp">
-                                      <node concept="17R0WA" id="7c96q9tC_0I" role="3clFbG">
-                                        <node concept="2OqwBi" id="7c96q9tC_0J" role="3uHU7w">
-                                          <node concept="37vLTw" id="7c96q9tC_0K" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7c96q9tC_0R" resolve="f" />
-                                          </node>
-                                          <node concept="3TrcHB" id="7c96q9tC_0L" role="2OqNvi">
-                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                          </node>
-                                        </node>
-                                        <node concept="2OqwBi" id="7c96q9tC_0M" role="3uHU7B">
-                                          <node concept="37vLTw" id="7c96q9tC_0N" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7c96q9tC_0P" resolve="it" />
-                                          </node>
-                                          <node concept="3TrcHB" id="7c96q9tC_0O" role="2OqNvi">
-                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="Rh6nW" id="7c96q9tC_0P" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="7c96q9tC_0Q" role="1tU5fm" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="7c96q9tC_0R" role="1bW2Oz">
-                        <property role="TrG5h" value="f" />
-                        <node concept="2jxLKc" id="7c96q9tC_0S" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="ANE8D" id="7c96q9tCA89" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7c96q9tCATz" role="3cqZAp">
-          <node concept="37vLTw" id="7c96q9tCATx" role="3clFbG">
-            <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
-          </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="_DF" />
-            </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="dff3: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>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/models/constraints.mps b/coderules/languages/jetbrains.mps.dataform/models/constraints.mps
deleted file mode 100644
index f5ddced0..00000000
--- a/coderules/languages/jetbrains.mps.dataform/models/constraints.mps
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:152537e6-6f74-4625-b567-bef476402996(jetbrains.mps.dataform.constraints)">
-  <persistence version="9" />
-  <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
-    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
-  </languages>
-  <imports>
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)" implicit="true" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <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="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <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>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <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="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-      </concept>
-    </language>
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
-      <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
-      <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
-      <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
-        <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="1213100494875" name="referent" index="1Mr941" />
-      </concept>
-      <concept id="1148687176410" name="jetbrains.mps.lang.constraints.structure.NodeReferentConstraint" flags="ng" index="1N5Pfh">
-        <reference id="1148687202698" name="applicableLink" index="1N5Vy1" />
-        <child id="1148687345559" name="searchScopeFactory" index="1N6uqs" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </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="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
-      <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="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">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1M2fIO" id="JOGAOsxTE1">
-    <property role="3GE5qa" value="feature" />
-    <ref role="1M2myG" to="dff3:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
-      <ref role="1N5Vy1" to="dff3: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="dff3: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="dff3:JOGAOsxanH" resolve="DataForm" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="JOGAOsxVjr" role="2OqNvi">
-                  <ref role="3Tt5mk" to="dff3: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="dff3:JOGAOsxaCc" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="JOGAOsxW_V" role="2OqNvi">
-                      <ref role="3TtcxE" to="dff3: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>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/models/editor.mps b/coderules/languages/jetbrains.mps.dataform/models/editor.mps
deleted file mode 100644
index 58079dc0..00000000
--- a/coderules/languages/jetbrains.mps.dataform/models/editor.mps
+++ /dev/null
@@ -1,1924 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:34927e48-bf8d-4708-a63c-2a3e4a3e490e(jetbrains.mps.dataform.editor)">
-  <persistence version="9" />
-  <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
-    <import index="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-  </imports>
-  <registry>
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
-      <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
-        <child id="414384289274416996" name="parts" index="3ft7WO" />
-      </concept>
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
-      <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
-      <concept id="6516520003787916624" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Condition" flags="ig" index="27VH4U" />
-      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
-        <property id="1140524450557" name="separatorText" index="2czwfO" />
-        <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="3459162043708467089" name="jetbrains.mps.lang.editor.structure.CellActionMap_CanExecuteFunction" flags="in" index="jK8Ss" />
-      <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" />
-      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
-      <concept id="3308309804690746362" name="jetbrains.mps.lang.editor.structure.QueryFunction_ColorComposit" flags="ig" index="mot77" />
-      <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="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
-        <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="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
-        <property id="3473224453637651917" name="placeInCell" index="CtIbK" />
-      </concept>
-      <concept id="308059530142752797" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Parameterized" flags="ng" index="2F$Pav">
-        <child id="8371900013785948359" name="part" index="2$S_pN" />
-        <child id="8371900013785948365" name="parameterQuery" index="2$S_pT" />
-      </concept>
-      <concept id="1638911550608571617" name="jetbrains.mps.lang.editor.structure.TransformationMenu_Default" flags="ng" index="IW6AY" />
-      <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
-      <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
-        <child id="6202297022026447496" name="canExecuteFunction" index="2jiSrf" />
-        <child id="1638911550608610281" name="executeFunction" index="IWgqQ" />
-        <child id="5692353713941573325" name="textFunction" index="1hCUd6" />
-      </concept>
-      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
-        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
-      </concept>
-      <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
-        <child id="1186402402630" name="styleClass" index="V601i" />
-      </concept>
-      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
-        <child id="1186403803051" name="query" index="VblUZ" />
-      </concept>
-      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
-        <property id="1186403771423" name="style" index="Vbekb" />
-      </concept>
-      <concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
-      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
-        <property id="1186414551515" name="flag" index="VOm3f" />
-        <child id="1223387335081" name="query" index="3n$kyP" />
-      </concept>
-      <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
-      <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
-        <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
-      </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
-        <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
-      </concept>
-      <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
-        <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
-      </concept>
-      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
-      <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
-        <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
-      </concept>
-      <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
-        <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
-      </concept>
-      <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
-        <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
-        <child id="1139535219969" name="item" index="1h_SK8" />
-      </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" />
-      <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
-      <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
-        <child id="1088186146602" name="editorComponent" index="1sWHZn" />
-      </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
-        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
-      </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="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
-        <reference id="9122903797312247166" name="style" index="1wgcnl" />
-      </concept>
-      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
-        <property id="1140017977771" name="readOnly" index="1Intyy" />
-        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
-      </concept>
-      <concept id="7667708318090725848" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentAnchorStyleClassItem" flags="ln" index="1Bsynf" />
-      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
-        <reference id="1139959269582" name="actionMap" index="1ERwB7" />
-        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
-        <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" />
-        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
-      </concept>
-      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
-        <property id="1082639509531" name="nullText" index="ilYzB" />
-        <property id="1073389577007" name="text" index="3F0ifm" />
-      </concept>
-      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
-        <child id="1219418656006" name="styleItem" index="3F10Kt" />
-      </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <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="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
-        <child id="1638911550608572412" name="sections" index="IW6Ez" />
-      </concept>
-      <concept id="7980428675268276156" name="jetbrains.mps.lang.editor.structure.TransformationMenuSection" flags="ng" index="1Qtc8_">
-        <child id="7980428675268276157" name="locations" index="1Qtc8$" />
-        <child id="7980428675268276159" name="parts" index="1Qtc8A" />
-      </concept>
-      <concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
-        <child id="1950447826683828796" name="target" index="3XvnJa" />
-      </concept>
-      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
-        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
-      </concept>
-    </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
-        <property id="1179360856892" name="value" index="2noCCI" />
-      </concept>
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <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="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <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="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </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="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>
-      <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="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">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-    </language>
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="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="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="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
-      <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
-        <reference id="3562215692195600259" name="link" index="13MTZf" />
-      </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="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
-      <concept id="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="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">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </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="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-    </language>
-  </registry>
-  <node concept="24kQdi" id="JOGAOsxaCz">
-    <ref role="1XX52x" to="dff3: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="dff3: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="V5hpn" id="JOGAOsxbBZ">
-    <property role="TrG5h" value="DataForm" />
-    <node concept="14StLt" id="4aJUH_hW38r" role="V601i">
-      <property role="TrG5h" value="RuleKeyword" />
-      <node concept="3Xmtl4" id="4aJUH_hW3bF" role="3F10Kt">
-        <node concept="1wgc9g" id="4aJUH_hW5PN" role="3XvnJa">
-          <ref role="1wgcnl" to="tpen:aeM1BF$Ozh" />
-        </node>
-      </node>
-      <node concept="VechU" id="4aJUH_hW5$h" role="3F10Kt">
-        <node concept="mot77" id="4aJUH_hW5$m" role="VblUZ">
-          <node concept="3clFbS" id="4aJUH_hW5$n" role="2VODD2">
-            <node concept="3clFbF" id="4aJUH_hW5CY" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaN" role="3clFbG">
-                <ref role="3cqZAo" node="4aJUH_hW4LO" resolve="FG_TAG" />
-                <ref role="1PxDUh" node="7ksQUDZpwgy" resolve="CustomColors" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="14StLt" id="4bWqD4C9OIl" role="V601i">
-      <property role="TrG5h" value="TermFeatureOverride" />
-      <node concept="VechU" id="4bWqD4C9OIm" role="3F10Kt">
-        <node concept="mot77" id="4bWqD4C9OIn" role="VblUZ">
-          <node concept="3clFbS" id="4bWqD4C9OIo" role="2VODD2">
-            <node concept="3clFbF" id="4bWqD4C9OIp" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaQ" role="3clFbG">
-                <ref role="3cqZAo" node="4aJUH_hWVXm" resolve="FG_OPTIONAL" />
-                <ref role="1PxDUh" node="7ksQUDZpwgy" resolve="CustomColors" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="14StLt" id="4bWqD4C2vDI" role="V601i">
-      <property role="TrG5h" value="Term" />
-      <node concept="Vb9p2" id="3IIf9O_CN_$" role="3F10Kt">
-        <property role="Vbekb" value="ITALIC" />
-      </node>
-      <node concept="1X3_iC" id="4bWqD4C9OHF" role="lGtFl">
-        <property role="3V$3am" value="styleItem" />
-        <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-        <node concept="VechU" id="4bWqD4C7tOo" role="8Wnug">
-          <node concept="mot77" id="4bWqD4C7tOp" role="VblUZ">
-            <node concept="3clFbS" id="4bWqD4C7tOq" role="2VODD2">
-              <node concept="3clFbF" id="4bWqD4C7tOr" role="3cqZAp">
-                <node concept="10M0yZ" id="JOGAOsxcaW" role="3clFbG">
-                  <ref role="1PxDUh" node="7ksQUDZpwgy" resolve="CustomColors" />
-                  <ref role="3cqZAo" node="4bWqD4C7sc7" resolve="FG_TERM" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="7ksQUDZpwgy">
-    <property role="TrG5h" value="CustomColors" />
-    <node concept="2tJIrI" id="7ksQUDZtH$w" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZq4Xq" role="jymVt">
-      <property role="TrG5h" value="LAKE" />
-      <node concept="3Tm1VV" id="7ksQUDZq4Xr" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZq4Xs" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZq4Xt" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZq4Xu" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBF6aa" role="37wK5m">
-            <property role="2noCCI" value="ED" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6dW" role="37wK5m">
-            <property role="2noCCI" value="FC" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6l9" role="37wK5m">
-            <property role="2noCCI" value="ED" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZq4Xy" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZq4Xz" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZq4X$" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Injected fragment, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ksQUDZq5ef" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZq54u" role="jymVt">
-      <property role="TrG5h" value="SWAMP" />
-      <node concept="3Tm1VV" id="7ksQUDZq54v" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZq54w" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZq54x" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZq54y" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBF6z7" role="37wK5m">
-            <property role="2noCCI" value="34" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6AT" role="37wK5m">
-            <property role="2noCCI" value="41" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6EF" role="37wK5m">
-            <property role="2noCCI" value="35" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZq54A" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZq54B" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZq54C" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Injected fragment, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ksQUDZpwgT" role="jymVt" />
-    <node concept="Wx3nA" id="7LZcKzBExMT" role="jymVt">
-      <property role="TrG5h" value="BG_INJECTED_FRAGMENT" />
-      <node concept="3Tm1VV" id="7LZcKzBExOS" role="1B3o_S" />
-      <node concept="3uibUv" id="7LZcKzBExPz" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="7LZcKzBExQn" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="7LZcKzBExRV" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7LZcKzBExWk" role="33vP2m">
-        <node concept="1pGfFk" id="7LZcKzBF5D7" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="7LZcKzBF5V4" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZq4Xq" resolve="LAKE" />
-          </node>
-          <node concept="37vLTw" id="7LZcKzBF5Yn" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZq54u" resolve="SWAMP" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBF5JO" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBF5Qt" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7LZcKzBExEj" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZx7BM" role="jymVt">
-      <property role="TrG5h" value="CALM" />
-      <node concept="3Tm1VV" id="7ksQUDZx7BN" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZx7BO" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZx7BP" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZx7BQ" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBF6PU" role="37wK5m">
-            <property role="2noCCI" value="45" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6R4" role="37wK5m">
-            <property role="2noCCI" value="83" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF6Se" role="37wK5m">
-            <property role="2noCCI" value="83" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZx7BU" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZx7BV" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZx7BW" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for JavaScript local identifier, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ksQUDZx8_J" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZx8vw" role="jymVt">
-      <property role="TrG5h" value="STORM" />
-      <node concept="3Tm1VV" id="7ksQUDZx8vx" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZx8vy" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZx8vz" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZx8v$" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBF6Z3" role="37wK5m">
-            <property role="2noCCI" value="A9" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF70I" role="37wK5m">
-            <property role="2noCCI" value="B7" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBF72n" role="37wK5m">
-            <property role="2noCCI" value="C6" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZx8vC" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZx8vD" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZx8vE" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Default identifier, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7LZcKzBF74q" role="jymVt" />
-    <node concept="Wx3nA" id="7LZcKzBF77o" role="jymVt">
-      <property role="TrG5h" value="FG_LOCAL_IDENTIFIER" />
-      <node concept="3Tm1VV" id="7LZcKzBF77p" role="1B3o_S" />
-      <node concept="3uibUv" id="7LZcKzBF77q" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="7LZcKzBF77r" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="7LZcKzBF77s" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7LZcKzBF77t" role="33vP2m">
-        <node concept="1pGfFk" id="7LZcKzBF77u" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="7LZcKzBF7qS" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZx7BM" resolve="CALM" />
-          </node>
-          <node concept="37vLTw" id="7LZcKzBF7ub" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZx8vw" resolve="STORM" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBF77x" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBF77y" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_win" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_wic" role="jymVt">
-      <property role="TrG5h" value="BEETROOT" />
-      <node concept="3Tm1VV" id="1iWwVK2_wid" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_wie" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_wif" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_wig" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2_wih" role="37wK5m">
-            <property role="2noCCI" value="7F" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_wii" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_wij" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="1iWwVK2_wik" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_wil" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_wim" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for template variable, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7LZcKzBFlFB" role="jymVt" />
-    <node concept="Wx3nA" id="7LZcKzBFlBy" role="jymVt">
-      <property role="TrG5h" value="ROSE" />
-      <node concept="3Tm1VV" id="7LZcKzBFlBz" role="1B3o_S" />
-      <node concept="3uibUv" id="7LZcKzBFlB$" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7LZcKzBFlB_" role="33vP2m">
-        <node concept="1pGfFk" id="7LZcKzBFlBA" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBFlBB" role="37wK5m">
-            <property role="2noCCI" value="AE" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBFlBC" role="37wK5m">
-            <property role="2noCCI" value="8A" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBFlBD" role="37wK5m">
-            <property role="2noCCI" value="BE" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7LZcKzBFlBE" role="lGtFl">
-        <node concept="TZ5HA" id="7LZcKzBFlBF" role="TZ5H$">
-          <node concept="1dT_AC" id="7LZcKzBFlBG" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for template variable, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7LZcKzBF7vP" role="jymVt" />
-    <node concept="Wx3nA" id="7LZcKzBFlL2" role="jymVt">
-      <property role="TrG5h" value="FG_TEMPLATE_VARIABLE" />
-      <node concept="3Tm1VV" id="7LZcKzBFlL3" role="1B3o_S" />
-      <node concept="3uibUv" id="7LZcKzBFlL4" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="7LZcKzBFlL5" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="7LZcKzBFlL6" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7LZcKzBFlL7" role="33vP2m">
-        <node concept="1pGfFk" id="7LZcKzBFlL8" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="1iWwVK2_E0N" role="37wK5m">
-            <ref role="3cqZAo" node="1iWwVK2_wic" resolve="BEETROOT" />
-          </node>
-          <node concept="37vLTw" id="7LZcKzBFmem" role="37wK5m">
-            <ref role="3cqZAo" node="7LZcKzBFlBy" resolve="ROSE" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBFlLb" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="7LZcKzBFlLc" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CEQDIDT_Xu" role="jymVt" />
-    <node concept="Wx3nA" id="7LZcKzBFlnm" role="jymVt">
-      <property role="TrG5h" value="BLUE" />
-      <node concept="3Tm1VV" id="7LZcKzBFlnn" role="1B3o_S" />
-      <node concept="3uibUv" id="7LZcKzBFlno" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7LZcKzBFlnp" role="33vP2m">
-        <node concept="1pGfFk" id="7LZcKzBFlnq" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="7LZcKzBFlnr" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBFlns" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-          <node concept="2nou5x" id="7LZcKzBFlnt" role="37wK5m">
-            <property role="2noCCI" value="FF" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7LZcKzBFlnu" role="lGtFl">
-        <node concept="TZ5HA" id="7LZcKzBFlnv" role="TZ5H$">
-          <node concept="1dT_AC" id="7LZcKzBFlnw" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_wWr" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_wWg" role="jymVt">
-      <property role="TrG5h" value="BRIGHTGRAY" />
-      <node concept="3Tm1VV" id="1iWwVK2_wWh" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_wWi" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_wWj" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_wWk" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2_wWl" role="37wK5m">
-            <property role="2noCCI" value="BA" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_wWm" role="37wK5m">
-            <property role="2noCCI" value="BA" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_wWn" role="37wK5m">
-            <property role="2noCCI" value="BA" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="1iWwVK2_wWo" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_wWp" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_wWq" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_wds" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_x2l" role="jymVt">
-      <property role="TrG5h" value="FG_PROPERTY_NAME" />
-      <node concept="3Tm1VV" id="1iWwVK2_x2m" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_x2n" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="1iWwVK2_x2o" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="1iWwVK2_x2p" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_x2q" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_x2r" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="1iWwVK2_DTk" role="37wK5m">
-            <ref role="3cqZAo" node="7LZcKzBFlnm" resolve="BLUE" />
-          </node>
-          <node concept="37vLTw" id="1iWwVK2_xse" role="37wK5m">
-            <ref role="3cqZAo" node="1iWwVK2_wWg" resolve="BRIGHTGRAY" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2_x2u" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2_x2v" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_wfA" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_Ba9" role="jymVt">
-      <property role="TrG5h" value="DARKGREEN" />
-      <node concept="3Tm1VV" id="1iWwVK2_Baa" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_Bab" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_Bac" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_Bad" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2_Bae" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_Baf" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_Bag" role="37wK5m">
-            <property role="2noCCI" value="00" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="1iWwVK2_Bah" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_Bai" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_Baj" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property value, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_Ba8" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_Byu" role="jymVt">
-      <property role="TrG5h" value="CURRY" />
-      <node concept="3Tm1VV" id="1iWwVK2_Byv" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_Byw" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_Byx" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_Byy" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2_Byz" role="37wK5m">
-            <property role="2noCCI" value="E8" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_By$" role="37wK5m">
-            <property role="2noCCI" value="BF" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2_By_" role="37wK5m">
-            <property role="2noCCI" value="6A" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="1iWwVK2_ByA" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_ByB" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_ByC" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS identifier, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2_Byt" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2_CSV" role="jymVt">
-      <property role="TrG5h" value="FG_KEYWORD" />
-      <node concept="3Tm1VV" id="1iWwVK2_CSW" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2_CSX" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="1iWwVK2_CSY" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="1iWwVK2_CSZ" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2_CT0" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2_CT1" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="1iWwVK2_DJn" role="37wK5m">
-            <ref role="3cqZAo" node="1iWwVK2_Ba9" resolve="DARKGREEN" />
-          </node>
-          <node concept="37vLTw" id="1iWwVK2_DOn" role="37wK5m">
-            <ref role="3cqZAo" node="1iWwVK2_Byu" resolve="CURRY" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2_CT4" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2_CT5" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1iWwVK2DQSH" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZpwh9" role="jymVt">
-      <property role="TrG5h" value="SKY" />
-      <node concept="3Tm1VV" id="7ksQUDZpwht" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZpwhO" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZpwrN" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZpwrK" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2DOEL" role="37wK5m">
-            <property role="2noCCI" value="E5" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2DOGu" role="37wK5m">
-            <property role="2noCCI" value="FA" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2DOHE" role="37wK5m">
-            <property role="2noCCI" value="FC" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZpxjY" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZpxjZ" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZpxk0" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Database expressions, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ksQUDZpxrN" role="jymVt" />
-    <node concept="Wx3nA" id="7ksQUDZpxlc" role="jymVt">
-      <property role="TrG5h" value="DIRT" />
-      <node concept="3Tm1VV" id="7ksQUDZpxld" role="1B3o_S" />
-      <node concept="3uibUv" id="7ksQUDZpxle" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="7ksQUDZpxlf" role="33vP2m">
-        <node concept="1pGfFk" id="7ksQUDZpxlg" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="1iWwVK2DOQS" role="37wK5m">
-            <property role="2noCCI" value="3E" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2DOS_" role="37wK5m">
-            <property role="2noCCI" value="38" />
-          </node>
-          <node concept="2nou5x" id="1iWwVK2DOTL" role="37wK5m">
-            <property role="2noCCI" value="50" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="7ksQUDZpxlk" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZpxll" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZpxlm" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Database expressions, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7ksQUDZq5db" role="jymVt" />
-    <node concept="Wx3nA" id="1iWwVK2DP_M" role="jymVt">
-      <property role="TrG5h" value="BG_EXPRESSION" />
-      <node concept="3Tm1VV" id="1iWwVK2DP_N" role="1B3o_S" />
-      <node concept="3uibUv" id="1iWwVK2DP_O" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="1iWwVK2DP_P" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="1iWwVK2DP_Q" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1iWwVK2DP_R" role="33vP2m">
-        <node concept="1pGfFk" id="1iWwVK2DP_S" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="1iWwVK2DR0l" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZpwh9" resolve="SKY" />
-          </node>
-          <node concept="37vLTw" id="1iWwVK2DR0p" role="37wK5m">
-            <ref role="3cqZAo" node="7ksQUDZpxlc" resolve="DIRT" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2DP_V" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="1iWwVK2DP_W" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hW484" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hW4Mc" role="jymVt">
-      <property role="TrG5h" value="DARKGRAY" />
-      <node concept="3Tm1VV" id="4aJUH_hW4Md" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hW4Me" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hW4Mf" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hW4Mg" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4aJUH_hW4Mh" role="37wK5m">
-            <property role="2noCCI" value="3D" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hW4Mi" role="37wK5m">
-            <property role="2noCCI" value="3D" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hW4Mj" role="37wK5m">
-            <property role="2noCCI" value="3D" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4aJUH_hW4Mk" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hW4Ml" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hW4Mm" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Doc comment tag, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hW4Mb" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hW4M0" role="jymVt">
-      <property role="TrG5h" value="BRICK" />
-      <node concept="3Tm1VV" id="4aJUH_hW4M1" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hW4M2" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hW4M3" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hW4M4" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4aJUH_hW4M5" role="37wK5m">
-            <property role="2noCCI" value="8A" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hW4M6" role="37wK5m">
-            <property role="2noCCI" value="65" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hW4M7" role="37wK5m">
-            <property role="2noCCI" value="3B" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4aJUH_hW4M8" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hW4M9" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hW4Ma" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Doc comment tag, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hW4LZ" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hW4LO" role="jymVt">
-      <property role="TrG5h" value="FG_TAG" />
-      <node concept="3Tm1VV" id="4aJUH_hW4LP" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hW4LQ" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="4aJUH_hW4LR" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="4aJUH_hW4LS" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hW4LT" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hW4LU" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="4aJUH_hW5oI" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hW4Mc" resolve="DARKGRAY" />
-          </node>
-          <node concept="37vLTw" id="4aJUH_hW5s8" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hW4M0" resolve="BRICK" />
-          </node>
-          <node concept="3uibUv" id="4aJUH_hW4LX" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="4aJUH_hW4LY" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hWVXT" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hWVXI" role="jymVt">
-      <property role="TrG5h" value="CERULEAN" />
-      <node concept="3Tm1VV" id="4aJUH_hWVXJ" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hWVXK" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hWVXL" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hWVXM" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4aJUH_hWVXN" role="37wK5m">
-            <property role="2noCCI" value="4A" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hWVXO" role="37wK5m">
-            <property role="2noCCI" value="86" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hWVXP" role="37wK5m">
-            <property role="2noCCI" value="E8" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4aJUH_hWVXQ" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hWVXR" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hWVXS" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Kotlin Named argument, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hWVXH" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hWVXy" role="jymVt">
-      <property role="TrG5h" value="COBALT" />
-      <node concept="3Tm1VV" id="4aJUH_hWVXz" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hWVX$" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hWVX_" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hWVXA" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4aJUH_hWVXB" role="37wK5m">
-            <property role="2noCCI" value="46" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hWVXC" role="37wK5m">
-            <property role="2noCCI" value="7C" />
-          </node>
-          <node concept="2nou5x" id="4aJUH_hWVXD" role="37wK5m">
-            <property role="2noCCI" value="DA" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4aJUH_hWVXE" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hWVXF" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hWVXG" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Kotlin Named argument, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4aJUH_hWVXx" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hWVXm" role="jymVt">
-      <property role="TrG5h" value="FG_OPTIONAL" />
-      <node concept="3Tm1VV" id="4aJUH_hWVXn" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hWVXo" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="4aJUH_hWVXp" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="4aJUH_hWVXq" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4aJUH_hWVXr" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hWVXs" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="37vLTw" id="4aJUH_hWWwd" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hWVXI" resolve="CERULEAN" />
-          </node>
-          <node concept="37vLTw" id="4aJUH_hWWzD" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hWVXy" resolve="COBALT" />
-          </node>
-          <node concept="3uibUv" id="4aJUH_hWVXv" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="4aJUH_hWVXw" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C2Vzp" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C2Vn_" role="jymVt">
-      <property role="TrG5h" value="PURPLE" />
-      <node concept="3Tm1VV" id="4bWqD4C2VnA" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C2VnB" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C2VnC" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C2VnD" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4bWqD4C2VnE" role="37wK5m">
-            <property role="2noCCI" value="66" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C2VnF" role="37wK5m">
-            <property role="2noCCI" value="0E" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C2VnG" role="37wK5m">
-            <property role="2noCCI" value="7A" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4bWqD4C2VnH" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C2VnI" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C2VnJ" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for instance field, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C2Vn$" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C2Vnp" role="jymVt">
-      <property role="TrG5h" value="IRIS" />
-      <node concept="3Tm1VV" id="4bWqD4C2Vnq" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C2Vnr" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C2Vns" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C2Vnt" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4bWqD4C2Vnu" role="37wK5m">
-            <property role="2noCCI" value="98" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C2Vnv" role="37wK5m">
-            <property role="2noCCI" value="76" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C2Vnw" role="37wK5m">
-            <property role="2noCCI" value="AA" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4bWqD4C2Vnx" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C2Vny" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C2Vnz" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for instance field, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C2Vno" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C2Vnd" role="jymVt">
-      <property role="TrG5h" value="FG_PARAMETER" />
-      <node concept="3Tm1VV" id="4bWqD4C2Vne" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C2Vnf" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="4bWqD4C2Vng" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="4bWqD4C2Vnh" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C2Vni" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C2Vnj" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="3uibUv" id="4bWqD4C2Vnm" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="4bWqD4C2Vnn" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="37vLTw" id="4bWqD4C2W2W" role="37wK5m">
-            <ref role="3cqZAo" node="4bWqD4C2Vn_" resolve="PURPLE" />
-          </node>
-          <node concept="37vLTw" id="4bWqD4C2W7w" role="37wK5m">
-            <ref role="3cqZAo" node="4bWqD4C2Vnp" resolve="IRIS" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C2VgG" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C3iOy" role="jymVt">
-      <property role="TrG5h" value="SAPPHIRE" />
-      <node concept="3Tm1VV" id="4bWqD4C3iOz" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C3iO$" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C3iO_" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C3iOA" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4bWqD4C3iOB" role="37wK5m">
-            <property role="2noCCI" value="20" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C3iOC" role="37wK5m">
-            <property role="2noCCI" value="99" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C3iOD" role="37wK5m">
-            <property role="2noCCI" value="9E" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4bWqD4C3iOE" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C3iOF" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C3iOG" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Java type parameter, default scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C3iOx" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C3iOm" role="jymVt">
-      <property role="TrG5h" value="OCEAN" />
-      <node concept="3Tm1VV" id="4bWqD4C3iOn" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C3iOo" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C3iOp" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C3iOq" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="4bWqD4C3iOr" role="37wK5m">
-            <property role="2noCCI" value="50" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C3iOs" role="37wK5m">
-            <property role="2noCCI" value="78" />
-          </node>
-          <node concept="2nou5x" id="4bWqD4C3iOt" role="37wK5m">
-            <property role="2noCCI" value="74" />
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="4bWqD4C3iOu" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C3iOv" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C3iOw" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Java type parameter, dark scheme" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C7rWX" role="jymVt" />
-    <node concept="Wx3nA" id="4bWqD4C7sc7" role="jymVt">
-      <property role="TrG5h" value="FG_TERM" />
-      <node concept="3Tm1VV" id="4bWqD4C7sc8" role="1B3o_S" />
-      <node concept="3uibUv" id="4bWqD4C7sc9" role="1tU5fm">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="4bWqD4C7sca" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-        <node concept="3uibUv" id="4bWqD4C7scb" role="11_B2D">
-          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4bWqD4C7scc" role="33vP2m">
-        <node concept="1pGfFk" id="4bWqD4C7scd" role="2ShVmc">
-          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="3uibUv" id="4bWqD4C7sce" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="3uibUv" id="4bWqD4C7scf" role="1pMfVU">
-            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-          </node>
-          <node concept="37vLTw" id="4bWqD4C7tk4" role="37wK5m">
-            <ref role="3cqZAo" node="4bWqD4C3iOy" resolve="SAPPHIRE" />
-          </node>
-          <node concept="37vLTw" id="4bWqD4C7tqo" role="37wK5m">
-            <ref role="3cqZAo" node="4bWqD4C3iOm" resolve="OCEAN" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4bWqD4C7rFE" role="jymVt" />
-    <node concept="3Tm1VV" id="7ksQUDZpwgz" role="1B3o_S" />
-  </node>
-  <node concept="24kQdi" id="JOGAOsxiLE">
-    <property role="3GE5qa" value="feature" />
-    <ref role="1XX52x" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
-      <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
-        <property role="3F0ifm" value="final" />
-        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
-        <ref role="1ERwB7" node="JOGAOsxj5_" resolve="DataFormFeature_final" />
-        <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="dff3: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="dff3: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="dff3: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="dff3: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="feature" />
-    <ref role="1h_SK9" to="dff3:JOGAOsxiL_" resolve="DataFormFeature" />
-    <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
-      <property role="1hAc7j" value="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="dff3: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="dff3:JOGAOsxiLC" resolve="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="IW6AY" id="JOGAOsxkwf">
-    <property role="3GE5qa" value="feature" />
-    <ref role="aqKnT" to="dff3: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="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="dff3: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="dff3: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="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="dff3:JOGAOsxmrx" resolve="getter" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="JOGAOsxAMA" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxlgm">
-    <ref role="1XX52x" to="dff3: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="dff3: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="IW6AY" id="JOGAOsxCR1">
-    <ref role="aqKnT" to="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <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="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="dff3: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="dff3: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="3y3z36" id="7c96q9tzR0_" role="3clFbG">
-                          <node concept="7Obwk" id="7c96q9tzR0A" role="3uHU7w" />
-                          <node concept="37vLTw" id="7c96q9tzR0B" role="3uHU7B">
-                            <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
-                          </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="dff3: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="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxEW6">
-    <ref role="1XX52x" to="dff3:JOGAOsxaC9" resolve="DataFormDeclaration" />
-    <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
-      <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="dff3: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="dff3: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="dff3: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="dff3:JOGAOsxaCc" resolve="template" />
-      </node>
-      <node concept="l2Vlx" id="4MEOIDFttNs" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxTDr">
-    <property role="3GE5qa" value="feature" />
-    <ref role="1XX52x" to="dff3:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
-      <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
-        <ref role="1NtTu8" to="dff3: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="dff3:JOGAOsxTDm" resolve="getter" />
-      </node>
-      <node concept="l2Vlx" id="1L74NXFMBU8" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="JOGAOsxX6Q">
-    <ref role="1XX52x" to="dff3:JOGAOsxanH" resolve="DataForm" />
-    <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="dff3: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 concept="ljvvj" id="1L74NXFNj7v" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="1L74NXFOUM5" role="3n$kyP">
-              <node concept="3clFbS" id="1L74NXFOUM6" role="2VODD2">
-                <node concept="3clFbF" id="1L74NXFOUWS" role="3cqZAp">
-                  <node concept="3eOSWO" id="1L74NXFP2wG" role="3clFbG">
-                    <node concept="3cmrfG" id="1L74NXFP2wM" role="3uHU7w">
-                      <property role="3cmrfH" value="2" />
-                    </node>
-                    <node concept="2OqwBi" id="1L74NXFOXiD" role="3uHU7B">
-                      <node concept="2OqwBi" id="1L74NXFOV8F" role="2Oq$k0">
-                        <node concept="pncrf" id="1L74NXFOUWR" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="1L74NXFOVBn" role="2OqNvi">
-                          <ref role="3TtcxE" to="dff3:JOGAOsxaC4" resolve="override" />
-                        </node>
-                      </node>
-                      <node concept="34oBXx" id="1L74NXFP0h0" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
-          <ref role="1NtTu8" to="dff3: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="tppnM" id="1L74NXFPoKM" role="sWeuL">
-            <node concept="ljvvj" id="1L74NXFPoKV" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-              <node concept="3nzxsE" id="4bWqD4CgyAD" role="3n$kyP">
-                <node concept="3clFbS" id="4bWqD4CgyAE" role="2VODD2">
-                  <node concept="3clFbF" id="4bWqD4CgyHR" role="3cqZAp">
-                    <node concept="3eOSWO" id="4bWqD4CgEAp" role="3clFbG">
-                      <node concept="3cmrfG" id="4bWqD4CgEAv" role="3uHU7w">
-                        <property role="3cmrfH" value="2" />
-                      </node>
-                      <node concept="2OqwBi" id="4bWqD4Cg_p8" role="3uHU7B">
-                        <node concept="2OqwBi" id="4bWqD4CgyVA" role="2Oq$k0">
-                          <node concept="pncrf" id="4bWqD4CgyHQ" role="2Oq$k0" />
-                          <node concept="3Tsc0h" id="4bWqD4Cgzzg" role="2OqNvi">
-                            <ref role="3TtcxE" to="dff3:JOGAOsxaC4" resolve="override" />
-                          </node>
-                        </node>
-                        <node concept="34oBXx" id="4bWqD4CgCks" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </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 concept="pVoyu" id="1L74NXFNj5N" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="1L74NXFP31o" role="3n$kyP">
-              <node concept="3clFbS" id="1L74NXFP31p" role="2VODD2">
-                <node concept="3clFbF" id="1L74NXFP3eX" role="3cqZAp">
-                  <node concept="3eOSWO" id="1L74NXFPaP5" role="3clFbG">
-                    <node concept="3cmrfG" id="1L74NXFPaPb" role="3uHU7w">
-                      <property role="3cmrfH" value="2" />
-                    </node>
-                    <node concept="2OqwBi" id="1L74NXFP5$I" role="3uHU7B">
-                      <node concept="2OqwBi" id="1L74NXFP3qK" role="2Oq$k0">
-                        <node concept="pncrf" id="1L74NXFP3eW" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="1L74NXFP3Ts" role="2OqNvi">
-                          <ref role="3TtcxE" to="dff3:JOGAOsxaC4" resolve="override" />
-                        </node>
-                      </node>
-                      <node concept="34oBXx" id="1L74NXFP8_p" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1Bsynf" id="1L74NXFNylb" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
-  </node>
-  <node concept="3p36aQ" id="JOGAOsxYtS">
-    <ref role="aqKnT" to="dff3:JOGAOsxanH" resolve="DataForm" />
-    <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="dff3:JOGAOsxanH" resolve="DataForm" />
-                </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="dff3:JOGAOsxanH" resolve="DataForm" />
-                    </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="dff3: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="dff3: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="dff3:JOGAOsxaCw" resolve="DataFormTable" />
-                </node>
-              </node>
-              <node concept="13MTOL" id="JOGAOsy1e8" role="2OqNvi">
-                <ref role="13MTZf" to="dff3:JOGAOsxaCx" resolve="contents" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/models/structure.mps b/coderules/languages/jetbrains.mps.dataform/models/structure.mps
deleted file mode 100644
index 409b2a3c..00000000
--- a/coderules/languages/jetbrains.mps.dataform/models/structure.mps
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)">
-  <persistence version="9" />
-  <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
-    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
-  </languages>
-  <imports>
-    <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)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
-        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
-        <property id="4628067390765956807" name="final" index="R5$K2" />
-        <property id="4628067390765956802" name="abstract" index="R5$K7" />
-        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-        <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
-      </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
-      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
-        <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>
-      <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
-        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
-        <reference id="1082985295845" name="dataType" index="AX2Wp" />
-      </concept>
-      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
-        <property id="1071599776563" name="role" index="20kJfa" />
-        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
-        <property id="1071599937831" name="metaClass" index="20lmBu" />
-        <property id="241647608299431140" name="linkId" index="IQ2ns" />
-        <reference id="1071599976176" name="target" index="20lvS9" />
-      </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">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1TIwiD" id="JOGAOsxanH">
-    <property role="EcuMT" value="861509610434242029" />
-    <property role="TrG5h" value="DataForm" />
-    <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243078" />
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="decl" />
-      <property role="20lbJX" value="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="aggregation" />
-      <property role="20kJfa" value="override" />
-      <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxaC9">
-    <property role="EcuMT" value="861509610434243081" />
-    <property role="TrG5h" value="DataFormDeclaration" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxaCc" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243084" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="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="20lmBu" value="reference" />
-      <property role="20kJfa" value="prototype" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
-    </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" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434243105" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="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>
-  <node concept="1TIwiD" id="JOGAOsxiLy">
-    <property role="EcuMT" value="861509610434276450" />
-    <property role="TrG5h" value="DataFormTemplate" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
-      <property role="IQ2ns" value="861509610434276451" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
-    </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="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="aggregation" />
-      <property role="20kJfa" value="getter" />
-      <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="feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-  </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="feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxpXw">
-    <property role="EcuMT" value="861509610434305888" />
-    <property role="3GE5qa" value="feature" />
-    <property role="TrG5h" value="ListFeature" />
-    <property role="34LRSv" value="list" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
-  </node>
-  <node concept="1TIwiD" id="JOGAOsxTDl">
-    <property role="EcuMT" value="861509610434435669" />
-    <property role="3GE5qa" value="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="20lmBu" value="reference" />
-      <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="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="aggregation" />
-      <property role="20kJfa" value="getter" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="JOGAOsIRhm">
-    <property role="EcuMT" value="861509610437833814" />
-    <property role="TrG5h" value="Capture" />
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.dataform/models/typesystem.mps b/coderules/languages/jetbrains.mps.dataform/models/typesystem.mps
deleted file mode 100644
index 60ebe91f..00000000
--- a/coderules/languages/jetbrains.mps.dataform/models/typesystem.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:78250588-d5ab-49be-a035-a64c0abfc494(jetbrains.mps.dataform.typesystem)">
-  <persistence version="9" />
-  <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
-    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
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 2f69e788..321ec147 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
@@ -38,7 +38,7 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
@@ -47,7 +47,6 @@
     <import index="ba7m" ref="r:4c5ac278-3ad7-4902-ab86-6c60b350f168(jetbrains.mps.lang.aspect.generator.template.main@generator)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
@@ -58,6 +57,7 @@
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -525,7 +525,7 @@
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN">
@@ -2017,7 +2017,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="5WBVN_MTd1c" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+      <ref role="30HIoZ" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
       <node concept="30G5F_" id="7lt0LtQruqd" role="30HLyM">
         <node concept="3clFbS" id="7lt0LtQruqe" role="2VODD2">
           <node concept="3SKdUt" id="7lt0LtQruUX" role="3cqZAp">
@@ -2036,27 +2036,6 @@
         <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
       </node>
     </node>
-    <node concept="3aamgX" id="7lt0LtQg4bJ" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7lt0LtQg3tE" resolve="ConstantExpressionItem" />
-      <node concept="gft3U" id="7lt0LtQgaVg" role="1lVwrX">
-        <node concept="10Nm6u" id="7lt0LtQgaVh" role="gfFT$">
-          <node concept="29HgVG" id="7lt0LtQgaVi" role="lGtFl">
-            <node concept="3NFfHV" id="7lt0LtQgaVj" role="3NFExx">
-              <node concept="3clFbS" id="7lt0LtQgaVk" role="2VODD2">
-                <node concept="3clFbF" id="7lt0LtQgaVl" role="3cqZAp">
-                  <node concept="2OqwBi" id="7lt0LtQgaVm" role="3clFbG">
-                    <node concept="3TrEf2" id="7lt0LtQgaVn" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:7lt0LtQg3vl" resolve="code" />
-                    </node>
-                    <node concept="30H73N" id="7lt0LtQgaVo" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="5WBVN_M3sDQ" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
       <node concept="1Koe21" id="5WBVN_M3sDR" role="1lVwrX">
@@ -2189,7 +2168,7 @@
                   <node concept="1Y3b0j" id="1HWyn8juJKj" role="YeSDq">
                     <property role="2bfB8j" value="true" />
                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <ref role="1Y3XeK" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="1Y3XeK" to="7n8k:5WBVN_M1BKE" resolve="LateExpression" />
                     <node concept="3Tm1VV" id="1HWyn8juJKk" role="1B3o_S" />
                     <node concept="3clFb_" id="1HWyn8juJKl" role="jymVt">
                       <property role="1EzhhJ" value="false" />
@@ -2361,7 +2340,7 @@
                   <node concept="1Y3b0j" id="3pMFS1zdix7" role="YeSDq">
                     <property role="2bfB8j" value="true" />
                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <ref role="1Y3XeK" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="1Y3XeK" to="7n8k:5WBVN_M1BKE" resolve="LateExpression" />
                     <node concept="3Tm1VV" id="3pMFS1zdix8" role="1B3o_S" />
                     <node concept="3clFb_" id="3pMFS1zdix9" role="jymVt">
                       <property role="1EzhhJ" value="false" />
@@ -12131,7 +12110,7 @@
               <node concept="1Y3b0j" id="1HWyn8iTlB0" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <ref role="1Y3XeK" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                <ref role="1Y3XeK" to="7n8k:5WBVN_M1BKE" resolve="LateExpression" />
                 <node concept="3Tm1VV" id="1HWyn8iTlB1" role="1B3o_S" />
                 <node concept="3clFb_" id="1HWyn8iTlB2" role="jymVt">
                   <property role="1EzhhJ" value="false" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index ffe4e1bf..89832bea 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -75,7 +75,6 @@
         <module reference="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" version="0" />
         <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
         <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-        <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
@@ -116,7 +115,6 @@
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
-    <dependency reexport="true">942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
   </dependencies>
@@ -180,7 +178,6 @@
     <module reference="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" version="0" />
-    <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 17f63bf0..3f0ab47f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1036,7 +1036,8 @@
     </node>
   </node>
   <node concept="13h7C7" id="5WBVN_N1Xtr">
-    <ref role="13h7C2" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+    <property role="3GE5qa" value="logical" />
+    <ref role="13h7C2" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
     <node concept="13i0hz" id="1HWyn8iQj$B" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 7e31b2ea..7379e90e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -18,9 +18,8 @@
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="zer4" ref="r:34927e48-bf8d-4708-a63c-2a3e4a3e490e(jetbrains.mps.dataform.editor)" />
+    <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
@@ -534,7 +533,7 @@
         </node>
         <node concept="3F0ifn" id="4nIWweBIFef" role="3EZMnx">
           <property role="3F0ifm" value="&lt;" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="11LMrY" id="4aJUH_hSNbG" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -547,7 +546,7 @@
         </node>
         <node concept="3F0ifn" id="4aJUH_hLNmu" role="3EZMnx">
           <property role="3F0ifm" value="&gt;" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="11L4FC" id="4aJUH_hSNlB" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -594,7 +593,7 @@
         </node>
         <node concept="3F0ifn" id="PB1R3Y7KCo" role="3EZMnx">
           <property role="3F0ifm" value="&lt;" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="11LMrY" id="4aJUH_hT7OZ" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -607,7 +606,7 @@
         </node>
         <node concept="3F0ifn" id="4aJUH_hPok9" role="3EZMnx">
           <property role="3F0ifm" value="&gt;" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="11L4FC" id="4aJUH_hT8iC" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -642,7 +641,7 @@
         <node concept="3F0ifn" id="2E5lcNn0J1l" role="3EZMnx">
           <property role="3F0ifm" value="~" />
           <ref role="1ERwB7" node="7lt0LtPQ8ft" resolve="Head_delete" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="pkWqt" id="4nIWweBHrrS" role="pqm2j">
             <node concept="3clFbS" id="4nIWweBHrrT" role="2VODD2">
               <node concept="3clFbF" id="4nIWweBHrz6" role="3cqZAp">
@@ -802,7 +801,7 @@
     <node concept="3EZMnI" id="6p0DfM0drav" role="2wV5jI">
       <node concept="PMmxH" id="6p0DfM0drif" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="3F0A7n" id="6p0DfM0dsvN" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -817,7 +816,7 @@
         </node>
         <node concept="3F0ifn" id="34$A1Mf2yWZ" role="3EZMnx">
           <property role="3F0ifm" value="extends" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         </node>
         <node concept="1iCGBv" id="34$A1Mf2yZI" role="3EZMnx">
           <ref role="1NtTu8" to="wq2x:34$A1Mf2w7l" resolve="extends" />
@@ -922,7 +921,7 @@
     <node concept="3EZMnI" id="6p0DfM0dH8B" role="2wV5jI">
       <node concept="3F0ifn" id="4aJUH_hOrI6" role="3EZMnx">
         <property role="3F0ifm" value="when" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="pVoyu" id="7lt0LtPvYMZ" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -1091,9 +1090,9 @@
         <node concept="mot77" id="7km57PkaAqn" role="VblUZ">
           <node concept="3clFbS" id="7km57PkaAqo" role="2VODD2">
             <node concept="3clFbF" id="7km57PkaAuV" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaI" role="3clFbG">
-                <ref role="3cqZAo" to="zer4:1iWwVK2_CSV" resolve="FG_KEYWORD" />
-                <ref role="1PxDUh" to="zer4:7ksQUDZpwgy" resolve="CustomColors" />
+              <node concept="10M0yZ" id="5yqFHXovg09" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:1iWwVK2_CSV" resolve="FG_KEYWORD" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
               </node>
             </node>
           </node>
@@ -1111,9 +1110,9 @@
         <node concept="mot77" id="7km57PkbneD" role="VblUZ">
           <node concept="3clFbS" id="7km57PkbneE" role="2VODD2">
             <node concept="3clFbF" id="7km57PkbneF" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaH" role="3clFbG">
-                <ref role="3cqZAo" to="zer4:1iWwVK2_CSV" resolve="FG_KEYWORD" />
-                <ref role="1PxDUh" to="zer4:7ksQUDZpwgy" resolve="CustomColors" />
+              <node concept="10M0yZ" id="5yqFHXovg0a" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:1iWwVK2_CSV" resolve="FG_KEYWORD" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
               </node>
             </node>
           </node>
@@ -1126,9 +1125,9 @@
         <node concept="mot77" id="7LZcKzBE08O" role="VblUZ">
           <node concept="3clFbS" id="7LZcKzBE08P" role="2VODD2">
             <node concept="3clFbF" id="7LZcKzBFmHU" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaz" role="3clFbG">
-                <ref role="3cqZAo" to="zer4:7LZcKzBExMT" resolve="BG_INJECTED_FRAGMENT" />
-                <ref role="1PxDUh" to="zer4:7ksQUDZpwgy" resolve="CustomColors" />
+              <node concept="10M0yZ" id="5yqFHXovfZZ" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:7LZcKzBExMT" resolve="BG_INJECTED_FRAGMENT" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
               </node>
             </node>
           </node>
@@ -1158,9 +1157,9 @@
           <node concept="mot77" id="4bWqD4C4CM8" role="VblUZ">
             <node concept="3clFbS" id="4bWqD4C4CM9" role="2VODD2">
               <node concept="3clFbF" id="4bWqD4C4CMa" role="3cqZAp">
-                <node concept="10M0yZ" id="JOGAOsxcaV" role="3clFbG">
-                  <ref role="3cqZAo" to="zer4:4bWqD4C7sc7" resolve="FG_TERM" />
-                  <ref role="1PxDUh" to="zer4:7ksQUDZpwgy" resolve="CustomColors" />
+                <node concept="10M0yZ" id="5yqFHXovg0n" role="3clFbG">
+                  <ref role="3cqZAo" to="qgy9:4bWqD4C7sc7" resolve="FG_TERM" />
+                  <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
                 </node>
               </node>
             </node>
@@ -1177,9 +1176,9 @@
         <node concept="mot77" id="1iWwVK2DTqL" role="VblUZ">
           <node concept="3clFbS" id="1iWwVK2DTqV" role="2VODD2">
             <node concept="3clFbF" id="1iWwVK2DTyA" role="3cqZAp">
-              <node concept="10M0yZ" id="JOGAOsxcaA" role="3clFbG">
-                <ref role="3cqZAo" to="zer4:7LZcKzBF77o" resolve="FG_LOCAL_IDENTIFIER" />
-                <ref role="1PxDUh" to="zer4:7ksQUDZpwgy" resolve="CustomColors" />
+              <node concept="10M0yZ" id="5yqFHXow5LO" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:7LZcKzBF77o" resolve="FG_LOCAL_IDENTIFIER" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
               </node>
             </node>
           </node>
@@ -1242,7 +1241,7 @@
         <node concept="l2Vlx" id="6ntBQ9KCpY7" role="2iSdaV" />
         <node concept="3F0ifn" id="4laj_h9P4C8" role="3EZMnx">
           <property role="3F0ifm" value="apply if" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         </node>
       </node>
       <node concept="3F0ifn" id="4laj_h9P4C9" role="3EZMnx">
@@ -1290,7 +1289,7 @@
     <node concept="3EZMnI" id="5NuEpF1iiVw" role="2wV5jI">
       <node concept="3F0ifn" id="5NuEpF1ijhd" role="3EZMnx">
         <property role="3F0ifm" value="matching" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="1iCGBv" id="5NuEpF1ijhe" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:5NuEpF1iiA0" resolve="applicableConcept" />
@@ -1315,7 +1314,7 @@
           <node concept="3F0ifn" id="36tQV5AyfuG" role="1QoS34">
             <property role="3F0ifm" value="exactly" />
             <ref role="1ERwB7" node="12yN8DyB6zn" resolve="RuleInput_ActionMap" />
-            <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+            <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
             <node concept="OXEIz" id="36tQV5AyfuH" role="P5bDN">
               <node concept="1oHujT" id="36tQV5AyfuI" role="OY2wv">
                 <property role="1oHujS" value="including all subconcepts" />
@@ -1720,7 +1719,7 @@
         </node>
         <node concept="PMmxH" id="1pPth$m5B5r" role="3EZMnx">
           <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         </node>
         <node concept="3F0A7n" id="1pPth$m5Qhl" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -1773,7 +1772,7 @@
     <node concept="3EZMnI" id="1pPth$m6099" role="2wV5jI">
       <node concept="3F0ifn" id="7IysFeA7AdY" role="3EZMnx">
         <property role="3F0ifm" value="macro" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="3F0A7n" id="1pPth$m609g" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -1781,7 +1780,7 @@
       </node>
       <node concept="3F0ifn" id="7IysFeA6Upz" role="3EZMnx">
         <property role="3F0ifm" value="expands" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="3F1sOY" id="6DOfTm$zYlt" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:6DOfTm$zUE3" resolve="input" />
@@ -1860,7 +1859,7 @@
           <ref role="1NtTu8" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
           <node concept="3F0ifn" id="4nIWweBGFL1" role="2ruayu">
             <property role="3F0ifm" value="term" />
-            <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+            <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           </node>
         </node>
         <node concept="l2Vlx" id="1iWwVK2CnQY" role="2iSdaV" />
@@ -1995,7 +1994,7 @@
           <ref role="1NtTu8" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
           <node concept="3F0ifn" id="7XmdqtdBsrv" role="2ruayu">
             <property role="3F0ifm" value="term" />
-            <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+            <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           </node>
         </node>
         <node concept="VPM3Z" id="1iWwVK2Cokb" role="3F10Kt">
@@ -2017,7 +2016,7 @@
     <node concept="3EZMnI" id="7IysFe_ZQ6e" role="2wV5jI">
       <node concept="3F0ifn" id="7IysFe_ZQ6E" role="3EZMnx">
         <property role="3F0ifm" value="produce" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="pVoyu" id="7IysFeA7AiM" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -2359,7 +2358,7 @@
       <node concept="l2Vlx" id="3TnYLtqgQZ$" role="2iSdaV" />
       <node concept="PMmxH" id="3TnYLtqgQZH" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="VPxyj" id="3TnYLtqhLap" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -3721,7 +3720,8 @@
     </node>
   </node>
   <node concept="24kQdi" id="5WBVN_MT8FF">
-    <ref role="1XX52x" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+    <property role="3GE5qa" value="logical" />
+    <ref role="1XX52x" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
     <node concept="3EZMnI" id="6p0DfM0hL7k" role="2wV5jI">
       <node concept="3EZMnI" id="6p0DfM0hLg3" role="3EZMnx">
         <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
@@ -3770,16 +3770,17 @@
     </node>
   </node>
   <node concept="3p36aQ" id="5WBVN_MT8Gq">
-    <ref role="aqKnT" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+    <property role="3GE5qa" value="logical" />
+    <ref role="aqKnT" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
     <node concept="3eGOop" id="5WBVN_MT8K$" role="3ft7WO">
-      <ref role="3EoQqy" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+      <ref role="3EoQqy" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
       <node concept="ucgPf" id="5WBVN_MT8K_" role="3aKz83">
         <node concept="3clFbS" id="5WBVN_MT8KA" role="2VODD2">
           <node concept="3clFbF" id="5WBVN_MT8Wa" role="3cqZAp">
             <node concept="2ShNRf" id="5WBVN_MT8W8" role="3clFbG">
               <node concept="3zrR0B" id="5WBVN_MT9fd" role="2ShVmc">
                 <node concept="3Tqbb2" id="5WBVN_MT9ff" role="3zrR0E">
-                  <ref role="ehGHo" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+                  <ref role="ehGHo" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
                 </node>
               </node>
             </node>
@@ -3876,7 +3877,7 @@
     <node concept="3EZMnI" id="36tQV5AmMLR" role="2wV5jI">
       <node concept="3F0ifn" id="7lt0LtPkqU5" role="3EZMnx">
         <property role="3F0ifm" value="on" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="3F2HdR" id="7lt0LtPHSzb" role="3EZMnx">
         <property role="2czwfO" value=" " />
@@ -3959,7 +3960,7 @@
       </node>
       <node concept="3F0ifn" id="36tQV5AmMMd" role="3EZMnx">
         <property role="3F0ifm" value="activate" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="VPxyj" id="36tQV5AmMMe" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
@@ -3998,7 +3999,7 @@
           <ref role="1NtTu8" to="wq2x:36tQV5AmIsW" resolve="body" />
           <node concept="l2Vlx" id="36tQV5AmMMl" role="2czzBx" />
           <node concept="tppnM" id="36tQV5AmMMm" role="sWeuL">
-            <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+            <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
             <node concept="pVoyu" id="1mdVbTRQpgf" role="3F10Kt">
               <property role="VOm3f" value="true" />
             </node>
@@ -4038,7 +4039,7 @@
         <node concept="VPM3Z" id="xaaVXv4QaQ" role="3F10Kt" />
         <node concept="3F0ifn" id="xaaVXv4Rek" role="3EZMnx">
           <property role="3F0ifm" value="principal" />
-          <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
           <node concept="VPM3Z" id="xaaVXv4ReE" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -4215,7 +4216,7 @@
     <node concept="3EZMnI" id="7lt0LtPpFq7" role="2wV5jI">
       <node concept="3F0ifn" id="7lt0LtPpFqe" role="3EZMnx">
         <property role="3F0ifm" value="&lt;" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="11LMrY" id="7lt0LtPpFqf" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -4228,7 +4229,7 @@
       </node>
       <node concept="3F0ifn" id="7lt0LtPpFqj" role="3EZMnx">
         <property role="3F0ifm" value="&gt;" />
-        <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
         <node concept="11L4FC" id="7lt0LtPpFqk" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -4390,37 +4391,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="7lt0LtQg3vn">
-    <ref role="1XX52x" to="wq2x:7lt0LtQg3tE" resolve="ConstantExpressionItem" />
-    <node concept="3EZMnI" id="7lt0LtQg3vp" role="2wV5jI">
-      <node concept="3EZMnI" id="7lt0LtQg3vq" role="3EZMnx">
-        <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
-        <node concept="VPM3Z" id="7lt0LtQg3vr" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3vyZuw" id="7lt0LtQg3vs" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="1Bsynf" id="7lt0LtQg3vt" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="7lt0LtQg3vu" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3F1sOY" id="7lt0LtQg3vy" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:7lt0LtQg3vl" resolve="code" />
-          <node concept="11L4FC" id="7lt0LtQg3vz" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="11LMrY" id="7lt0LtQg3v$" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="l2Vlx" id="7lt0LtQg3vC" role="2iSdaV" />
-      </node>
-      <node concept="l2Vlx" id="7lt0LtQg3vD" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="oI9Yrc9_k">
     <ref role="1XX52x" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
     <node concept="3EZMnI" id="oI9Yrc9BJ" role="2wV5jI">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index e535ade6..40a92cb7 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -322,7 +322,7 @@
             <node concept="2ShNRf" id="4sSe4$p4xmN" role="37vLTx">
               <node concept="3zrR0B" id="4sSe4$p4xmL" role="2ShVmc">
                 <node concept="3Tqbb2" id="4sSe4$p4xmM" role="3zrR0E">
-                  <ref role="ehGHo" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+                  <ref role="ehGHo" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
                 </node>
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 35717908..32236471 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -27,10 +27,8 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="tluy" ref="r:f64e5caa-8a67-46ab-9011-edcf818c4d24(jetbrains.mps.dataform.behavior)" />
     <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="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
   </imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index bcea62eb..198fbce6 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -11,7 +11,6 @@
     <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="dff3" ref="r:575429ab-72f6-4385-a61f-a1f1f27e3490(jetbrains.mps.dataform.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -901,8 +900,9 @@
   </node>
   <node concept="1TIwiD" id="5WBVN_MT8FC">
     <property role="EcuMT" value="6856711987714624232" />
-    <property role="TrG5h" value="ExpressionItem" />
-    <property role="34LRSv" value="expression" />
+    <property role="TrG5h" value="LateExpressionItem" />
+    <property role="34LRSv" value="lateExpression" />
+    <property role="3GE5qa" value="logical" />
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MT8FD" role="1TKVEi">
       <property role="IQ2ns" value="6856711987714624233" />
@@ -1086,19 +1086,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7lt0LtQg3tE">
-    <property role="EcuMT" value="8456919074574710634" />
-    <property role="TrG5h" value="ConstantExpressionItem" />
-    <property role="34LRSv" value="constant" />
-    <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="7lt0LtQg3vl" role="1TKVEi">
-      <property role="IQ2ns" value="8456919074574710741" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="oI9Yrc9wC">
     <property role="EcuMT" value="6958395084019752" />
     <property role="TrG5h" value="SNodeSetTypeOperation" />
@@ -1153,7 +1140,7 @@
     <property role="TrG5h" value="PatternLogicalVariable" />
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="PrWs8" id="JOGAOsIT9E" role="PzmwI">
-      <ref role="PrY4T" to="dff3:JOGAOsIRhm" resolve="Capture" />
+      <ref role="PrY4T" to="5j4j:JOGAOsIRhm" resolve="Capture" />
     </node>
     <node concept="1TJgyj" id="4sSe4$p4oON" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 25858109..faa596e4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -1360,6 +1360,7 @@
   </node>
   <node concept="1YbPZF" id="5WBVN_MT9on">
     <property role="TrG5h" value="typeof_ExpressionItem" />
+    <property role="3GE5qa" value="logical" />
     <node concept="3clFbS" id="5WBVN_MT9oo" role="18ibNy">
       <node concept="nvevp" id="5WBVN_MT9sa" role="3cqZAp">
         <node concept="3clFbS" id="5WBVN_MT9sc" role="nvhr_">
@@ -1412,7 +1413,7 @@
     </node>
     <node concept="1YaCAy" id="5WBVN_MT9oq" role="1YuTPh">
       <property role="TrG5h" value="ei" />
-      <ref role="1YaFvo" to="wq2x:5WBVN_MT8FC" resolve="ExpressionItem" />
+      <ref role="1YaFvo" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
     </node>
   </node>
   <node concept="1YbPZF" id="36tQV5BDmjN">
@@ -1445,63 +1446,6 @@
       <ref role="1YaFvo" to="wq2x:36tQV5BDmft" resolve="RequireStatement" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7lt0LtQg3Cb">
-    <property role="TrG5h" value="typeof_ConstantExpressionItem" />
-    <node concept="3clFbS" id="7lt0LtQg3Cc" role="18ibNy">
-      <node concept="nvevp" id="7lt0LtQg3Hj" role="3cqZAp">
-        <node concept="3clFbS" id="7lt0LtQg3Hk" role="nvhr_">
-          <node concept="1Z5TYs" id="7lt0LtQg3Hl" role="3cqZAp">
-            <node concept="mw_s8" id="7lt0LtQg3Hm" role="1ZfhKB">
-              <node concept="2pJPEk" id="7lt0LtQg3Hn" role="mwGJk">
-                <node concept="2pJPED" id="7lt0LtQg3Ho" role="2pJPEn">
-                  <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-                  <node concept="2pIpSj" id="7lt0LtQg3Hp" role="2pJxcM">
-                    <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="7lt0LtQg3Hq" role="2pJxcZ">
-                      <node concept="1PxgMI" id="7lt0LtQg3Hr" role="36biLW">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="7lt0LtQg3Hs" role="3oSUPX">
-                          <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
-                        </node>
-                        <node concept="2X3wrD" id="7lt0LtQg3Ht" role="1m5AlR">
-                          <ref role="2X3Bk0" node="7lt0LtQg3H_" resolve="codeType" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="mw_s8" id="7lt0LtQg3Hu" role="1ZfhK$">
-              <node concept="1Z2H0r" id="7lt0LtQg3Hv" role="mwGJk">
-                <node concept="1YBJjd" id="7lt0LtQg3Hw" role="1Z2MuG">
-                  <ref role="1YBMHb" node="7lt0LtQg3Ce" resolve="cei" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Z2H0r" id="7lt0LtQg3Hx" role="nvjzm">
-          <node concept="2OqwBi" id="7lt0LtQg3Hy" role="1Z2MuG">
-            <node concept="1YBJjd" id="7lt0LtQg3Hz" role="2Oq$k0">
-              <ref role="1YBMHb" node="7lt0LtQg3Ce" resolve="cei" />
-            </node>
-            <node concept="3TrEf2" id="7lt0LtQg3H$" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:7lt0LtQg3vl" resolve="code" />
-            </node>
-          </node>
-        </node>
-        <node concept="2X1qdy" id="7lt0LtQg3H_" role="2X0Ygz">
-          <property role="TrG5h" value="codeType" />
-          <node concept="2jxLKc" id="7lt0LtQg3HA" role="1tU5fm" />
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7lt0LtQg3Ce" role="1YuTPh">
-      <property role="TrG5h" value="cei" />
-      <ref role="1YaFvo" to="wq2x:7lt0LtQg3tE" resolve="ConstantExpressionItem" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="oI9Yrc9SS">
     <property role="TrG5h" value="typeof_SNodeAssignTypeOperation" />
     <node concept="3clFbS" id="oI9Yrc9ST" role="18ibNy">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 89e6ff9e..f9009eb3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -17,17 +17,16 @@
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
-    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
@@ -36,7 +35,7 @@
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="c6va" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.languageScope(MPS.Core/)" />
     <import index="gp7a" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.dependency(MPS.Core/)" />
@@ -773,7 +772,7 @@
       <node concept="37vLTG" id="24Vro6cQKgF" role="3clF46">
         <property role="TrG5h" value="tracer" />
         <node concept="3uibUv" id="qubcdtxFI2" role="1tU5fm">
-          <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+          <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
         </node>
       </node>
       <node concept="3clFbS" id="41ox5VnkgxM" role="3clF47">
@@ -984,7 +983,7 @@
                       <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                     </node>
                     <node concept="liA8E" id="5cnt3vhfbzQ" role="2OqNvi">
-                      <ref role="37wK5l" to="yg8f:5cnt3vhfW9c" resolve="restored" />
+                      <ref role="37wK5l" to="7n8k:5cnt3vhfW9c" resolve="restored" />
                       <node concept="37vLTw" id="5cnt3vhfbAG" role="37wK5m">
                         <ref role="3cqZAo" node="5cnt3vheYOP" resolve="occ" />
                       </node>
@@ -1207,7 +1206,7 @@
                               <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                             </node>
                             <node concept="liA8E" id="4F3SXIF5J_x" role="2OqNvi">
-                              <ref role="37wK5l" to="yg8f:18cJbc1jRnT" resolve="info" />
+                              <ref role="37wK5l" to="7n8k:18cJbc1jRnT" resolve="info" />
                               <node concept="3cpWs3" id="4F3SXIF5J_D" role="37wK5m">
                                 <node concept="37vLTw" id="4ZcizIatSHV" role="3uHU7w">
                                   <ref role="3cqZAo" node="4ZcizIatPiJ" resolve="s" />
@@ -1366,7 +1365,7 @@
                           <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                         </node>
                         <node concept="liA8E" id="7nkyKX7hbcb" role="2OqNvi">
-                          <ref role="37wK5l" to="yg8f:7nkyKX7gU0T" resolve="result" />
+                          <ref role="37wK5l" to="7n8k:7nkyKX7gU0T" resolve="result" />
                           <node concept="37vLTw" id="5mr7UHcctZW" role="37wK5m">
                             <ref role="3cqZAo" node="5mr7UHccsMI" resolve="co" />
                           </node>
@@ -1383,7 +1382,7 @@
                             <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                           </node>
                           <node concept="liA8E" id="7nkyKX7hbpz" role="2OqNvi">
-                            <ref role="37wK5l" to="yg8f:7nkyKX7gU3L" resolve="garbage" />
+                            <ref role="37wK5l" to="7n8k:7nkyKX7gU3L" resolve="garbage" />
                             <node concept="37vLTw" id="5mr7UHccu7a" role="37wK5m">
                               <ref role="3cqZAo" node="5mr7UHccsMI" resolve="co" />
                             </node>
@@ -4425,7 +4424,7 @@
                 <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
               </node>
               <node concept="3uibUv" id="1HWyn8jvx1M" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
             </node>
             <node concept="9aQIb" id="1HWyn8jvsQP" role="9aQIa">
@@ -4462,7 +4461,7 @@
                             <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
                           </node>
                           <node concept="3uibUv" id="1HWyn8jvsPU" role="10QFUM">
-                            <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                            <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
                           </node>
                         </node>
                       </node>
@@ -4560,7 +4559,7 @@
                     <node concept="3cpWs6" id="1HWyn8jvsQM" role="3cqZAp">
                       <node concept="2ShNRf" id="1HWyn8jvzyn" role="3cqZAk">
                         <node concept="1pGfFk" id="1HWyn8jvzA9" role="2ShVmc">
-                          <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                          <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                           <node concept="37vLTw" id="1HWyn8jvzAa" role="37wK5m">
                             <ref role="3cqZAo" node="1HWyn8jvsQq" resolve="logicalCopy" />
                           </node>
@@ -10110,8 +10109,8 @@
                       <node concept="37vLTw" id="NKt6ynosn6" role="2Oq$k0">
                         <ref role="3cqZAo" node="NKt6ynosmK" resolve="v" />
                       </node>
-                      <node concept="2OwXpG" id="NKt6ynosn7" role="2OqNvi">
-                        <ref role="2Oxat5" to="fqlx:NKt6ynospK" resolve="extended" />
+                      <node concept="2OwXpG" id="74q$MmS0bJ6" role="2OqNvi">
+                        <ref role="2Oxat5" node="2$$Q_FeUozA" resolve="extended" />
                       </node>
                     </node>
                   </node>
@@ -11080,7 +11079,7 @@
                 </node>
                 <node concept="2ShNRf" id="3pMFS1zlzeG" role="37vLTx">
                   <node concept="1pGfFk" id="3pMFS1zlzG9" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                     <node concept="10QFUN" id="3pMFS1zlzWI" role="37wK5m">
                       <node concept="3uibUv" id="3pMFS1zlzWF" role="10QFUM">
                         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
@@ -11461,7 +11460,7 @@
                         <ref role="3cqZAo" node="3pMFS1zeegA" resolve="tf" />
                       </node>
                       <node concept="3uibUv" id="3pMFS1zdqoQ" role="2ZW6by">
-                        <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                        <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
                       </node>
                     </node>
                     <node concept="9aQIb" id="3pMFS1zdqoR" role="9aQIa">
@@ -11490,7 +11489,7 @@
                       <node concept="3cpWs6" id="3pMFS1zeyhu" role="3cqZAp">
                         <node concept="2ShNRf" id="3pMFS1zeyhv" role="3cqZAk">
                           <node concept="1pGfFk" id="3pMFS1zeyhw" role="2ShVmc">
-                            <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                            <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                             <node concept="2OqwBi" id="3pMFS1zez0W" role="37wK5m">
                               <node concept="1eOMI4" id="3pMFS1zez0X" role="2Oq$k0">
                                 <node concept="10QFUN" id="3pMFS1zez0Y" role="1eOMHV">
@@ -11498,7 +11497,7 @@
                                     <ref role="3cqZAo" node="3pMFS1zeegA" resolve="tf" />
                                   </node>
                                   <node concept="3uibUv" id="3pMFS1zez10" role="10QFUM">
-                                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
                                   </node>
                                 </node>
                               </node>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 15a3bb79..40bf7db6 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -9,31 +9,57 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <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="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
+    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
+    <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <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" />
       </concept>
+      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </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="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -41,28 +67,57 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -74,9 +129,19 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+        <child id="1107880067339" name="method" index="3MN40a" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </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="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
@@ -97,6 +162,7 @@
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
         <child id="7473026166162327259" name="dropAttrubuteRule" index="CYSdJ" />
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
+        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
       </concept>
       <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
         <child id="1177093586806" name="templateNode" index="gfFT$" />
@@ -108,11 +174,17 @@
         <child id="1168558750579" name="defaultConsequence" index="jxRDz" />
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
+      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
+        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
+      </concept>
       <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
       <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
         <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
         <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
       </concept>
+      <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
+        <reference id="5005282049925926522" name="parameter" index="v3LJV" />
+      </concept>
       <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
         <reference id="1722980698497626483" name="template" index="v9R2y" />
         <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
@@ -124,6 +196,7 @@
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
+        <reference id="1200917515464" name="labelDeclaration" index="2sgKRv" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
@@ -142,9 +215,15 @@
       <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
+      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
+        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
+      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
+        <reference id="1167514355421" name="template" index="3lhOvi" />
+      </concept>
       <concept id="1169670156577" name="jetbrains.mps.lang.generator.structure.GeneratorMessage" flags="lg" index="1lLz0L">
         <property id="1169670173015" name="messageText" index="1lLB17" />
         <property id="1169670356567" name="messageType" index="1lMjX7" />
@@ -165,6 +244,9 @@
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
       <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
+        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
+      </concept>
       <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
@@ -201,6 +283,48 @@
         <child id="1174642936809" name="pattern" index="1YbcFS" />
       </concept>
     </language>
+    <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
+      <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
+        <child id="238586457668550958" name="expression" index="22Ky0K" />
+      </concept>
+      <concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
+        <child id="2105510410850136264" name="contents" index="KCVpo" />
+      </concept>
+      <concept id="6694277639409954681" name="jetbrains.mps.logic.structure.ListRole" flags="ng" index="38e3lM">
+        <child id="6694277639409954746" name="list" index="38e3mL" />
+      </concept>
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
+        <child id="7571593955706125526" name="root" index="1oi0x0" />
+      </concept>
+      <concept id="7571593955706137263" name="jetbrains.mps.logic.structure.ChildRole" flags="ng" index="1oi5ST">
+        <child id="7571593955706137319" name="contents" index="1oi5TL" />
+      </concept>
+      <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN">
+        <child id="7571593955706284441" name="role" index="1ojpOf" />
+      </concept>
+      <concept id="7571593955706137472" name="jetbrains.mps.logic.structure.ValueRole" flags="ng" index="1oi5Wm">
+        <child id="7571593955706137672" name="contents" index="1oi5zu" />
+      </concept>
+      <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
+        <property id="7571593955706137638" name="value" index="1oi5yK" />
+      </concept>
+    </language>
+    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
+      <concept id="1173996401517" name="jetbrains.mps.baseLanguageInternal.structure.InternalNewExpression" flags="nn" index="1nCR9W">
+        <property id="1173996588177" name="fqClassName" index="1nD$Q0" />
+        <child id="1179332974947" name="type" index="2lIhxL" />
+        <child id="319021450862590135" name="actualArgument" index="2U2pNA" />
+      </concept>
+      <concept id="3421461530438559752" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClassCreator" flags="nn" index="1L3L4E">
+        <child id="3421461530438560031" name="cls" index="1L3L0X" />
+      </concept>
+      <concept id="3421461530438559753" name="jetbrains.mps.baseLanguageInternal.structure.InternalAnonymousClass" flags="ig" index="1L3L4F">
+        <property id="3421461530438559973" name="fqClassName" index="1L3L77" />
+        <child id="3421461530438559756" name="constructorArgument" index="1L3L4I" />
+        <child id="3421461530438559974" name="type" index="1L3L74" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -208,6 +332,7 @@
       <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="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" />
@@ -227,7 +352,9 @@
       <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" />
+      <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>
@@ -273,6 +400,7 @@
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
       <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" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
@@ -280,38 +408,53 @@
     <property role="TrG5h" value="ast" />
     <property role="3GE5qa" value="" />
     <node concept="3aamgX" id="28ktUhrk7Yi" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:28ktUhrjnwn" resolve="ValueOfLogicalExpression" />
-      <node concept="gft3U" id="28ktUhrkb$K" role="1lVwrX">
-        <node concept="2OqwBi" id="28ktUhrkeJN" role="gfFT$">
-          <node concept="2OqwBi" id="28ktUhrke9D" role="2Oq$k0">
-            <node concept="liA8E" id="28ktUhrkepZ" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+      <ref role="30HIoZ" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
+      <node concept="1Koe21" id="74q$MmSc8Yd" role="1lVwrX">
+        <node concept="3clFbS" id="74q$MmSc8Yj" role="1Koe22">
+          <node concept="3cpWs8" id="74q$MmSc8Yq" role="3cqZAp">
+            <node concept="3cpWsn" id="74q$MmSc8Yr" role="3cpWs9">
+              <property role="TrG5h" value="logical" />
+              <node concept="3uibUv" id="74q$MmSc8Ys" role="1tU5fm">
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+              </node>
             </node>
-            <node concept="10Nm6u" id="28ktUhrkcqu" role="2Oq$k0">
-              <node concept="29HgVG" id="28ktUhrkcr3" role="lGtFl">
-                <node concept="3NFfHV" id="28ktUhrkcrm" role="3NFExx">
-                  <node concept="3clFbS" id="28ktUhrkcrn" role="2VODD2">
-                    <node concept="3clFbF" id="28ktUhrkcuW" role="3cqZAp">
-                      <node concept="2OqwBi" id="28ktUhrkcDh" role="3clFbG">
-                        <node concept="30H73N" id="28ktUhrkcuV" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="28ktUhrkcTB" role="2OqNvi">
-                          <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
+          </node>
+          <node concept="3clFbF" id="74q$MmSc8YE" role="3cqZAp">
+            <node concept="2OqwBi" id="28ktUhrkeJN" role="3clFbG">
+              <node concept="2OqwBi" id="28ktUhrke9D" role="2Oq$k0">
+                <node concept="liA8E" id="28ktUhrkepZ" role="2OqNvi">
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                </node>
+                <node concept="37vLTw" id="74q$MmSc9e2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="74q$MmSc8Yr" resolve="logical" />
+                  <node concept="29HgVG" id="74q$MmSc9hU" role="lGtFl">
+                    <node concept="3NFfHV" id="74q$MmSc9iR" role="3NFExx">
+                      <node concept="3clFbS" id="74q$MmSc9iS" role="2VODD2">
+                        <node concept="3clFbF" id="74q$MmSc9nb" role="3cqZAp">
+                          <node concept="2OqwBi" id="74q$MmSc9wV" role="3clFbG">
+                            <node concept="30H73N" id="74q$MmSc9na" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="74q$MmScaPT" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="28ktUhrkfqr" role="2OqNvi">
+                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+              </node>
+              <node concept="raruj" id="74q$MmSc9gY" role="lGtFl" />
             </node>
           </node>
-          <node concept="liA8E" id="28ktUhrkfqr" role="2OqNvi">
-            <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
-          </node>
+          <node concept="3clFbH" id="74q$MmSc8Y_" role="3cqZAp" />
         </node>
       </node>
     </node>
     <node concept="3aamgX" id="1pt0VTMwlBi" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
+      <ref role="30HIoZ" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
       <node concept="gft3U" id="5WBVN_MEXNj" role="1lVwrX">
         <node concept="1eOMI4" id="5WBVN_MEXPm" role="gfFT$">
           <node concept="10Nm6u" id="5WBVN_MEXPn" role="1eOMHV">
@@ -334,7 +477,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="5WBVN_METeG" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:5WBVN_MESCN" resolve="TreeFormLiteral" />
+      <ref role="30HIoZ" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
       <node concept="gft3U" id="5WBVN_MEYWj" role="1lVwrX">
         <node concept="1eOMI4" id="5WBVN_MEYWk" role="gfFT$">
           <node concept="10Nm6u" id="5WBVN_MEYWl" role="1eOMHV">
@@ -378,7 +521,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="49obaclcRBA" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+      <ref role="30HIoZ" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
       <node concept="gft3U" id="49obacld2yF" role="1lVwrX">
         <node concept="10Nm6u" id="49obacld2yL" role="gfFT$">
           <node concept="29HgVG" id="49obacld2yV" role="lGtFl">
@@ -444,7 +587,7 @@
                     <node concept="2Xjw5R" id="1aeprBOt5n8" role="2OqNvi">
                       <node concept="1xMEDy" id="1aeprBOt5na" role="1xVPHs">
                         <node concept="chp4Y" id="1aeprBOt5tR" role="ri$Ld">
-                          <ref role="cht4Q" to="5j4j:6$jH9oLmYD_" resolve="Role" />
+                          <ref role="cht4Q" to="5j4j:6$jH9oLmYD_" resolve="RoleNode" />
                         </node>
                       </node>
                     </node>
@@ -459,9 +602,9 @@
             </node>
           </node>
           <node concept="gft3U" id="4OKkcneWb1C" role="150oIE">
-            <node concept="2YIFZM" id="7HUwyZbd5nK" role="gfFT$">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bg" role="gfFT$">
+              <ref role="37wK5l" to="7n8k:7HUwyZb7chj" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
                 <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
                   <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
@@ -474,9 +617,9 @@
           </node>
         </node>
         <node concept="gft3U" id="4OKkcneWczK" role="14YRTM">
-          <node concept="2YIFZM" id="7HUwyZbd5Au" role="gfFT$">
-            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asVariable" />
-            <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+          <node concept="2YIFZM" id="74q$MmRB2bf" role="gfFT$">
+            <ref role="37wK5l" to="7n8k:7HUwyZb7chj" resolve="asVariable" />
+            <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
                 <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
@@ -491,7 +634,7 @@
     </node>
     <node concept="3aamgX" id="4lNgnaL7Fky" role="3acgRq">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+      <ref role="30HIoZ" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
       <node concept="30G5F_" id="4lNgnaL7FI9" role="30HLyM">
         <node concept="3clFbS" id="4lNgnaL7FIa" role="2VODD2">
           <node concept="3clFbF" id="4lNgnaL7FJf" role="3cqZAp">
@@ -562,11 +705,11 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
-          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
           <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
           <node concept="2YIFZM" id="6YPNC4NIgLX" role="37wK5m">
             <ref role="37wK5l" to="6exd:6YPNC4NI311" resolve="symbol" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
             <node concept="3cmrfG" id="6YPNC4NIi1X" role="37wK5m">
               <property role="3cmrfH" value="0" />
               <node concept="17Uvod" id="6YPNC4NIiDD" role="lGtFl">
@@ -785,7 +928,7 @@
                   </node>
                   <node concept="1mIQ4w" id="6YPNC4OUy0L" role="2OqNvi">
                     <node concept="chp4Y" id="6YPNC4OUycn" role="cj9EA">
-                      <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                      <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
                     </node>
                   </node>
                 </node>
@@ -996,7 +1139,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="1OShD0HSv5l" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
+      <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
           <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
@@ -1043,7 +1186,8 @@
   </node>
   <node concept="13MO4I" id="35Lj3TiT1Wl">
     <property role="TrG5h" value="Ast_Builder" />
-    <ref role="3gUMe" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
+    <property role="3GE5qa" value="dataform.expression" />
+    <ref role="3gUMe" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
     <node concept="1eOMI4" id="6r6omRldwEj" role="13RCb5">
       <node concept="10Nm6u" id="4peSo3CLCDx" role="1eOMHV">
         <node concept="29HgVG" id="4peSo3CLCDy" role="lGtFl">
@@ -1164,13 +1308,34 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="7lt0LtQg4bJ" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
+      <node concept="gft3U" id="7lt0LtQgaVg" role="1lVwrX">
+        <node concept="10Nm6u" id="7lt0LtQgaVh" role="gfFT$">
+          <node concept="29HgVG" id="7lt0LtQgaVi" role="lGtFl">
+            <node concept="3NFfHV" id="7lt0LtQgaVj" role="3NFExx">
+              <node concept="3clFbS" id="7lt0LtQgaVk" role="2VODD2">
+                <node concept="3clFbF" id="7lt0LtQgaVl" role="3cqZAp">
+                  <node concept="2OqwBi" id="7lt0LtQgaVm" role="3clFbG">
+                    <node concept="3TrEf2" id="7lt0LtQgaVn" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:7lt0LtQg3vl" resolve="code" />
+                    </node>
+                    <node concept="30H73N" id="7lt0LtQgaVo" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="jVnub" id="677NV56thjr">
     <property role="TrG5h" value="Expression_logical2treeform" />
     <node concept="1N15co" id="7FFmDVALe4e" role="1s_3oS">
-      <property role="TrG5h" value="treeForm" />
+      <property role="TrG5h" value="dataForm" />
       <node concept="3Tqbb2" id="7FFmDVALe9X" role="1N15GL">
-        <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+        <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
       </node>
     </node>
     <node concept="1N15co" id="kTK1Bfl$Pa" role="1s_3oS">
@@ -1191,9 +1356,9 @@
             </node>
           </node>
           <node concept="3clFbF" id="677NV56tBWA" role="3cqZAp">
-            <node concept="2YIFZM" id="7HUwyZb7btr" role="3clFbG">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7b7C" resolve="asVariableArray" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bd" role="3clFbG">
+              <ref role="37wK5l" to="7n8k:7HUwyZb7b7C" resolve="asVariableArray" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="37vLTw" id="7HUwyZb7bts" role="37wK5m">
                 <ref role="3cqZAo" node="677NV56tBWz" resolve="mlp" />
                 <node concept="29HgVG" id="7HUwyZb7btt" role="lGtFl">
@@ -1206,7 +1371,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7HUwyZb7bty" role="lGtFl" />
+              <node concept="raruj" id="74q$MmSc8cm" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -1251,14 +1416,14 @@
             </node>
           </node>
           <node concept="3clFbF" id="7HUwyZb7cpf" role="3cqZAp">
-            <node concept="2YIFZM" id="7HUwyZb7cuU" role="3clFbG">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bi" role="3clFbG">
+              <ref role="37wK5l" to="7n8k:7HUwyZb7chj" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="37vLTw" id="7HUwyZb7cvj" role="37wK5m">
                 <ref role="3cqZAo" node="677NV56tAlm" resolve="logical" />
                 <node concept="29HgVG" id="7HUwyZb7cBP" role="lGtFl" />
               </node>
-              <node concept="raruj" id="7HUwyZb7cBm" role="lGtFl" />
+              <node concept="raruj" id="74q$MmSc8gy" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -1328,14 +1493,14 @@
             </node>
           </node>
           <node concept="3clFbF" id="514BAS_YBDx" role="3cqZAp">
-            <node concept="2YIFZM" id="514BAS_YBDy" role="3clFbG">
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
+            <node concept="2YIFZM" id="74q$MmRB2bm" role="3clFbG">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="37vLTw" id="514BAS_YBDz" role="37wK5m">
                 <ref role="3cqZAo" node="514BAS_YBDv" resolve="logical" />
                 <node concept="29HgVG" id="514BAS_YBD$" role="lGtFl" />
               </node>
-              <node concept="raruj" id="514BAS_YBD_" role="lGtFl" />
+              <node concept="raruj" id="74q$MmSc8gQ" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -1435,7 +1600,7 @@
               <node concept="2OqwBi" id="kTK1Bf2KuT" role="2Oq$k0">
                 <node concept="1iwH7S" id="kTK1Bf2KuU" role="2Oq$k0" />
                 <node concept="3cR$yn" id="kTK1Bf2KuV" role="2OqNvi">
-                  <ref role="3cRzXn" node="7FFmDVALe4e" resolve="treeForm" />
+                  <ref role="3cRzXn" node="7FFmDVALe4e" resolve="dataForm" />
                 </node>
               </node>
               <node concept="1mIQ4w" id="kTK1Bf2KuW" role="2OqNvi">
@@ -1704,5 +1869,1190 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="JOGAOsG6LJ">
+    <property role="TrG5h" value="_DataFormTable" />
+    <property role="3GE5qa" value="dataform.constructor" />
+    <node concept="2tJIrI" id="JOGAOsG6Ml" role="jymVt" />
+    <node concept="312cEu" id="5hSMZ_lNZg9" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="_DataForm" />
+      <node concept="2tJIrI" id="5hSMZ_lNZga" role="jymVt" />
+      <node concept="3clFbW" id="5hSMZ_lNZgb" role="jymVt">
+        <node concept="37vLTG" id="5hSMZ_lNZgc" role="3clF46">
+          <property role="TrG5h" value="pattern" />
+          <node concept="10P_77" id="5hSMZ_lNZgd" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="5hSMZ_lNZgu" role="3clF45" />
+        <node concept="3Tm1VV" id="5hSMZ_lNZgv" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZgw" role="3clF47">
+          <node concept="3clFbF" id="5hSMZ_lNZgx" role="3cqZAp">
+            <node concept="37vLTI" id="5hSMZ_lNZgy" role="3clFbG">
+              <node concept="37vLTw" id="5hSMZ_lNZgz" role="37vLTx">
+                <ref role="3cqZAo" node="5hSMZ_lNZgc" resolve="pattern" />
+              </node>
+              <node concept="2OqwBi" id="5hSMZ_lNZg$" role="37vLTJ">
+                <node concept="Xjq3P" id="5hSMZ_lNZg_" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5hSMZ_lNZgA" role="2OqNvi">
+                  <ref role="2Oxat5" node="5hSMZ_lNZgX" resolve="pattern" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7c96q9tN0Kt" role="jymVt" />
+      <node concept="3clFb_" id="5hSMZ_lNZhp" role="jymVt">
+        <property role="TrG5h" value="feature" />
+        <node concept="3uibUv" id="5hSMZ_lNZhq" role="3clF45">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        </node>
+        <node concept="3Tm1VV" id="7c96q9tN7xJ" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZhs" role="3clF47">
+          <node concept="3clFbJ" id="5hSMZ_lNZht" role="3cqZAp">
+            <node concept="37vLTw" id="5hSMZ_lNZhz" role="3clFbw">
+              <ref role="3cqZAo" node="5hSMZ_lNZgX" resolve="pattern" />
+            </node>
+            <node concept="3clFbS" id="5hSMZ_lNZhu" role="3clFbx">
+              <node concept="3cpWs6" id="5hSMZ_lNZhv" role="3cqZAp">
+                <node concept="10Nm6u" id="5hSMZ_lNZhw" role="3cqZAk">
+                  <node concept="1sPUBX" id="5hSMZ_lNZhx" role="lGtFl">
+                    <ref role="v9R2y" node="JOGAOsGlpT" resolve="dataform_pattern" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5hSMZ_lNZhy" role="3cqZAp" />
+            </node>
+            <node concept="9aQIb" id="5hSMZ_lNZh$" role="9aQIa">
+              <node concept="3clFbS" id="5hSMZ_lNZh_" role="9aQI4">
+                <node concept="3cpWs6" id="5hSMZ_lNZhA" role="3cqZAp">
+                  <node concept="10Nm6u" id="5hSMZ_lNZhB" role="3cqZAk">
+                    <node concept="1sPUBX" id="5hSMZ_lNZhC" role="lGtFl">
+                      <ref role="v9R2y" node="1L74NXFa1BL" resolve="dataform_getter" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1WS0z7" id="5hSMZ_lNZhD" role="lGtFl">
+          <ref role="2rW$FS" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+          <node concept="3JmXsc" id="5hSMZ_lNZhE" role="3Jn$fo">
+            <node concept="3clFbS" id="5hSMZ_lNZhF" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhG" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhH" role="3clFbG">
+                  <node concept="3Tsc0h" id="JOGAOsGeIA" role="2OqNvi">
+                    <ref role="3TtcxE" to="5j4j: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" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="17Uvod" id="5hSMZ_lNZhM" role="lGtFl">
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <property role="2qtEX9" value="name" />
+          <node concept="3zFVjK" id="5hSMZ_lNZhN" role="3zH0cK">
+            <node concept="3clFbS" id="5hSMZ_lNZhO" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_lNZhP" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_lNZhQ" role="3clFbG">
+                  <node concept="30H73N" id="5hSMZ_lNZhR" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5hSMZ_lNZhS" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5hSMZ_lNZhT" role="jymVt" />
+      <node concept="3clFb_" id="5hSMZ_lNZhU" role="jymVt">
+        <property role="TrG5h" value="getTerm" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="3uibUv" id="5hSMZ_lNZhV" role="3clF45">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        </node>
+        <node concept="3Tm1VV" id="5hSMZ_lNZhW" role="1B3o_S" />
+        <node concept="3clFbS" id="5hSMZ_lNZhX" role="3clF47">
+          <node concept="3cpWs6" id="5hSMZ_lNZhY" role="3cqZAp">
+            <node concept="1oi1Uc" id="5hSMZ_lNZhZ" role="3cqZAk">
+              <node concept="1oi5UN" id="5hSMZ_lNZi0" role="1oi0x0">
+                <node concept="1oi5Wm" id="7c96q9twtFA" role="1ojpOf">
+                  <property role="TrG5h" value="_term" />
+                  <node concept="1oi5XN" id="7c96q9twuu3" role="1oi5zu">
+                    <property role="1oi5yK" value="symbol" />
+                    <node concept="17Uvod" id="7c96q9twv9A" role="lGtFl">
+                      <property role="P4ACc" value="35320f26-77cb-4c55-be9f-a97a27770af1/7571593955706137573/7571593955706137638" />
+                      <property role="2qtEX9" value="value" />
+                      <node concept="3zFVjK" id="7c96q9twv9D" role="3zH0cK">
+                        <node concept="3clFbS" id="7c96q9twv9E" role="2VODD2">
+                          <node concept="3clFbF" id="7c96q9twv9K" role="3cqZAp">
+                            <node concept="2OqwBi" id="7c96q9twv9F" role="3clFbG">
+                              <node concept="2qgKlT" id="7c96q9t$RYJ" role="2OqNvi">
+                                <ref role="37wK5l" to="ha02:7c96q9t$Nk0" resolve="symbol" />
+                              </node>
+                              <node concept="30H73N" id="7c96q9twv9J" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1oi5Wm" id="5hSMZ_lNZi1" role="1ojpOf">
+                  <property role="TrG5h" value="name" />
+                  <node concept="1WS0z7" id="5hSMZ_lNZi2" role="lGtFl">
+                    <node concept="3JmXsc" id="5hSMZ_lNZi3" role="3Jn$fo">
+                      <node concept="3clFbS" id="5hSMZ_lNZi4" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_lNZi5" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_lNZi7" role="3clFbG">
+                            <node concept="30H73N" id="5hSMZ_lNZi8" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="7c96q9tG5wV" role="2OqNvi">
+                              <ref role="37wK5l" to="ha02:7c96q9tALRr" resolve="valueFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="22Ky0T" id="5hSMZ_lNZib" role="lGtFl">
+                    <node concept="2OqwBi" id="5hSMZ_lNZic" role="22Ky0K">
+                      <node concept="Xjq3P" id="5hSMZ_lNZid" role="2Oq$k0">
+                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_DataFormTable._DataForm" />
+                      </node>
+                      <node concept="liA8E" id="5hSMZ_lNZie" role="2OqNvi">
+                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                        <node concept="1ZhdrF" id="5hSMZ_lNZif" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                          <node concept="3$xsQk" id="5hSMZ_lNZig" role="3$ytzL">
+                            <node concept="3clFbS" id="5hSMZ_lNZih" role="2VODD2">
+                              <node concept="3clFbF" id="5hSMZ_lNZii" role="3cqZAp">
+                                <node concept="2OqwBi" id="5hSMZ_lNZij" role="3clFbG">
+                                  <node concept="1iwH7S" id="5hSMZ_lNZik" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="5hSMZ_lNZil" role="2OqNvi">
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                    <node concept="30H73N" id="5hSMZ_lNZim" role="1iwH7V" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1oi5ST" id="5hSMZ_lNZin" role="1ojpOf">
+                  <property role="TrG5h" value="name" />
+                  <node concept="1WS0z7" id="5hSMZ_lNZio" role="lGtFl">
+                    <node concept="3JmXsc" id="5hSMZ_lNZip" role="3Jn$fo">
+                      <node concept="3clFbS" id="5hSMZ_lNZiq" role="2VODD2">
+                        <node concept="3clFbF" id="5hSMZ_lNZir" role="3cqZAp">
+                          <node concept="2OqwBi" id="5hSMZ_lNZit" role="3clFbG">
+                            <node concept="30H73N" id="5hSMZ_lNZiu" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="7c96q9tG6hO" role="2OqNvi">
+                              <ref role="37wK5l" to="ha02:7c96q9tCSX_" resolve="childFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="22Ky0T" id="5hSMZ_lNZix" role="lGtFl">
+                    <node concept="2OqwBi" id="5hSMZ_lNZiy" role="22Ky0K">
+                      <node concept="Xjq3P" id="5hSMZ_lNZiz" role="2Oq$k0">
+                        <ref role="1HBi2w" node="5hSMZ_lNZg9" resolve="_DataFormTable._DataForm" />
+                      </node>
+                      <node concept="liA8E" id="5hSMZ_lNZi$" role="2OqNvi">
+                        <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                        <node concept="1ZhdrF" id="5hSMZ_lNZi_" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                          <property role="2qtEX8" value="baseMethodDeclaration" />
+                          <node concept="3$xsQk" id="5hSMZ_lNZiA" role="3$ytzL">
+                            <node concept="3clFbS" id="5hSMZ_lNZiB" role="2VODD2">
+                              <node concept="3clFbF" id="5hSMZ_lNZiC" role="3cqZAp">
+                                <node concept="2OqwBi" id="5hSMZ_lNZiD" role="3clFbG">
+                                  <node concept="1iwH7S" id="5hSMZ_lNZiE" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="5hSMZ_lNZiF" role="2OqNvi">
+                                    <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                    <node concept="30H73N" id="5hSMZ_lNZiG" role="1iwH7V" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5hSMZ_lNZiH" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7c96q9tNeHh" role="jymVt" />
+      <node concept="312cEg" id="5hSMZ_lNZgX" role="jymVt">
+        <property role="TrG5h" value="pattern" />
+        <node concept="3Tm6S6" id="5hSMZ_lNZgY" role="1B3o_S" />
+        <node concept="10P_77" id="5hSMZ_lNZgZ" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="5hSMZ_lNZiI" role="1B3o_S" />
+      <node concept="raruj" id="5hSMZ_lNZiJ" role="lGtFl" />
+      <node concept="1WS0z7" id="5hSMZ_lNZiK" role="lGtFl">
+        <node concept="3JmXsc" id="5hSMZ_lNZiL" role="3Jn$fo">
+          <node concept="3clFbS" id="5hSMZ_lNZiM" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lNZiN" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lNZiO" role="3clFbG">
+                <node concept="30H73N" id="5hSMZ_lNZiP" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="JOGAOsG9cr" role="2OqNvi">
+                  <ref role="3TtcxE" to="5j4j:JOGAOsxaCx" resolve="contents" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5hSMZ_lNZiR" role="1zkMxy">
+        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+      </node>
+      <node concept="17Uvod" id="5hSMZ_lNZiS" role="lGtFl">
+        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+        <property role="2qtEX9" value="name" />
+        <node concept="3zFVjK" id="5hSMZ_lNZiT" role="3zH0cK">
+          <node concept="3clFbS" id="5hSMZ_lNZiU" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lNZiV" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lNZiW" role="3clFbG">
+                <node concept="30H73N" id="5hSMZ_lNZiX" role="2Oq$k0" />
+                <node concept="2qgKlT" id="5hSMZ_lNZiY" role="2OqNvi">
+                  <ref role="37wK5l" to="ha02:4MEOIDG83_h" resolve="runtimeClassName" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="JOGAOsG6Mn" role="jymVt" />
+    <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" />
+    </node>
+    <node concept="17Uvod" id="JOGAOt0ycr" role="lGtFl">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <property role="2qtEX9" value="name" />
+      <node concept="3zFVjK" id="JOGAOt0ycs" role="3zH0cK">
+        <node concept="3clFbS" id="JOGAOt0yct" role="2VODD2">
+          <node concept="3clFbF" id="JOGAOt0z9n" role="3cqZAp">
+            <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" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="3kjrYXAPkJB">
+    <property role="3GE5qa" value="" />
+    <property role="TrG5h" value="dataform_feature_override" />
+    <node concept="3aamgX" id="3kjrYXAPmgG" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <node concept="30G5F_" id="3kjrYXAPmwz" role="30HLyM">
+        <node concept="3clFbS" id="3kjrYXAPmw$" role="2VODD2">
+          <node concept="3clFbF" id="3kjrYXAPmBH" role="3cqZAp">
+            <node concept="2OqwBi" id="3kjrYXAPmPt" role="3clFbG">
+              <node concept="v3LJS" id="3kjrYXAPmBG" role="2Oq$k0">
+                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              </node>
+              <node concept="1mIQ4w" id="3kjrYXAPndi" role="2OqNvi">
+                <node concept="chp4Y" id="JOGAOsGIOM" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="3kjrYXAPnzY" role="1lVwrX">
+        <node concept="1oi5Wm" id="3kjrYXAPnzZ" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="17Uvod" id="3kjrYXAPn$0" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="3kjrYXAPn$1" role="3zH0cK">
+              <node concept="3clFbS" id="3kjrYXAPn$2" role="2VODD2">
+                <node concept="3clFbF" id="3kjrYXAPn$3" role="3cqZAp">
+                  <node concept="2OqwBi" id="3kjrYXAPn$4" role="3clFbG">
+                    <node concept="3TrcHB" id="3kjrYXAPn$5" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="v3LJS" id="3kjrYXAPotq" role="2Oq$k0">
+                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1oi5XN" id="3kjrYXAPn$7" role="1oi5zu">
+            <node concept="22Ky0T" id="3kjrYXAPn$8" role="lGtFl">
+              <node concept="10Nm6u" id="3kjrYXAPn$9" role="22Ky0K">
+                <node concept="29HgVG" id="3kjrYXAPn$a" role="lGtFl">
+                  <node concept="3NFfHV" id="3kjrYXAPn$b" role="3NFExx">
+                    <node concept="3clFbS" id="3kjrYXAPn$c" role="2VODD2">
+                      <node concept="3clFbF" id="3kjrYXAPn$d" role="3cqZAp">
+                        <node concept="v3LJS" id="3kjrYXAPn$e" role="3clFbG">
+                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="3kjrYXAPsCJ" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <node concept="30G5F_" id="3kjrYXAPsCK" role="30HLyM">
+        <node concept="3clFbS" id="3kjrYXAPsCL" role="2VODD2">
+          <node concept="3clFbF" id="3kjrYXAPsCM" role="3cqZAp">
+            <node concept="2OqwBi" id="3kjrYXAPsCN" role="3clFbG">
+              <node concept="v3LJS" id="3kjrYXAPsCO" role="2Oq$k0">
+                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              </node>
+              <node concept="1mIQ4w" id="3kjrYXAPsCP" role="2OqNvi">
+                <node concept="chp4Y" id="JOGAOsGJpk" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="3kjrYXAPulY" role="1lVwrX">
+        <node concept="1oi5ST" id="3kjrYXAPulZ" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="1oi5UN" id="3kjrYXAPum0" role="1oi5TL">
+            <node concept="22Ky0T" id="3kjrYXAPum1" role="lGtFl">
+              <node concept="10Nm6u" id="3kjrYXAPum2" role="22Ky0K">
+                <node concept="29HgVG" id="3kjrYXAPum3" role="lGtFl">
+                  <node concept="3NFfHV" id="3kjrYXAPum4" role="3NFExx">
+                    <node concept="3clFbS" id="3kjrYXAPum5" role="2VODD2">
+                      <node concept="3clFbF" id="3kjrYXAPum6" role="3cqZAp">
+                        <node concept="v3LJS" id="3kjrYXAPum7" role="3clFbG">
+                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="17Uvod" id="3kjrYXAPum8" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="3kjrYXAPum9" role="3zH0cK">
+              <node concept="3clFbS" id="3kjrYXAPuma" role="2VODD2">
+                <node concept="3clFbF" id="3kjrYXAPumb" role="3cqZAp">
+                  <node concept="2OqwBi" id="3kjrYXAPumc" role="3clFbG">
+                    <node concept="3TrcHB" id="3kjrYXAPumd" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="v3LJS" id="3kjrYXAPuXF" role="2Oq$k0">
+                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="3kjrYXAPvs1" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <node concept="30G5F_" id="3kjrYXAPvs2" role="30HLyM">
+        <node concept="3clFbS" id="3kjrYXAPvs3" role="2VODD2">
+          <node concept="3clFbF" id="3kjrYXAPvs4" role="3cqZAp">
+            <node concept="2OqwBi" id="3kjrYXAPvs5" role="3clFbG">
+              <node concept="v3LJS" id="3kjrYXAPvs6" role="2Oq$k0">
+                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              </node>
+              <node concept="1mIQ4w" id="3kjrYXAPvs7" role="2OqNvi">
+                <node concept="chp4Y" id="JOGAOsGJVV" role="cj9EA">
+                  <ref role="cht4Q" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="gft3U" id="3kjrYXAPx50" role="1lVwrX">
+        <node concept="38e3lM" id="428_4iYbsiL" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="KCUsM" id="3kjrYXAPx59" role="38e3mL">
+            <node concept="1oi5UN" id="3kjrYXAPx5a" role="KCVpo">
+              <node concept="22Ky0T" id="3kjrYXAPx5b" role="lGtFl">
+                <node concept="10Nm6u" id="3kjrYXAPx5c" role="22Ky0K">
+                  <node concept="29HgVG" id="3kjrYXAPx5d" role="lGtFl">
+                    <node concept="3NFfHV" id="3kjrYXAPx5e" role="3NFExx">
+                      <node concept="3clFbS" id="3kjrYXAPx5f" role="2VODD2">
+                        <node concept="3clFbF" id="3kjrYXAPx5g" role="3cqZAp">
+                          <node concept="v3LJS" id="3kjrYXAPx5h" role="3clFbG">
+                            <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="17Uvod" id="3kjrYXAPx52" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="3kjrYXAPx53" role="3zH0cK">
+              <node concept="3clFbS" id="3kjrYXAPx54" role="2VODD2">
+                <node concept="3clFbF" id="3kjrYXAPx55" role="3cqZAp">
+                  <node concept="2OqwBi" id="3kjrYXAPx56" role="3clFbG">
+                    <node concept="3TrcHB" id="3kjrYXAPx57" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="v3LJS" id="3kjrYXAPxtp" role="2Oq$k0">
+                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1N15co" id="3kjrYXAPkK6" role="1s_3oS">
+      <property role="TrG5h" value="getter" />
+      <node concept="3Tqbb2" id="3kjrYXAPkK7" role="1N15GL">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+    <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" />
+      </node>
+    </node>
+    <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
+      <node concept="1lLz0L" id="3kjrYXAPkLi" role="1lHHLF">
+        <property role="1lMjX7" value="error" />
+        <property role="1lLB17" value="invalid usage (type_term_feature)" />
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="1L74NXFa1BL">
+    <property role="3GE5qa" value="" />
+    <property role="TrG5h" value="dataform_getter" />
+    <node concept="j$LIH" id="1L74NXFa6j1" role="jxRDz">
+      <node concept="1lLz0L" id="1L74NXFa6jO" role="1lHHLF">
+        <property role="1lMjX7" value="error" />
+        <property role="1lLB17" value="invalid usage (type_term)" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="Lu45F877I6" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+      <node concept="14YyZ8" id="Lu45F8oWCN" role="1lVwrX">
+        <node concept="14ZrTv" id="Lu45F8oWOz" role="14ZwWg">
+          <node concept="30G5F_" id="Lu45F8oWO$" role="150hEN">
+            <node concept="3clFbS" id="Lu45F8oWO_" role="2VODD2">
+              <node concept="3clFbF" id="Lu45F877Is" role="3cqZAp">
+                <node concept="2OqwBi" id="Lu45F877It" role="3clFbG">
+                  <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" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="Lu45F877Ix" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="Lu45F877I7" role="150oIE">
+            <node concept="1oi1Uc" id="Lu45F878lu" role="gfFT$">
+              <node concept="1oi5Wm" id="Lu45F877I8" role="1oi0x0">
+                <property role="TrG5h" value="name" />
+                <node concept="1oi5XN" id="Lu45F877I9" role="1oi5zu">
+                  <node concept="22Ky0T" id="Lu45F877Ia" role="lGtFl">
+                    <node concept="10Nm6u" id="Lu45F877Ib" role="22Ky0K">
+                      <node concept="29HgVG" id="Lu45F877Ic" role="lGtFl">
+                        <node concept="3NFfHV" id="Lu45F877Id" role="3NFExx">
+                          <node concept="3clFbS" id="Lu45F877Ie" role="2VODD2">
+                            <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" />
+                                </node>
+                                <node concept="30H73N" id="Lu45F877Ii" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="17Uvod" id="Lu45F877Ij" role="lGtFl">
+                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                  <property role="2qtEX9" value="name" />
+                  <node concept="3zFVjK" id="Lu45F877Ik" role="3zH0cK">
+                    <node concept="3clFbS" id="Lu45F877Il" role="2VODD2">
+                      <node concept="3clFbF" id="Lu45F877Im" role="3cqZAp">
+                        <node concept="2OqwBi" id="Lu45F877In" role="3clFbG">
+                          <node concept="3TrcHB" id="Lu45F877Io" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="Lu45F877Ip" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="Lu45F8oXbF" role="14YRTM">
+          <node concept="1oi1Uc" id="Lu45F8oXbH" role="gfFT$">
+            <node concept="1oi5Wm" id="Lu45F8oXbI" role="1oi0x0">
+              <property role="TrG5h" value="name" />
+              <node concept="1oi5XN" id="Lu45F8oXbJ" role="1oi5zu">
+                <node concept="22Ky0T" id="Lu45F8oXbK" role="lGtFl">
+                  <node concept="2YIFZM" id="W6bnNelN58" role="22Ky0K">
+                    <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="6pyv:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                    <node concept="3VsKOn" id="W6bnNelN8X" role="37wK5m">
+                      <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="17Uvod" id="Lu45F8oXbT" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="Lu45F8oXbU" role="3zH0cK">
+                  <node concept="3clFbS" id="Lu45F8oXbV" role="2VODD2">
+                    <node concept="3clFbF" id="Lu45F8oXbW" role="3cqZAp">
+                      <node concept="2OqwBi" id="Lu45F8oXbX" role="3clFbG">
+                        <node concept="3TrcHB" id="Lu45F8oXbY" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="30H73N" id="Lu45F8oXbZ" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="Lu45F8795V" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+      <node concept="14YyZ8" id="Lu45F8iYP0" role="1lVwrX">
+        <node concept="14ZrTv" id="Lu45F8iZ0K" role="14ZwWg">
+          <node concept="30G5F_" id="Lu45F8iZ0L" role="150hEN">
+            <node concept="3clFbS" id="Lu45F8iZ0M" role="2VODD2">
+              <node concept="3clFbF" id="Lu45F8796h" role="3cqZAp">
+                <node concept="2OqwBi" id="Lu45F8796i" role="3clFbG">
+                  <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" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="Lu45F8796m" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="Lu45F8795W" role="150oIE">
+            <node concept="1oi1Uc" id="Lu45F879Ie" role="gfFT$">
+              <node concept="1oi5ST" id="Lu45F8795X" role="1oi0x0">
+                <property role="TrG5h" value="name" />
+                <node concept="1oi5UN" id="Lu45F8795Y" role="1oi5TL">
+                  <node concept="22Ky0T" id="Lu45F8795Z" role="lGtFl">
+                    <node concept="10Nm6u" id="Lu45F87960" role="22Ky0K">
+                      <node concept="29HgVG" id="Lu45F87961" role="lGtFl">
+                        <node concept="3NFfHV" id="Lu45F87962" role="3NFExx">
+                          <node concept="3clFbS" id="Lu45F87963" role="2VODD2">
+                            <node concept="3clFbF" id="Lu45F87964" role="3cqZAp">
+                              <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" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="17Uvod" id="Lu45F87968" role="lGtFl">
+                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                  <property role="2qtEX9" value="name" />
+                  <node concept="3zFVjK" id="Lu45F87969" role="3zH0cK">
+                    <node concept="3clFbS" id="Lu45F8796a" role="2VODD2">
+                      <node concept="3clFbF" id="Lu45F8796b" role="3cqZAp">
+                        <node concept="2OqwBi" id="Lu45F8796c" role="3clFbG">
+                          <node concept="3TrcHB" id="Lu45F8796d" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="Lu45F8796e" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="Lu45F8j02F" role="14YRTM">
+          <node concept="1oi1Uc" id="Lu45F8j02H" role="gfFT$">
+            <node concept="1oi5ST" id="Lu45F8j02I" role="1oi0x0">
+              <property role="TrG5h" value="name" />
+              <node concept="1oi5UN" id="Lu45F8j02J" role="1oi5TL">
+                <node concept="22Ky0T" id="Lu45F8j02K" role="lGtFl">
+                  <node concept="2YIFZM" id="6YPNC4OjWja" role="22Ky0K">
+                    <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="6pyv:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                    <node concept="3VsKOn" id="6YPNC4OjWjb" role="37wK5m">
+                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="17Uvod" id="Lu45F8j02T" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="Lu45F8j02U" role="3zH0cK">
+                  <node concept="3clFbS" id="Lu45F8j02V" role="2VODD2">
+                    <node concept="3clFbF" id="Lu45F8j02W" role="3cqZAp">
+                      <node concept="2OqwBi" id="Lu45F8j02X" role="3clFbG">
+                        <node concept="3TrcHB" id="Lu45F8j02Y" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="30H73N" id="Lu45F8j02Z" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="Lu45F87avA" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+      <node concept="14YyZ8" id="Lu45F8gLLG" role="1lVwrX">
+        <node concept="14ZrTv" id="Lu45F8gLXs" role="14ZwWg">
+          <node concept="30G5F_" id="Lu45F8gLXt" role="150hEN">
+            <node concept="3clFbS" id="Lu45F8gLXu" role="2VODD2">
+              <node concept="3clFbF" id="Lu45F8gMny" role="3cqZAp">
+                <node concept="2OqwBi" id="Lu45F8gMnz" role="3clFbG">
+                  <node concept="2OqwBi" id="Lu45F8gMn$" role="2Oq$k0">
+                    <node concept="30H73N" id="Lu45F8gMn_" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="Lu45F8gMnA" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="Lu45F8gMnB" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="Lu45F87avB" role="150oIE">
+            <node concept="1oi1Uc" id="Lu45F87bco" role="gfFT$">
+              <node concept="38e3lM" id="Lu45F87avC" role="1oi0x0">
+                <property role="TrG5h" value="name" />
+                <node concept="KCUsM" id="Lu45F87avD" role="38e3mL">
+                  <node concept="1oi5UN" id="Lu45F87avE" role="KCVpo">
+                    <node concept="22Ky0T" id="Lu45F87avF" role="lGtFl">
+                      <node concept="10Nm6u" id="Lu45F87avG" role="22Ky0K">
+                        <node concept="29HgVG" id="Lu45F87avH" role="lGtFl">
+                          <node concept="3NFfHV" id="Lu45F87avI" role="3NFExx">
+                            <node concept="3clFbS" id="Lu45F87avJ" role="2VODD2">
+                              <node concept="3clFbF" id="Lu45F87avK" role="3cqZAp">
+                                <node concept="2OqwBi" id="Lu45F87avL" role="3clFbG">
+                                  <node concept="3TrEf2" id="Lu45F87avM" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="5j4j:JOGAOsxmrx" resolve="getter" />
+                                  </node>
+                                  <node concept="30H73N" id="Lu45F87avN" role="2Oq$k0" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="17Uvod" id="Lu45F87avO" role="lGtFl">
+                  <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                  <property role="2qtEX9" value="name" />
+                  <node concept="3zFVjK" id="Lu45F87avP" role="3zH0cK">
+                    <node concept="3clFbS" id="Lu45F87avQ" role="2VODD2">
+                      <node concept="3clFbF" id="Lu45F87avR" role="3cqZAp">
+                        <node concept="2OqwBi" id="Lu45F87avS" role="3clFbG">
+                          <node concept="3TrcHB" id="Lu45F87avT" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                          <node concept="30H73N" id="Lu45F87avU" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="Lu45F8gMzA" role="14YRTM">
+          <node concept="1oi1Uc" id="Lu45F8gMVO" role="gfFT$">
+            <node concept="38e3lM" id="Lu45F8gMWd" role="1oi0x0">
+              <property role="TrG5h" value="name" />
+              <node concept="KCUsM" id="Lu45F8gMWf" role="38e3mL">
+                <node concept="1oi5UN" id="Lu45F8gNFj" role="KCVpo">
+                  <node concept="22Ky0T" id="Lu45F8gNTx" role="lGtFl">
+                    <node concept="2YIFZM" id="4MEOIDFP4Me" role="22Ky0K">
+                      <ref role="1Pybhc" to="6pyv:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                      <ref role="37wK5l" to="6pyv:7nPD14NOI_T" resolve="multiMetaLogical" />
+                      <node concept="Xl_RD" id="4MEOIDFP4Mf" role="37wK5m">
+                        <property role="Xl_RC" value="_" />
+                      </node>
+                      <node concept="3VsKOn" id="4MEOIDFP4Mg" role="37wK5m">
+                        <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      </node>
+                      <node concept="3cmrfG" id="Lu45F8dPJB" role="37wK5m">
+                        <property role="3cmrfH" value="0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="17Uvod" id="Lu45F8gMWG" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="Lu45F8gMWJ" role="3zH0cK">
+                  <node concept="3clFbS" id="Lu45F8gMWK" role="2VODD2">
+                    <node concept="3clFbF" id="Lu45F8gMWQ" role="3cqZAp">
+                      <node concept="2OqwBi" id="Lu45F8gMWL" role="3clFbG">
+                        <node concept="3TrcHB" id="Lu45F8gMWO" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="30H73N" id="Lu45F8gMWP" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="JOGAOsGlpT">
+    <property role="TrG5h" value="dataform_pattern" />
+    <node concept="3aamgX" id="JOGAOsGlpV" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+      <node concept="gft3U" id="JOGAOsGmnd" role="1lVwrX">
+        <node concept="1oi5Wm" id="JOGAOsGmwQ" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="1sPUBX" id="JOGAOsGmwU" role="lGtFl">
+            <ref role="v9R2y" node="1L74NXFa1BL" resolve="dataform_getter" />
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="JOGAOsGlpZ" role="30HLyM">
+        <node concept="3clFbS" id="JOGAOsGlq0" role="2VODD2">
+          <node concept="3clFbF" id="JOGAOsGlxj" role="3cqZAp">
+            <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" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="gft3U" id="JOGAOsGmwX" role="jxRDz">
+      <node concept="10Nm6u" id="JOGAOsGmE$" role="gfFT$">
+        <node concept="1sPUBX" id="JOGAOsGmEI" role="lGtFl">
+          <ref role="v9R2y" node="1CcQBrPQape" resolve="dataform_pattern_feature" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="1CcQBrPQape">
+    <property role="3GE5qa" value="" />
+    <property role="TrG5h" value="dataform_pattern_feature" />
+    <node concept="3aamgX" id="1CcQBrPQapf" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxnj6" resolve="ValueFeature" />
+      <node concept="gft3U" id="1CcQBrPQapg" role="1lVwrX">
+        <node concept="1oi5Wm" id="1CcQBrPQaph" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="17Uvod" id="1CcQBrPQapi" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="1CcQBrPQapj" role="3zH0cK">
+              <node concept="3clFbS" id="1CcQBrPQapk" role="2VODD2">
+                <node concept="3clFbF" id="1CcQBrPQapl" role="3cqZAp">
+                  <node concept="2OqwBi" id="1CcQBrPQapm" role="3clFbG">
+                    <node concept="3TrcHB" id="1CcQBrPQapn" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="30H73N" id="1CcQBrPQapo" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2IllgU" id="1CcQBrPQapp" role="1oi5zu" />
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1CcQBrPQap_" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxm2z" resolve="ChildFeature" />
+      <node concept="gft3U" id="1CcQBrPQapA" role="1lVwrX">
+        <node concept="1oi5ST" id="1CcQBrPQapB" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="17Uvod" id="1CcQBrPQapC" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="1CcQBrPQapD" role="3zH0cK">
+              <node concept="3clFbS" id="1CcQBrPQapE" role="2VODD2">
+                <node concept="3clFbF" id="1CcQBrPQapF" role="3cqZAp">
+                  <node concept="2OqwBi" id="1CcQBrPQapG" role="3clFbG">
+                    <node concept="3TrcHB" id="1CcQBrPQapH" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="30H73N" id="1CcQBrPQapI" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2IllgU" id="1CcQBrPQapJ" role="1oi5TL" />
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1CcQBrPQapK" role="3aUrZf">
+      <ref role="30HIoZ" to="5j4j:JOGAOsxpXw" resolve="ListFeature" />
+      <node concept="gft3U" id="1CcQBrPQapL" role="1lVwrX">
+        <node concept="38e3lM" id="428_4iYbsiO" role="gfFT$">
+          <property role="TrG5h" value="name" />
+          <node concept="KCUsM" id="1CcQBrPQapU" role="38e3mL">
+            <node concept="2IllgU" id="1CcQBrPQapV" role="KCVpo" />
+          </node>
+          <node concept="17Uvod" id="1CcQBrPQapN" role="lGtFl">
+            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+            <property role="2qtEX9" value="name" />
+            <node concept="3zFVjK" id="1CcQBrPQapO" role="3zH0cK">
+              <node concept="3clFbS" id="1CcQBrPQapP" role="2VODD2">
+                <node concept="3clFbF" id="1CcQBrPQapQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="1CcQBrPQapR" role="3clFbG">
+                    <node concept="3TrcHB" id="1CcQBrPQapS" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                    <node concept="30H73N" id="1CcQBrPQapT" role="2Oq$k0" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="j$LIH" id="1CcQBrPQaZT" role="jxRDz">
+      <node concept="1lLz0L" id="1CcQBrPQaZU" role="1lHHLF">
+        <property role="1lMjX7" value="error" />
+        <property role="1lLB17" value="invalid usage" />
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="JOGAOsxaig">
+    <property role="TrG5h" value="main" />
+    <node concept="3lhOvk" id="JOGAOsHmdz" role="3lj3bC">
+      <ref role="3lhOvi" node="JOGAOsG6LJ" resolve="_DataFormTable" />
+      <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="dataformtable_class" />
+      <ref role="30HIoZ" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
+    </node>
+    <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j: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">
+            <node concept="3clFbS" id="5hSMZ_ljA5l" role="2VODD2">
+              <node concept="3clFbF" id="5hSMZ_ljA5m" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_ljXun" role="3clFbG">
+                  <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" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="5hSMZ_ljXur" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="5hSMZ_ljA5E" role="150oIE">
+            <node concept="3clFbS" id="5hSMZ_ljA5F" role="1Koe22">
+              <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
+                <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
+                  <node concept="liA8E" id="5hSMZ_ljA5I" role="2OqNvi">
+                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
+                  </node>
+                  <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
+                    <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
+                      <node concept="1L3L4E" id="5hSMZ_ljA5L" role="2ShVmc">
+                        <node concept="1L3L4F" id="5hSMZ_ljA5M" role="1L3L0X">
+                          <property role="2bfB8j" value="true" />
+                          <property role="1L3L77" value="TermDeclaration" />
+                          <node concept="3clFbT" id="5hSMZ_ljA5N" role="1L3L4I">
+                            <property role="3clFbU" value="true" />
+                            <node concept="17Uvod" id="5hSMZ_ljI$V" role="lGtFl">
+                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                              <property role="2qtEX9" value="value" />
+                              <node concept="3zFVjK" id="5hSMZ_ljI$W" role="3zH0cK">
+                                <node concept="3clFbS" id="5hSMZ_ljI$X" role="2VODD2">
+                                  <node concept="3clFbF" id="JOGAOt3DqL" role="3cqZAp">
+                                    <node concept="2OqwBi" id="JOGAOt3Fjr" role="3clFbG">
+                                      <node concept="2OqwBi" id="JOGAOt3Ezk" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="JOGAOt3DEh" role="2Oq$k0">
+                                          <node concept="1iwH7S" id="JOGAOt3DqK" role="2Oq$k0" />
+                                          <node concept="12$id9" id="JOGAOt3EaC" role="2OqNvi">
+                                            <node concept="30H73N" id="JOGAOt3EjQ" role="12$y8L" />
+                                          </node>
+                                        </node>
+                                        <node concept="2Xjw5R" id="JOGAOt3ET8" role="2OqNvi">
+                                          <node concept="1xMEDy" id="JOGAOt3ETa" role="1xVPHs">
+                                            <node concept="chp4Y" id="JOGAOt3F2s" role="ri$Ld">
+                                              <ref role="cht4Q" to="5j4j:JOGAOsIRhm" resolve="Capture" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3x8VRR" id="JOGAOt3FE4" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
+                            <property role="TrG5h" value="feature" />
+                            <node concept="3uibUv" id="5hSMZ_ljA5Z" role="3clF45">
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            </node>
+                            <node concept="3Tm1VV" id="7c96q9tP8pA" role="1B3o_S" />
+                            <node concept="3clFbS" id="5hSMZ_ljA61" role="3clF47">
+                              <node concept="3clFbF" id="5hSMZ_ljA62" role="3cqZAp">
+                                <node concept="10Nm6u" id="5hSMZ_ljA63" role="3clFbG">
+                                  <node concept="1sPUBX" id="5hSMZ_ljA64" role="lGtFl">
+                                    <ref role="v9R2y" node="3kjrYXAPkJB" resolve="dataform_feature_override" />
+                                    <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" />
+                                      </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" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="17Uvod" id="5hSMZ_ljA6e" role="lGtFl">
+                              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                              <property role="2qtEX9" value="name" />
+                              <node concept="3zFVjK" id="5hSMZ_ljA6f" role="3zH0cK">
+                                <node concept="3clFbS" id="5hSMZ_ljA6g" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljA6h" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA6i" role="3clFbG">
+                                      <node concept="2OqwBi" id="5hSMZ_ljA6j" role="2Oq$k0">
+                                        <node concept="30H73N" id="5hSMZ_ljA6k" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="JOGAOsGRPZ" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="5j4j:JOGAOsxTDo" resolve="feature" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrcHB" id="5hSMZ_ljA6m" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1WS0z7" id="5hSMZ_ljA6n" role="lGtFl">
+                              <node concept="3JmXsc" id="5hSMZ_ljA6o" role="3Jn$fo">
+                                <node concept="3clFbS" id="5hSMZ_ljA6p" role="2VODD2">
+                                  <node concept="3clFbF" id="5hSMZ_ljA6q" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5hSMZ_ljA6r" role="3clFbG">
+                                      <node concept="30H73N" id="5hSMZ_ljA6s" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="JOGAOsGNB4" role="2OqNvi">
+                                        <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3Tm1VV" id="5hSMZ_ljA6u" role="1B3o_S" />
+                          <node concept="3uibUv" id="5hSMZ_ljA6v" role="1L3L74">
+                            <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                          </node>
+                          <node concept="17Uvod" id="5hSMZ_ljA6w" role="lGtFl">
+                            <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
+                            <property role="2qtEX9" value="fqClassName" />
+                            <node concept="3zFVjK" id="5hSMZ_ljA6x" role="3zH0cK">
+                              <node concept="3clFbS" id="5hSMZ_ljA6y" role="2VODD2">
+                                <node concept="3clFbF" id="3kjrYXAJz9I" role="3cqZAp">
+                                  <node concept="2OqwBi" id="3kjrYXAJAQJ" role="3clFbG">
+                                    <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" />
+                                      </node>
+                                      <node concept="2OqwBi" id="3kjrYXAJ$7j" role="1m5AlR">
+                                        <node concept="1iwH7S" id="3kjrYXAJz9G" role="2Oq$k0" />
+                                        <node concept="12$id9" id="3kjrYXAJ$tR" role="2OqNvi">
+                                          <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" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2qgKlT" id="JOGAOsGXNz" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="5hSMZ_ljA6D" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="5hSMZ_lfXyG" role="14YRTM">
+          <node concept="3clFbF" id="5hSMZ_ljTTK" role="1Koe22">
+            <node concept="2OqwBi" id="5hSMZ_ljTTL" role="3clFbG">
+              <node concept="1eOMI4" id="5hSMZ_ljTTM" role="2Oq$k0">
+                <node concept="1nCR9W" id="5hSMZ_ljTTN" role="1eOMHV">
+                  <property role="1nD$Q0" value="TermDeclaration" />
+                  <node concept="3clFbT" id="5hSMZ_ljTTO" role="2U2pNA">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                  <node concept="3uibUv" id="5hSMZ_ljTTZ" role="2lIhxL">
+                    <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                  </node>
+                  <node concept="17Uvod" id="5hSMZ_ljTU0" role="lGtFl">
+                    <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
+                    <property role="2qtEX9" value="fqClassName" />
+                    <node concept="3zFVjK" id="5hSMZ_ljTU1" role="3zH0cK">
+                      <node concept="3clFbS" id="5hSMZ_ljTU2" role="2VODD2">
+                        <node concept="3clFbF" id="3kjrYXAJFsn" role="3cqZAp">
+                          <node concept="2OqwBi" id="3kjrYXAJFsp" role="3clFbG">
+                            <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" />
+                              </node>
+                              <node concept="2OqwBi" id="3kjrYXAJFss" role="1m5AlR">
+                                <node concept="1iwH7S" id="3kjrYXAJFst" role="2Oq$k0" />
+                                <node concept="12$id9" id="3kjrYXAJFsu" role="2OqNvi">
+                                  <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" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="JOGAOsGYCo" role="2OqNvi">
+                              <ref role="37wK5l" to="ha02:4MEOIDG8lgz" resolve="runtimeClassFqName" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
+                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
+              </node>
+              <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <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" />
+    </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" />
+    </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 5be1a2c1..b9a6e0c2 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -18,6 +18,7 @@
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
         <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
         <dependency reexport="false">5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)</dependency>
+        <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -26,6 +27,7 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -36,6 +38,7 @@
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -48,12 +51,14 @@
         <module reference="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" 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="85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+        <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 4fb4bc88..731b4ae6 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -4,16 +4,22 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <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="6" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <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>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <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="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </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" />
@@ -28,6 +34,8 @@
       <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="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <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" />
@@ -35,6 +43,9 @@
       <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="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -42,19 +53,28 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <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>
@@ -62,6 +82,17 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </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>
@@ -72,20 +103,44 @@
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+    </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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="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" />
@@ -103,6 +158,15 @@
       <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">
@@ -113,13 +177,27 @@
       </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="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
   <node concept="13h7C7" id="7E86$tKAuhI">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="13h7C2" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     <node concept="13i0hz" id="7E86$tKAujJ" role="13h7CS">
       <property role="13i0iv" value="false" />
@@ -158,7 +236,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="7MlQDeOyT3P">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="13h7C2" to="5j4j:dfChU1zo4B" resolve="Splice" />
     <node concept="13i0hz" id="7MlQDeOyT3S" role="13h7CS">
       <property role="TrG5h" value="prototype" />
@@ -173,7 +251,7 @@
           <node concept="3cpWsn" id="7MlQDeOyTih" role="3cpWs9">
             <property role="TrG5h" value="tfNode" />
             <node concept="3Tqbb2" id="7MlQDeOyTie" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+              <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
             </node>
             <node concept="1PxgMI" id="7MlQDeOyTuD" role="33vP2m">
               <property role="1BlNFB" value="true" />
@@ -181,8 +259,8 @@
                 <node concept="13iPFW" id="7MlQDeOyTij" role="2Oq$k0" />
                 <node concept="1mfA1w" id="7MlQDeOyTik" role="2OqNvi" />
               </node>
-              <node concept="chp4Y" id="6fXjIfxgne2" role="3oSUPX">
-                <ref role="cht4Q" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+              <node concept="chp4Y" id="5yqFHXofCBa" role="3oSUPX">
+                <ref role="cht4Q" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
               </node>
             </node>
           </node>
@@ -196,7 +274,7 @@
           </node>
           <node concept="1_3QMl" id="6Sag3KsyiIv" role="1_3QMm">
             <node concept="3gn64h" id="6Sag3KsyiIN" role="3Kbmr1">
-              <ref role="3gnhBz" to="5j4j:1OShD0HAY6y" resolve="List" />
+              <ref role="3gnhBz" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
             </node>
             <node concept="3clFbS" id="6Sag3KsyiIx" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyiJ4" role="3cqZAp">
@@ -234,7 +312,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="75vUFrSLzLP">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="13h7C2" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     <node concept="13i0hz" id="75vUFrSLzQL" role="13h7CS">
       <property role="TrG5h" value="getContainer" />
@@ -261,30 +339,8 @@
       <node concept="3clFbS" id="75vUFrSLzLR" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="7FFmDVAL6VV">
-    <property role="3GE5qa" value="treeform" />
-    <ref role="13h7C2" to="5j4j:5lJXKARS0" resolve="TreeForm" />
-    <node concept="13i0hz" id="7FFmDVAL6VY" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="runtimeType" />
-      <node concept="3Tm1VV" id="7FFmDVAL6VZ" role="1B3o_S" />
-      <node concept="3clFbS" id="7FFmDVAL6W0" role="3clF47">
-        <node concept="3clFbF" id="7FFmDVALaOi" role="3cqZAp">
-          <node concept="3B5_sB" id="7FFmDVALaOh" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="7FFmDVALaMW" role="3clF45">
-        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
-      </node>
-    </node>
-    <node concept="13hLZK" id="7FFmDVAL6VW" role="13h7CW">
-      <node concept="3clFbS" id="7FFmDVAL6VX" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="7FFmDVAL6Y2">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="13h7C2" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
     <node concept="13hLZK" id="7FFmDVAL6Y3" role="13h7CW">
       <node concept="3clFbS" id="7FFmDVAL6Y4" role="2VODD2" />
@@ -308,7 +364,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="7FFmDVAL750">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="13h7C2" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
     <node concept="13hLZK" id="7FFmDVAL751" role="13h7CW">
       <node concept="3clFbS" id="7FFmDVAL752" role="2VODD2" />
@@ -322,7 +378,7 @@
       <node concept="3clFbS" id="7FFmDVAL75b" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaK9" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaK8" role="3clFbG">
-            <ref role="3B5MYn" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="3B5MYn" to="6exd:5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
       </node>
@@ -332,8 +388,8 @@
     </node>
   </node>
   <node concept="13h7C7" id="7FFmDVAL79i">
-    <property role="3GE5qa" value="treeform" />
-    <ref role="13h7C2" to="5j4j:1OShD0HAY6y" resolve="List" />
+    <property role="3GE5qa" value="dataform" />
+    <ref role="13h7C2" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
     <node concept="13hLZK" id="7FFmDVAL79j" role="13h7CW">
       <node concept="3clFbS" id="7FFmDVAL79k" role="2VODD2" />
     </node>
@@ -355,5 +411,664 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="5yqFHXofCx9">
+    <property role="3GE5qa" value="dataform" />
+    <ref role="13h7C2" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
+    <node concept="13hLZK" id="5yqFHXofCxa" role="13h7CW">
+      <node concept="3clFbS" id="5yqFHXofCxb" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7FFmDVAL6VY" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="runtimeType" />
+      <node concept="3Tm1VV" id="7FFmDVAL6VZ" role="1B3o_S" />
+      <node concept="3clFbS" id="7FFmDVAL6W0" role="3clF47">
+        <node concept="3clFbF" id="7FFmDVALaOi" role="3cqZAp">
+          <node concept="3B5_sB" id="7FFmDVALaOh" role="3clFbG">
+            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="7FFmDVALaMW" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="JOGAOsxFgi">
+    <property role="3GE5qa" value="dataform.constructor" />
+    <ref role="13h7C2" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <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="3clFbJ" id="7c96q9t$N$B" role="3cqZAp">
+          <node concept="2OqwBi" id="7c96q9t$OnM" role="3clFbw">
+            <node concept="2OqwBi" id="7c96q9t$NJr" role="2Oq$k0">
+              <node concept="13iPFW" id="7c96q9t$N_3" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7c96q9t$O0W" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="7c96q9t$OKw" role="2OqNvi" />
+          </node>
+          <node concept="3clFbS" id="7c96q9t$N$D" role="3clFbx">
+            <node concept="3cpWs6" id="7c96q9t$OOY" role="3cqZAp">
+              <node concept="2OqwBi" id="7c96q9t$PFJ" role="3cqZAk">
+                <node concept="2OqwBi" id="7c96q9t$P1_" role="2Oq$k0">
+                  <node concept="13iPFW" id="7c96q9t$ORQ" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="7c96q9t$Plg" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="7c96q9t$Q0r" role="2OqNvi">
+                  <ref role="37wK5l" node="7c96q9t$Nk0" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <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="JOGAOsR58r" role="13h7CS">
+      <property role="TrG5h" value="allFeatures" />
+      <node concept="3Tm1VV" id="JOGAOsR58s" role="1B3o_S" />
+      <node concept="A3Dl8" id="JOGAOsR5_4" role="3clF45">
+        <node concept="3Tqbb2" id="JOGAOsR5_h" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="JOGAOsR58u" role="3clF47">
+        <node concept="3clFbJ" id="JOGAOsR5_O" role="3cqZAp">
+          <node concept="2OqwBi" id="JOGAOsR6qe" role="3clFbw">
+            <node concept="2OqwBi" id="JOGAOsR5Ks" role="2Oq$k0">
+              <node concept="13iPFW" id="JOGAOsR5A8" role="2Oq$k0" />
+              <node concept="3TrEf2" id="JOGAOsR641" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="JOGAOsR6Nh" role="2OqNvi" />
+          </node>
+          <node concept="3clFbS" id="JOGAOsR5_Q" role="3clFbx">
+            <node concept="3cpWs6" id="JOGAOsR6PO" role="3cqZAp">
+              <node concept="BsUDl" id="JOGAOsR6SF" role="3cqZAk">
+                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
+                <node concept="2OqwBi" id="JOGAOsRaQP" role="37wK5m">
+                  <node concept="2OqwBi" id="JOGAOsR8_x" role="2Oq$k0">
+                    <node concept="2OqwBi" id="JOGAOsR7OS" role="2Oq$k0">
+                      <node concept="2OqwBi" id="JOGAOsR77E" role="2Oq$k0">
+                        <node concept="13iPFW" id="JOGAOsR6WE" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="JOGAOsR7tY" role="2OqNvi">
+                          <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="JOGAOsR8ez" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="JOGAOsR8Tf" role="2OqNvi">
+                      <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="JOGAOsRe1t" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="JOGAOsRhDt" role="37wK5m">
+                  <node concept="2OqwBi" id="JOGAOsRf2y" role="2Oq$k0">
+                    <node concept="2OqwBi" id="JOGAOsRel8" role="2Oq$k0">
+                      <node concept="13iPFW" id="JOGAOsRe9f" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="JOGAOsReIL" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="JOGAOsRfpm" role="2OqNvi">
+                      <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="JOGAOsRkKB" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="JOGAOsRl03" role="3cqZAp">
+          <node concept="2OqwBi" id="JOGAOsRlSs" role="3clFbG">
+            <node concept="2OqwBi" id="JOGAOsRlcT" role="2Oq$k0">
+              <node concept="13iPFW" id="JOGAOsRl01" role="2Oq$k0" />
+              <node concept="3TrEf2" id="JOGAOsRl_R" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="JOGAOsRmbs" role="2OqNvi">
+              <ref role="3TtcxE" to="5j4j:JOGAOsxiLz" resolve="feature" />
+            </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="3clFbJ" id="7c96q9tIw76" role="3cqZAp">
+          <node concept="3clFbS" id="7c96q9tIw77" role="3clFbx">
+            <node concept="3cpWs6" id="7c96q9tIw78" role="3cqZAp">
+              <node concept="BsUDl" id="7c96q9tIw79" role="3cqZAk">
+                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
+                <node concept="2OqwBi" id="7c96q9tIw7a" role="37wK5m">
+                  <node concept="2OqwBi" id="7c96q9tIw7b" role="2Oq$k0">
+                    <node concept="2qgKlT" id="7c96q9tIy8v" role="2OqNvi">
+                      <ref role="37wK5l" node="7c96q9tALRr" resolve="valueFeatures" />
+                    </node>
+                    <node concept="2OqwBi" id="7c96q9tIw7e" role="2Oq$k0">
+                      <node concept="13iPFW" id="7c96q9tIw7f" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7c96q9tIxw$" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="7c96q9tIw7i" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="7c96q9tIw7j" role="37wK5m">
+                  <node concept="2OqwBi" id="7c96q9tIw7k" role="2Oq$k0">
+                    <node concept="2OqwBi" id="7c96q9tIw7l" role="2Oq$k0">
+                      <node concept="13iPFW" id="7c96q9tIw7m" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7c96q9tIw7n" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="7c96q9tIw7o" role="2OqNvi">
+                      <ref role="37wK5l" node="5UYwY$H7MGm" resolve="valueFeatures" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="7c96q9tIw7p" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7c96q9tIw7q" role="3clFbw">
+            <node concept="2OqwBi" id="7c96q9tIw7r" role="2Oq$k0">
+              <node concept="13iPFW" id="7c96q9tIw7s" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7c96q9tIx1c" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="7c96q9tIw7v" role="2OqNvi" />
+          </node>
+        </node>
+        <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="3clFbJ" id="7c96q9tIyno" role="3cqZAp">
+          <node concept="3clFbS" id="7c96q9tIynp" role="3clFbx">
+            <node concept="3cpWs6" id="7c96q9tIynq" role="3cqZAp">
+              <node concept="BsUDl" id="7c96q9tIynr" role="3cqZAk">
+                <ref role="37wK5l" node="7c96q9tCfic" resolve="merge" />
+                <node concept="2OqwBi" id="7c96q9tIyns" role="37wK5m">
+                  <node concept="2OqwBi" id="7c96q9tIynt" role="2Oq$k0">
+                    <node concept="2qgKlT" id="7c96q9tI$4S" role="2OqNvi">
+                      <ref role="37wK5l" node="7c96q9tCSX_" resolve="childFeatures" />
+                    </node>
+                    <node concept="2OqwBi" id="7c96q9tIynw" role="2Oq$k0">
+                      <node concept="13iPFW" id="7c96q9tIynx" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7c96q9tIzsX" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="7c96q9tIyn$" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="7c96q9tIyn_" role="37wK5m">
+                  <node concept="2OqwBi" id="7c96q9tIynA" role="2Oq$k0">
+                    <node concept="2OqwBi" id="7c96q9tIynB" role="2Oq$k0">
+                      <node concept="13iPFW" id="7c96q9tIynC" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7c96q9tIynD" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:JOGAOsxaCc" resolve="template" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="7c96q9tIynE" role="2OqNvi">
+                      <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="7c96q9tIynF" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7c96q9tIynG" role="3clFbw">
+            <node concept="2OqwBi" id="7c96q9tIynH" role="2Oq$k0">
+              <node concept="13iPFW" id="7c96q9tIynI" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7c96q9tIyXt" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:JOGAOsxaCh" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="7c96q9tIynL" role="2OqNvi" />
+          </node>
+        </node>
+        <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="7c96q9tCfic" role="13h7CS">
+      <property role="TrG5h" value="merge" />
+      <node concept="37vLTG" id="7c96q9tCh60" role="3clF46">
+        <property role="TrG5h" value="first" />
+        <node concept="2I9FWS" id="7c96q9tChcv" role="1tU5fm">
+          <ref role="2I9WkF" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7c96q9tCh7H" role="3clF46">
+        <property role="TrG5h" value="second" />
+        <node concept="2I9FWS" id="7c96q9tChdC" role="1tU5fm">
+          <ref role="2I9WkF" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="7c96q9tCh4d" role="1B3o_S" />
+      <node concept="2I9FWS" id="7c96q9tChek" role="3clF45">
+        <ref role="2I9WkF" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+      </node>
+      <node concept="3clFbS" id="7c96q9tCfif" role="3clF47">
+        <node concept="3cpWs8" id="7c96q9tCheC" role="3cqZAp">
+          <node concept="3cpWsn" id="7c96q9tCheD" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="7c96q9tCheE" role="1tU5fm">
+              <node concept="3Tqbb2" id="7c96q9tCheF" role="_ZDj9">
+                <ref role="ehGHo" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7c96q9tCheG" role="33vP2m">
+              <node concept="2OqwBi" id="7c96q9tCheH" role="2Oq$k0">
+                <node concept="37vLTw" id="7c96q9tCh$H" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7c96q9tCh60" resolve="first" />
+                </node>
+                <node concept="3zZkjj" id="7c96q9tCheJ" role="2OqNvi">
+                  <node concept="1bVj0M" id="7c96q9tCheK" role="23t8la">
+                    <node concept="3clFbS" id="7c96q9tCheL" role="1bW5cS">
+                      <node concept="3clFbF" id="7c96q9tCheM" role="3cqZAp">
+                        <node concept="3fqX7Q" id="7c96q9tCheN" role="3clFbG">
+                          <node concept="2OqwBi" id="7c96q9tCheO" role="3fr31v">
+                            <node concept="37vLTw" id="7c96q9tChIp" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7c96q9tCh7H" resolve="second" />
+                            </node>
+                            <node concept="2HwmR7" id="7c96q9tCheQ" role="2OqNvi">
+                              <node concept="1bVj0M" id="7c96q9tCheR" role="23t8la">
+                                <node concept="3clFbS" id="7c96q9tCheS" role="1bW5cS">
+                                  <node concept="3clFbF" id="7c96q9tCheT" role="3cqZAp">
+                                    <node concept="17R0WA" id="7c96q9tCheU" role="3clFbG">
+                                      <node concept="2OqwBi" id="7c96q9tCheV" role="3uHU7B">
+                                        <node concept="37vLTw" id="7c96q9tCheW" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="7c96q9tChf1" resolve="it" />
+                                        </node>
+                                        <node concept="3TrcHB" id="7c96q9tCheX" role="2OqNvi">
+                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                        </node>
+                                      </node>
+                                      <node concept="2OqwBi" id="7c96q9tCheY" role="3uHU7w">
+                                        <node concept="37vLTw" id="7c96q9tCheZ" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="7c96q9tChf3" resolve="f" />
+                                        </node>
+                                        <node concept="3TrcHB" id="7c96q9tChf0" role="2OqNvi">
+                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="7c96q9tChf1" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="7c96q9tChf2" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7c96q9tChf3" role="1bW2Oz">
+                      <property role="TrG5h" value="f" />
+                      <node concept="2jxLKc" id="7c96q9tChf4" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="7c96q9tChf5" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7c96q9tCmJX" role="3cqZAp">
+          <node concept="2OqwBi" id="7c96q9tCovv" role="3clFbG">
+            <node concept="37vLTw" id="7c96q9tCmJV" role="2Oq$k0">
+              <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
+            </node>
+            <node concept="X8dFx" id="7c96q9tCv2_" role="2OqNvi">
+              <node concept="2OqwBi" id="7c96q9tC_I$" role="25WWJ7">
+                <node concept="2OqwBi" id="7c96q9tC_0x" role="2Oq$k0">
+                  <node concept="37vLTw" id="7c96q9tC_0y" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7c96q9tCh7H" resolve="second" />
+                  </node>
+                  <node concept="3zZkjj" id="7c96q9tC_0z" role="2OqNvi">
+                    <node concept="1bVj0M" id="7c96q9tC_0$" role="23t8la">
+                      <node concept="3clFbS" id="7c96q9tC_0_" role="1bW5cS">
+                        <node concept="3clFbF" id="7c96q9tC_0A" role="3cqZAp">
+                          <node concept="3fqX7Q" id="7c96q9tC_0B" role="3clFbG">
+                            <node concept="2OqwBi" id="7c96q9tC_0C" role="3fr31v">
+                              <node concept="37vLTw" id="7c96q9tC_0D" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
+                              </node>
+                              <node concept="2HwmR7" id="7c96q9tC_0E" role="2OqNvi">
+                                <node concept="1bVj0M" id="7c96q9tC_0F" role="23t8la">
+                                  <node concept="3clFbS" id="7c96q9tC_0G" role="1bW5cS">
+                                    <node concept="3clFbF" id="7c96q9tC_0H" role="3cqZAp">
+                                      <node concept="17R0WA" id="7c96q9tC_0I" role="3clFbG">
+                                        <node concept="2OqwBi" id="7c96q9tC_0J" role="3uHU7w">
+                                          <node concept="37vLTw" id="7c96q9tC_0K" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7c96q9tC_0R" resolve="f" />
+                                          </node>
+                                          <node concept="3TrcHB" id="7c96q9tC_0L" role="2OqNvi">
+                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                          </node>
+                                        </node>
+                                        <node concept="2OqwBi" id="7c96q9tC_0M" role="3uHU7B">
+                                          <node concept="37vLTw" id="7c96q9tC_0N" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7c96q9tC_0P" resolve="it" />
+                                          </node>
+                                          <node concept="3TrcHB" id="7c96q9tC_0O" role="2OqNvi">
+                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="Rh6nW" id="7c96q9tC_0P" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="7c96q9tC_0Q" role="1tU5fm" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="7c96q9tC_0R" role="1bW2Oz">
+                        <property role="TrG5h" value="f" />
+                        <node concept="2jxLKc" id="7c96q9tC_0S" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="ANE8D" id="7c96q9tCA89" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7c96q9tCATz" role="3cqZAp">
+          <node concept="37vLTw" id="7c96q9tCATx" role="3clFbG">
+            <ref role="3cqZAo" node="7c96q9tCheD" resolve="result" />
+          </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="_DF" />
+            </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="dataform.constructor" />
+    <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="dataform.constructor" />
+    <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>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 921c3407..c5f619bb 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -3,6 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
@@ -193,6 +196,9 @@
       </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -202,10 +208,18 @@
       <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" />
+      <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">
@@ -265,7 +279,7 @@
     </language>
   </registry>
   <node concept="1M2fIO" id="3qvzBqWDzqQ">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="1M2myG" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
     <node concept="EnEH3" id="3qvzBqWDzrE" role="1MhHOB">
       <ref role="EomxK" to="5j4j:6$jH9oLmYKA" resolve="value" />
@@ -403,7 +417,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="7E86$tKtku$">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="1M2myG" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     <node concept="EnEH3" id="7E86$tKtkwH" role="1MhHOB">
       <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
@@ -457,7 +471,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="7E86$tK_SDr">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="1M2myG" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="1N5Pfh" id="7E86$tK_SGg" role="1Mr941">
       <ref role="1N5Vy1" to="5j4j:7E86$tK_PaH" resolve="declaration" />
@@ -786,5 +800,93 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="JOGAOsxTE1">
+    <property role="3GE5qa" value="dataform.constructor.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>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 489577ab..1ec5dc5b 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -5,6 +5,11 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -30,6 +35,7 @@
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
@@ -50,12 +56,14 @@
         <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">
         <property id="1196434851095" name="text" index="2h4Kg1" />
       </concept>
       <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="6089045305654894367" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Named" flags="ng" index="2kknPI">
         <reference id="6089045305654944382" name="menu" index="2kkw0f" />
       </concept>
@@ -68,6 +76,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" />
@@ -83,6 +93,7 @@
         <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>
@@ -173,6 +184,16 @@
       <concept id="414384289274424754" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_AddConcept" flags="ng" index="3ft5Ry">
         <reference id="697754674827630451" name="concept" index="4PJHt" />
       </concept>
+      <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
+        <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
+        <child id="1139535219969" name="item" index="1h_SK8" />
+      </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" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
@@ -202,11 +223,14 @@
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="7667708318090725848" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentAnchorStyleClassItem" flags="ln" index="1Bsynf" />
+      <concept id="7667708318090877006" name="jetbrains.mps.lang.editor.structure.IndentLayoutWrapAnchorStyleClassItem" flags="ln" index="1Bt7hp" />
       <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <reference id="1139959269582" name="actionMap" index="1ERwB7" />
         <child id="1142887637401" name="renderingCondition" index="pqm2j" />
+        <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" />
@@ -227,6 +251,11 @@
       <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>
@@ -308,9 +337,13 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -340,6 +373,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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -391,14 +425,28 @@
         <reference id="5253134957341833005" name="conceptDeclaration" index="prhl4" />
         <reference id="5253134957341833006" name="linkDeclaration" index="prhl7" />
       </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="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
         <reference id="1143235391024" name="concept" index="I8UWU" />
       </concept>
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
+      <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
+        <reference id="3562215692195600259" name="link" index="13MTZf" />
+      </concept>
       <concept id="5168775467716640652" name="jetbrains.mps.lang.smodel.structure.OperationParm_LinkQualifier" flags="ng" index="1aIX9F">
         <child id="5168775467716640653" name="linkQualifier" index="1aIX9E" />
       </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" />
@@ -408,9 +456,15 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </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>
+      <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>
@@ -429,6 +483,13 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="linkRole" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </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">
@@ -441,11 +502,13 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
+      <concept id="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>
   <node concept="24kQdi" id="1pt0VTMuXN6">
-    <ref role="1XX52x" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
+    <property role="3GE5qa" value="dataform.expression" />
+    <ref role="1XX52x" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
     <node concept="3EZMnI" id="1pt0VTMv4B6" role="2wV5jI">
       <ref role="1k5W1q" node="7ksQUDZtGfa" resolve="Value" />
       <node concept="3Xmtl4" id="7ksQUDZx9p7" role="3F10Kt">
@@ -487,18 +550,8 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="1pt0VTMvWxi">
-    <property role="3GE5qa" value="treeform" />
-    <ref role="1XX52x" to="5j4j:6$jH9oLnyB1" resolve="Symbol" />
-    <node concept="3F0A7n" id="1pt0VTMvWxk" role="2wV5jI">
-      <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      <node concept="34QqEe" id="1pt0VTMzehM" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="1pt0VTMw5TB">
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <ref role="1XX52x" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
     <node concept="3EZMnI" id="1pt0VTMw5TD" role="2wV5jI">
       <node concept="3F0A7n" id="1pt0VTMw5TY" role="3EZMnx">
@@ -542,7 +595,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1pt0VTMw7ty">
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <ref role="1XX52x" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
     <node concept="3EZMnI" id="1pt0VTMw7t$" role="2wV5jI">
       <node concept="3F0A7n" id="1pt0VTMw7tT" role="3EZMnx">
@@ -583,7 +636,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1pt0VTMw9pG">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="1XX52x" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
     <node concept="3EZMnI" id="kTK1BfudHu" role="2wV5jI">
       <node concept="3F0ifn" id="kTK1Bfuec$" role="3EZMnx">
@@ -742,7 +795,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="6dP_abdQWZZ">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="1XX52x" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
     <node concept="3EZMnI" id="kTK1BfuVyd" role="2wV5jI">
       <node concept="3F0ifn" id="kTK1BfuVye" role="3EZMnx">
@@ -879,7 +932,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2q_78a8W4FU">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="1XX52x" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
     <node concept="3EZMnI" id="2q_78a9c7Qy" role="2wV5jI">
       <node concept="3F0ifn" id="2q_78a9c7Sl" role="3EZMnx">
@@ -890,7 +943,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="7E86$tKt5HF">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.item" />
     <ref role="1XX52x" to="5j4j:7E86$tKt5sV" resolve="ExpressionLogicalVariable" />
     <node concept="3EZMnI" id="7E86$tKt68D" role="2wV5jI">
       <node concept="3F0ifn" id="6Ng87FPWMwT" role="3EZMnx">
@@ -907,7 +960,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="7E86$tKtiJM">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="1XX52x" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     <node concept="3EZMnI" id="2E5lcNn2Yfo" role="2wV5jI">
       <node concept="l2Vlx" id="2E5lcNn2Yfr" role="2iSdaV" />
@@ -970,7 +1023,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="7E86$tK_Puj">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="1XX52x" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="3EZMnI" id="6p0DfM0eyCR" role="2wV5jI">
       <node concept="1iCGBv" id="2E5lcNn53QK" role="3EZMnx">
@@ -1037,7 +1090,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="1mP5b6jNJde">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <ref role="1XX52x" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
     <node concept="3EZMnI" id="6Ng87FPVAz_" role="2wV5jI">
       <node concept="PMmxH" id="6Ng87FPVA_o" role="3EZMnx">
@@ -1090,7 +1143,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="dfChU1zo92">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="1XX52x" to="5j4j:dfChU1zo4B" resolve="Splice" />
     <node concept="3EZMnI" id="dfChU1zop0" role="2wV5jI">
       <ref role="1k5W1q" node="7ksQUDZuyMD" resolve="Backquote" />
@@ -1188,8 +1241,8 @@
     </node>
   </node>
   <node concept="24kQdi" id="1OShD0HAZ4h">
-    <property role="3GE5qa" value="treeform" />
-    <ref role="1XX52x" to="5j4j:1OShD0HAY6y" resolve="List" />
+    <property role="3GE5qa" value="dataform" />
+    <ref role="1XX52x" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
     <node concept="3EZMnI" id="1OShD0HAZmx" role="2wV5jI">
       <node concept="VPM3Z" id="1OShD0HAZmy" role="3F10Kt">
         <property role="VOm3f" value="false" />
@@ -1670,6 +1723,37 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4bWqD4C2Vzp" role="jymVt" />
+    <node concept="Wx3nA" id="4bWqD4C2Vnd" role="jymVt">
+      <property role="TrG5h" value="FG_PARAMETER" />
+      <node concept="3Tm1VV" id="4bWqD4C2Vne" role="1B3o_S" />
+      <node concept="3uibUv" id="4bWqD4C2Vnf" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="4bWqD4C2Vng" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="4bWqD4C2Vnh" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4bWqD4C2Vni" role="33vP2m">
+        <node concept="1pGfFk" id="4bWqD4C2Vnj" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="3uibUv" id="4bWqD4C2Vnm" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="4bWqD4C2Vnn" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="37vLTw" id="5yqFHXow7dl" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hXiM0" resolve="PURPLE" />
+          </node>
+          <node concept="37vLTw" id="5yqFHXow7f5" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hXiLO" resolve="IRIS" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="4bWqD4C3iOH" role="jymVt" />
     <node concept="Wx3nA" id="4bWqD4C3iOy" role="jymVt">
       <property role="TrG5h" value="SAPPHIRE" />
@@ -1729,37 +1813,37 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4bWqD4C3iOl" role="jymVt" />
-    <node concept="Wx3nA" id="4aJUH_hXiLC" role="jymVt">
-      <property role="TrG5h" value="FG_LOGICAL" />
-      <node concept="3Tm1VV" id="4aJUH_hXiLD" role="1B3o_S" />
-      <node concept="3uibUv" id="4aJUH_hXiLE" role="1tU5fm">
+    <node concept="Wx3nA" id="4bWqD4C7sc7" role="jymVt">
+      <property role="TrG5h" value="FG_TERM" />
+      <node concept="3Tm1VV" id="4bWqD4C7sc8" role="1B3o_S" />
+      <node concept="3uibUv" id="4bWqD4C7sc9" role="1tU5fm">
         <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="4aJUH_hXiLF" role="11_B2D">
+        <node concept="3uibUv" id="4bWqD4C7sca" role="11_B2D">
           <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
         </node>
-        <node concept="3uibUv" id="4aJUH_hXiLG" role="11_B2D">
+        <node concept="3uibUv" id="4bWqD4C7scb" role="11_B2D">
           <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
         </node>
       </node>
-      <node concept="2ShNRf" id="4aJUH_hXiLH" role="33vP2m">
-        <node concept="1pGfFk" id="4aJUH_hXiLI" role="2ShVmc">
+      <node concept="2ShNRf" id="4bWqD4C7scc" role="33vP2m">
+        <node concept="1pGfFk" id="4bWqD4C7scd" role="2ShVmc">
           <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-          <node concept="3uibUv" id="4aJUH_hXiLL" role="1pMfVU">
+          <node concept="3uibUv" id="4bWqD4C7sce" role="1pMfVU">
             <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
           </node>
-          <node concept="3uibUv" id="4aJUH_hXiLM" role="1pMfVU">
+          <node concept="3uibUv" id="4bWqD4C7scf" role="1pMfVU">
             <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
           </node>
-          <node concept="37vLTw" id="4bWqD4C5nuS" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hXiM0" resolve="PURPLE" />
+          <node concept="37vLTw" id="5yqFHXow8xM" role="37wK5m">
+            <ref role="3cqZAo" node="4bWqD4C3iOy" resolve="SAPPHIRE" />
           </node>
-          <node concept="37vLTw" id="4bWqD4C5nqh" role="37wK5m">
-            <ref role="3cqZAo" node="4aJUH_hXiLO" resolve="IRIS" />
+          <node concept="37vLTw" id="5yqFHXow8zy" role="37wK5m">
+            <ref role="3cqZAo" node="4bWqD4C3iOm" resolve="OCEAN" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4bWqD4C3kBk" role="jymVt" />
+    <node concept="2tJIrI" id="5yqFHXow7Br" role="jymVt" />
     <node concept="Wx3nA" id="7ksQUDZy5Fh" role="jymVt">
       <property role="TrG5h" value="DELFG" />
       <node concept="3Tm1VV" id="7ksQUDZy5Fi" role="1B3o_S" />
@@ -1818,26 +1902,543 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="7ksQUDZtHkt" role="1B3o_S" />
-  </node>
-  <node concept="24kQdi" id="4sSe4$p4oOX">
-    <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
-    <node concept="3EZMnI" id="4sSe4$p4oOZ" role="2wV5jI">
-      <node concept="3F1sOY" id="4sSe4$p4oPk" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:4sSe4$p4oON" resolve="variable" />
+    <node concept="2tJIrI" id="4aJUH_hW484" role="jymVt" />
+    <node concept="Wx3nA" id="7ksQUDZq4Xq" role="jymVt">
+      <property role="TrG5h" value="LAKE" />
+      <node concept="3Tm1VV" id="7ksQUDZq4Xr" role="1B3o_S" />
+      <node concept="3uibUv" id="7ksQUDZq4Xs" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
-      <node concept="3F0ifn" id="4sSe4$p4oPc" role="3EZMnx">
-        <property role="3F0ifm" value="=" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
+      <node concept="2ShNRf" id="7ksQUDZq4Xt" role="33vP2m">
+        <node concept="1pGfFk" id="7ksQUDZq4Xu" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="7LZcKzBF6aa" role="37wK5m">
+            <property role="2noCCI" value="ED" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBF6dW" role="37wK5m">
+            <property role="2noCCI" value="FC" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBF6l9" role="37wK5m">
+            <property role="2noCCI" value="ED" />
+          </node>
+        </node>
       </node>
-      <node concept="3F1sOY" id="4sSe4$p4oP6" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:4sSe4$p4oOP" resolve="value" />
+      <node concept="z59LJ" id="7ksQUDZq4Xy" role="lGtFl">
+        <node concept="TZ5HA" id="7ksQUDZq4Xz" role="TZ5H$">
+          <node concept="1dT_AC" id="7ksQUDZq4X$" role="1dT_Ay">
+            <property role="1dT_AB" value="BG for Injected fragment, default scheme" />
+          </node>
+        </node>
       </node>
-      <node concept="l2Vlx" id="4sSe4$p4oP2" role="2iSdaV" />
     </node>
+    <node concept="2tJIrI" id="7ksQUDZq5ef" role="jymVt" />
+    <node concept="Wx3nA" id="7ksQUDZq54u" role="jymVt">
+      <property role="TrG5h" value="SWAMP" />
+      <node concept="3Tm1VV" id="7ksQUDZq54v" role="1B3o_S" />
+      <node concept="3uibUv" id="7ksQUDZq54w" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="7ksQUDZq54x" role="33vP2m">
+        <node concept="1pGfFk" id="7ksQUDZq54y" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="7LZcKzBF6z7" role="37wK5m">
+            <property role="2noCCI" value="34" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBF6AT" role="37wK5m">
+            <property role="2noCCI" value="41" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBF6EF" role="37wK5m">
+            <property role="2noCCI" value="35" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="7ksQUDZq54A" role="lGtFl">
+        <node concept="TZ5HA" id="7ksQUDZq54B" role="TZ5H$">
+          <node concept="1dT_AC" id="7ksQUDZq54C" role="1dT_Ay">
+            <property role="1dT_AB" value="BG for Injected fragment, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7ksQUDZpwgT" role="jymVt" />
+    <node concept="Wx3nA" id="7LZcKzBExMT" role="jymVt">
+      <property role="TrG5h" value="BG_INJECTED_FRAGMENT" />
+      <node concept="3Tm1VV" id="7LZcKzBExOS" role="1B3o_S" />
+      <node concept="3uibUv" id="7LZcKzBExPz" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="7LZcKzBExQn" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="7LZcKzBExRV" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7LZcKzBExWk" role="33vP2m">
+        <node concept="1pGfFk" id="7LZcKzBF5D7" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="7LZcKzBF5V4" role="37wK5m">
+            <ref role="3cqZAo" node="7ksQUDZq4Xq" resolve="LAKE" />
+          </node>
+          <node concept="37vLTw" id="7LZcKzBF5Yn" role="37wK5m">
+            <ref role="3cqZAo" node="7ksQUDZq54u" resolve="SWAMP" />
+          </node>
+          <node concept="3uibUv" id="7LZcKzBF5JO" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="7LZcKzBF5Qt" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LZcKzBExEj" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_wic" role="jymVt">
+      <property role="TrG5h" value="BEETROOT" />
+      <node concept="3Tm1VV" id="1iWwVK2_wid" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_wie" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_wif" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_wig" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="1iWwVK2_wih" role="37wK5m">
+            <property role="2noCCI" value="7F" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_wii" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_wij" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="1iWwVK2_wik" role="lGtFl">
+        <node concept="TZ5HA" id="1iWwVK2_wil" role="TZ5H$">
+          <node concept="1dT_AC" id="1iWwVK2_wim" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for template variable, default scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LZcKzBFlFB" role="jymVt" />
+    <node concept="Wx3nA" id="7LZcKzBFlBy" role="jymVt">
+      <property role="TrG5h" value="ROSE" />
+      <node concept="3Tm1VV" id="7LZcKzBFlBz" role="1B3o_S" />
+      <node concept="3uibUv" id="7LZcKzBFlB$" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="7LZcKzBFlB_" role="33vP2m">
+        <node concept="1pGfFk" id="7LZcKzBFlBA" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="7LZcKzBFlBB" role="37wK5m">
+            <property role="2noCCI" value="AE" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBFlBC" role="37wK5m">
+            <property role="2noCCI" value="8A" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBFlBD" role="37wK5m">
+            <property role="2noCCI" value="BE" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="7LZcKzBFlBE" role="lGtFl">
+        <node concept="TZ5HA" id="7LZcKzBFlBF" role="TZ5H$">
+          <node concept="1dT_AC" id="7LZcKzBFlBG" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for template variable, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LZcKzBF7vP" role="jymVt" />
+    <node concept="Wx3nA" id="7LZcKzBFlL2" role="jymVt">
+      <property role="TrG5h" value="FG_TEMPLATE_VARIABLE" />
+      <node concept="3Tm1VV" id="7LZcKzBFlL3" role="1B3o_S" />
+      <node concept="3uibUv" id="7LZcKzBFlL4" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="7LZcKzBFlL5" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="7LZcKzBFlL6" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7LZcKzBFlL7" role="33vP2m">
+        <node concept="1pGfFk" id="7LZcKzBFlL8" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="1iWwVK2_E0N" role="37wK5m">
+            <ref role="3cqZAo" node="1iWwVK2_wic" resolve="BEETROOT" />
+          </node>
+          <node concept="37vLTw" id="7LZcKzBFmem" role="37wK5m">
+            <ref role="3cqZAo" node="7LZcKzBFlBy" resolve="ROSE" />
+          </node>
+          <node concept="3uibUv" id="7LZcKzBFlLb" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="7LZcKzBFlLc" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2CEQDIDT_Xu" role="jymVt" />
+    <node concept="Wx3nA" id="7LZcKzBFlnm" role="jymVt">
+      <property role="TrG5h" value="BLUE" />
+      <node concept="3Tm1VV" id="7LZcKzBFlnn" role="1B3o_S" />
+      <node concept="3uibUv" id="7LZcKzBFlno" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="7LZcKzBFlnp" role="33vP2m">
+        <node concept="1pGfFk" id="7LZcKzBFlnq" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="7LZcKzBFlnr" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBFlns" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+          <node concept="2nou5x" id="7LZcKzBFlnt" role="37wK5m">
+            <property role="2noCCI" value="FF" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="7LZcKzBFlnu" role="lGtFl">
+        <node concept="TZ5HA" id="7LZcKzBFlnv" role="TZ5H$">
+          <node concept="1dT_AC" id="7LZcKzBFlnw" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for CSS property, default scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1iWwVK2_wWr" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_wWg" role="jymVt">
+      <property role="TrG5h" value="BRIGHTGRAY" />
+      <node concept="3Tm1VV" id="1iWwVK2_wWh" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_wWi" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_wWj" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_wWk" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="1iWwVK2_wWl" role="37wK5m">
+            <property role="2noCCI" value="BA" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_wWm" role="37wK5m">
+            <property role="2noCCI" value="BA" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_wWn" role="37wK5m">
+            <property role="2noCCI" value="BA" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="1iWwVK2_wWo" role="lGtFl">
+        <node concept="TZ5HA" id="1iWwVK2_wWp" role="TZ5H$">
+          <node concept="1dT_AC" id="1iWwVK2_wWq" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for CSS property, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1iWwVK2_wds" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_x2l" role="jymVt">
+      <property role="TrG5h" value="FG_PROPERTY_NAME" />
+      <node concept="3Tm1VV" id="1iWwVK2_x2m" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_x2n" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="1iWwVK2_x2o" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="1iWwVK2_x2p" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_x2q" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_x2r" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="1iWwVK2_DTk" role="37wK5m">
+            <ref role="3cqZAo" node="7LZcKzBFlnm" resolve="BLUE" />
+          </node>
+          <node concept="37vLTw" id="1iWwVK2_xse" role="37wK5m">
+            <ref role="3cqZAo" node="1iWwVK2_wWg" resolve="BRIGHTGRAY" />
+          </node>
+          <node concept="3uibUv" id="1iWwVK2_x2u" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="1iWwVK2_x2v" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1iWwVK2_wfA" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_Ba9" role="jymVt">
+      <property role="TrG5h" value="DARKGREEN" />
+      <node concept="3Tm1VV" id="1iWwVK2_Baa" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_Bab" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_Bac" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_Bad" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="1iWwVK2_Bae" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_Baf" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_Bag" role="37wK5m">
+            <property role="2noCCI" value="00" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="1iWwVK2_Bah" role="lGtFl">
+        <node concept="TZ5HA" id="1iWwVK2_Bai" role="TZ5H$">
+          <node concept="1dT_AC" id="1iWwVK2_Baj" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for CSS property value, default scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1iWwVK2_Ba8" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_Byu" role="jymVt">
+      <property role="TrG5h" value="CURRY" />
+      <node concept="3Tm1VV" id="1iWwVK2_Byv" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_Byw" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_Byx" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_Byy" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="1iWwVK2_Byz" role="37wK5m">
+            <property role="2noCCI" value="E8" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_By$" role="37wK5m">
+            <property role="2noCCI" value="BF" />
+          </node>
+          <node concept="2nou5x" id="1iWwVK2_By_" role="37wK5m">
+            <property role="2noCCI" value="6A" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="1iWwVK2_ByA" role="lGtFl">
+        <node concept="TZ5HA" id="1iWwVK2_ByB" role="TZ5H$">
+          <node concept="1dT_AC" id="1iWwVK2_ByC" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for CSS identifier, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1iWwVK2_Byt" role="jymVt" />
+    <node concept="Wx3nA" id="1iWwVK2_CSV" role="jymVt">
+      <property role="TrG5h" value="FG_KEYWORD" />
+      <node concept="3Tm1VV" id="1iWwVK2_CSW" role="1B3o_S" />
+      <node concept="3uibUv" id="1iWwVK2_CSX" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="1iWwVK2_CSY" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="1iWwVK2_CSZ" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="1iWwVK2_CT0" role="33vP2m">
+        <node concept="1pGfFk" id="1iWwVK2_CT1" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="1iWwVK2_DJn" role="37wK5m">
+            <ref role="3cqZAo" node="1iWwVK2_Ba9" resolve="DARKGREEN" />
+          </node>
+          <node concept="37vLTw" id="1iWwVK2_DOn" role="37wK5m">
+            <ref role="3cqZAo" node="1iWwVK2_Byu" resolve="CURRY" />
+          </node>
+          <node concept="3uibUv" id="1iWwVK2_CT4" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="1iWwVK2_CT5" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4aJUH_hW4Mc" role="jymVt">
+      <property role="TrG5h" value="DARKGRAY" />
+      <node concept="3Tm1VV" id="4aJUH_hW4Md" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hW4Me" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hW4Mf" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hW4Mg" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="4aJUH_hW4Mh" role="37wK5m">
+            <property role="2noCCI" value="3D" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hW4Mi" role="37wK5m">
+            <property role="2noCCI" value="3D" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hW4Mj" role="37wK5m">
+            <property role="2noCCI" value="3D" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="4aJUH_hW4Mk" role="lGtFl">
+        <node concept="TZ5HA" id="4aJUH_hW4Ml" role="TZ5H$">
+          <node concept="1dT_AC" id="4aJUH_hW4Mm" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for Doc comment tag, default scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4aJUH_hW4Mb" role="jymVt" />
+    <node concept="Wx3nA" id="4aJUH_hW4M0" role="jymVt">
+      <property role="TrG5h" value="BRICK" />
+      <node concept="3Tm1VV" id="4aJUH_hW4M1" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hW4M2" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hW4M3" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hW4M4" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="4aJUH_hW4M5" role="37wK5m">
+            <property role="2noCCI" value="8A" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hW4M6" role="37wK5m">
+            <property role="2noCCI" value="65" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hW4M7" role="37wK5m">
+            <property role="2noCCI" value="3B" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="4aJUH_hW4M8" role="lGtFl">
+        <node concept="TZ5HA" id="4aJUH_hW4M9" role="TZ5H$">
+          <node concept="1dT_AC" id="4aJUH_hW4Ma" role="1dT_Ay">
+            <property role="1dT_AB" value="BG for Doc comment tag, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4aJUH_hW4LZ" role="jymVt" />
+    <node concept="Wx3nA" id="4aJUH_hW4LO" role="jymVt">
+      <property role="TrG5h" value="FG_TAG" />
+      <node concept="3Tm1VV" id="4aJUH_hW4LP" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hW4LQ" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="4aJUH_hW4LR" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="4aJUH_hW4LS" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hW4LT" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hW4LU" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="4aJUH_hW5oI" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hW4Mc" resolve="DARKGRAY" />
+          </node>
+          <node concept="37vLTw" id="4aJUH_hW5s8" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hW4M0" resolve="BRICK" />
+          </node>
+          <node concept="3uibUv" id="4aJUH_hW4LX" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="4aJUH_hW4LY" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4aJUH_hWVXT" role="jymVt" />
+    <node concept="Wx3nA" id="4aJUH_hWVXI" role="jymVt">
+      <property role="TrG5h" value="CERULEAN" />
+      <node concept="3Tm1VV" id="4aJUH_hWVXJ" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hWVXK" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hWVXL" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hWVXM" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="4aJUH_hWVXN" role="37wK5m">
+            <property role="2noCCI" value="4A" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hWVXO" role="37wK5m">
+            <property role="2noCCI" value="86" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hWVXP" role="37wK5m">
+            <property role="2noCCI" value="E8" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="4aJUH_hWVXQ" role="lGtFl">
+        <node concept="TZ5HA" id="4aJUH_hWVXR" role="TZ5H$">
+          <node concept="1dT_AC" id="4aJUH_hWVXS" role="1dT_Ay">
+            <property role="1dT_AB" value="FG for Kotlin Named argument, default scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4aJUH_hWVXH" role="jymVt" />
+    <node concept="Wx3nA" id="4aJUH_hWVXy" role="jymVt">
+      <property role="TrG5h" value="COBALT" />
+      <node concept="3Tm1VV" id="4aJUH_hWVXz" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hWVX$" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hWVX_" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hWVXA" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="4aJUH_hWVXB" role="37wK5m">
+            <property role="2noCCI" value="46" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hWVXC" role="37wK5m">
+            <property role="2noCCI" value="7C" />
+          </node>
+          <node concept="2nou5x" id="4aJUH_hWVXD" role="37wK5m">
+            <property role="2noCCI" value="DA" />
+          </node>
+        </node>
+      </node>
+      <node concept="z59LJ" id="4aJUH_hWVXE" role="lGtFl">
+        <node concept="TZ5HA" id="4aJUH_hWVXF" role="TZ5H$">
+          <node concept="1dT_AC" id="4aJUH_hWVXG" role="1dT_Ay">
+            <property role="1dT_AB" value="BG for Kotlin Named argument, dark scheme" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4aJUH_hWVXx" role="jymVt" />
+    <node concept="Wx3nA" id="4aJUH_hWVXm" role="jymVt">
+      <property role="TrG5h" value="FG_OPTIONAL" />
+      <node concept="3Tm1VV" id="4aJUH_hWVXn" role="1B3o_S" />
+      <node concept="3uibUv" id="4aJUH_hWVXo" role="1tU5fm">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="4aJUH_hWVXp" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+        <node concept="3uibUv" id="4aJUH_hWVXq" role="11_B2D">
+          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4aJUH_hWVXr" role="33vP2m">
+        <node concept="1pGfFk" id="4aJUH_hWVXs" role="2ShVmc">
+          <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+          <node concept="37vLTw" id="4aJUH_hWWwd" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hWVXI" resolve="CERULEAN" />
+          </node>
+          <node concept="37vLTw" id="4aJUH_hWWzD" role="37wK5m">
+            <ref role="3cqZAo" node="4aJUH_hWVXy" resolve="COBALT" />
+          </node>
+          <node concept="3uibUv" id="4aJUH_hWVXv" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+          <node concept="3uibUv" id="4aJUH_hWVXw" role="1pMfVU">
+            <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4bWqD4C7rFE" role="jymVt" />
   </node>
   <node concept="IW6AY" id="4hPXq9Jm69G">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="aqKnT" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="1Qtc8_" id="4hPXq9Jm69H" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm69I" role="1Qtc8$">
@@ -1980,7 +2581,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9Jm6cb">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <ref role="aqKnT" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
     <node concept="1Qtc8_" id="4hPXq9Jm6cc" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cd" role="1Qtc8$">
@@ -2059,7 +2660,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9Jm6cS">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <ref role="aqKnT" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     <node concept="1Qtc8_" id="4hPXq9Jm6cT" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cU" role="1Qtc8$">
@@ -2146,7 +2747,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="5NAQwIkRIYW">
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <ref role="1XX52x" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
     <node concept="3EZMnI" id="5NAQwIkRIYY" role="2wV5jI">
       <node concept="3F0A7n" id="5NAQwIkRIYZ" role="3EZMnx">
@@ -2173,6 +2774,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="428_4iYhwbX">
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="1XX52x" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
     <node concept="3EZMnI" id="428_4iYhAer" role="2wV5jI">
       <node concept="3F1sOY" id="5WBVN_MJfMF" role="3EZMnx">
@@ -2182,6 +2784,7 @@
     </node>
   </node>
   <node concept="3p36aQ" id="428_4iYij2I">
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="aqKnT" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
     <node concept="3ft5Ry" id="428_4iYij2V" role="3ft7WO">
       <ref role="4PJHt" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
@@ -2214,6 +2817,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="5WBVN_MJ50z">
+    <property role="3GE5qa" value="logical.item" />
     <ref role="1XX52x" to="5j4j:5WBVN_MJ50y" resolve="ListLiteral" />
     <node concept="3EZMnI" id="5WBVN_MJ50C" role="2wV5jI">
       <node concept="3F0ifn" id="5WBVN_MJ50D" role="3EZMnx">
@@ -2245,8 +2849,8 @@
     </node>
   </node>
   <node concept="24kQdi" id="5WBVN_MPIur">
-    <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:5WBVN_MESCN" resolve="TreeFormLiteral" />
+    <property role="3GE5qa" value="logical.item" />
+    <ref role="1XX52x" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
     <node concept="3EZMnI" id="5WBVN_MPIuK" role="2wV5jI">
       <ref role="1k5W1q" node="7ksQUDZtGfa" resolve="Value" />
       <node concept="3Xmtl4" id="5WBVN_MPIuL" role="3F10Kt">
@@ -2290,7 +2894,7 @@
   </node>
   <node concept="24kQdi" id="28ktUhrjpi3">
     <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:28ktUhrjnwn" resolve="ValueOfLogicalExpression" />
+    <ref role="1XX52x" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
     <node concept="3EZMnI" id="28ktUhrjpi5" role="2wV5jI">
       <node concept="PMmxH" id="28ktUhrjpic" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
@@ -2311,7 +2915,8 @@
     </node>
   </node>
   <node concept="24kQdi" id="49obaclcC1Y">
-    <ref role="1XX52x" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="1XX52x" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
     <node concept="3EZMnI" id="49obaclcC20" role="2wV5jI">
       <node concept="3F1sOY" id="49obaclcC27" role="3EZMnx">
         <ref role="1NtTu8" to="5j4j:49obaclcanY" resolve="logical" />
@@ -2320,7 +2925,8 @@
     </node>
   </node>
   <node concept="3p36aQ" id="49obaclcHw$">
-    <ref role="aqKnT" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="aqKnT" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
     <node concept="3N5dw7" id="7XmdqtdNMLp" role="3ft7WO">
       <node concept="3N5aqt" id="7XmdqtdNMLq" role="3Na0zg">
         <node concept="3clFbS" id="7XmdqtdNMLr" role="2VODD2">
@@ -2328,12 +2934,12 @@
             <node concept="3cpWsn" id="7XmdqtdNSAD" role="3cpWs9">
               <property role="TrG5h" value="le" />
               <node concept="3Tqbb2" id="7XmdqtdNSAB" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
               </node>
               <node concept="2ShNRf" id="7XmdqtdNSAE" role="33vP2m">
                 <node concept="3zrR0B" id="7XmdqtdNSAF" role="2ShVmc">
                   <node concept="3Tqbb2" id="7XmdqtdNSAG" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                    <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
                   </node>
                 </node>
               </node>
@@ -2427,19 +3033,19 @@
         </node>
       </node>
       <node concept="3eGOop" id="4hPXq9Jmev8" role="2$S_pN">
-        <ref role="3EoQqy" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+        <ref role="3EoQqy" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
         <node concept="ucgPf" id="4hPXq9Jmev9" role="3aKz83">
           <node concept="3clFbS" id="4hPXq9Jmeva" role="2VODD2">
             <node concept="3cpWs8" id="4hPXq9Jmevb" role="3cqZAp">
               <node concept="3cpWsn" id="4hPXq9Jmevc" role="3cpWs9">
                 <property role="TrG5h" value="lew" />
                 <node concept="3Tqbb2" id="4hPXq9Jmevd" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                  <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
                 </node>
                 <node concept="2OqwBi" id="4hPXq9Jmeve" role="33vP2m">
                   <node concept="1rpKSd" id="4hPXq9JmevB" role="2Oq$k0" />
                   <node concept="15TzpJ" id="4hPXq9Jmevg" role="2OqNvi">
-                    <ref role="I8UWU" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                    <ref role="I8UWU" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
                   </node>
                 </node>
               </node>
@@ -2486,7 +3092,12 @@
                   </node>
                 </node>
                 <node concept="2oxUTD" id="4hPXq9Jmevz" role="2OqNvi">
-                  <node concept="2ZBlsa" id="4hPXq9JmevD" role="2oxUTC" />
+                  <node concept="1PxgMI" id="5p9vXslDvLi" role="2oxUTC">
+                    <node concept="chp4Y" id="5p9vXslDwbv" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                    </node>
+                    <node concept="2ZBlsa" id="4hPXq9JmevD" role="1m5AlR" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -2511,5 +3122,735 @@
       <ref role="2ZyFGn" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="24kQdi" id="JOGAOsxiLE">
+    <property role="3GE5qa" value="dataform.constructor.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="dataform.constructor.feature" />
+    <ref role="1h_SK9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
+      <property role="1hAc7j" value="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="dataform.constructor.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="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="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="dataform.constructor.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="dataform.constructor" />
+    <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 concept="ljvvj" id="1L74NXFNj7v" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+            <node concept="3nzxsE" id="1L74NXFOUM5" role="3n$kyP">
+              <node concept="3clFbS" id="1L74NXFOUM6" role="2VODD2">
+                <node concept="3clFbF" id="1L74NXFOUWS" role="3cqZAp">
+                  <node concept="3eOSWO" id="1L74NXFP2wG" role="3clFbG">
+                    <node concept="3cmrfG" id="1L74NXFP2wM" role="3uHU7w">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="2OqwBi" id="1L74NXFOXiD" role="3uHU7B">
+                      <node concept="2OqwBi" id="1L74NXFOV8F" role="2Oq$k0">
+                        <node concept="pncrf" id="1L74NXFOUWR" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="1L74NXFOVBn" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                        </node>
+                      </node>
+                      <node concept="34oBXx" id="1L74NXFP0h0" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </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="tppnM" id="1L74NXFPoKM" role="sWeuL">
+            <node concept="ljvvj" id="1L74NXFPoKV" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+              <node concept="3nzxsE" id="4bWqD4CgyAD" role="3n$kyP">
+                <node concept="3clFbS" id="4bWqD4CgyAE" role="2VODD2">
+                  <node concept="3clFbF" id="4bWqD4CgyHR" role="3cqZAp">
+                    <node concept="3eOSWO" id="4bWqD4CgEAp" role="3clFbG">
+                      <node concept="3cmrfG" id="4bWqD4CgEAv" role="3uHU7w">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="2OqwBi" id="4bWqD4Cg_p8" role="3uHU7B">
+                        <node concept="2OqwBi" id="4bWqD4CgyVA" role="2Oq$k0">
+                          <node concept="pncrf" id="4bWqD4CgyHQ" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="4bWqD4Cgzzg" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                          </node>
+                        </node>
+                        <node concept="34oBXx" id="4bWqD4CgCks" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </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 concept="pVoyu" id="1L74NXFNj5N" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+            <node concept="3nzxsE" id="1L74NXFP31o" role="3n$kyP">
+              <node concept="3clFbS" id="1L74NXFP31p" role="2VODD2">
+                <node concept="3clFbF" id="1L74NXFP3eX" role="3cqZAp">
+                  <node concept="3eOSWO" id="1L74NXFPaP5" role="3clFbG">
+                    <node concept="3cmrfG" id="1L74NXFPaPb" role="3uHU7w">
+                      <property role="3cmrfH" value="2" />
+                    </node>
+                    <node concept="2OqwBi" id="1L74NXFP5$I" role="3uHU7B">
+                      <node concept="2OqwBi" id="1L74NXFP3qK" role="2Oq$k0">
+                        <node concept="pncrf" id="1L74NXFP3eW" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="1L74NXFP3Ts" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
+                        </node>
+                      </node>
+                      <node concept="34oBXx" id="1L74NXFP8_p" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Bsynf" id="1L74NXFNylb" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+    </node>
+  </node>
+  <node concept="3p36aQ" id="JOGAOsxYtS">
+    <property role="3GE5qa" value="dataform.constructor" />
+    <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="dataform.constructor" />
+    <ref role="aqKnT" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <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="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="3y3z36" id="7c96q9tzR0_" role="3clFbG">
+                          <node concept="7Obwk" id="7c96q9tzR0A" role="3uHU7w" />
+                          <node concept="37vLTw" id="7c96q9tzR0B" role="3uHU7B">
+                            <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
+                          </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="dataform.constructor" />
+    <ref role="1XX52x" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
+      <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="dataform.constructor" />
+    <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="dataform.constructor" />
+    <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">
+      <property role="TrG5h" value="RuleKeyword" />
+      <node concept="3Xmtl4" id="4aJUH_hW3bF" role="3F10Kt">
+        <node concept="1wgc9g" id="4aJUH_hW5PN" role="3XvnJa">
+          <ref role="1wgcnl" to="tpen:aeM1BF$Ozh" />
+        </node>
+      </node>
+      <node concept="VechU" id="4aJUH_hW5$h" role="3F10Kt">
+        <node concept="mot77" id="4aJUH_hW5$m" role="VblUZ">
+          <node concept="3clFbS" id="4aJUH_hW5$n" role="2VODD2">
+            <node concept="3clFbF" id="4aJUH_hW5CY" role="3cqZAp">
+              <node concept="10M0yZ" id="5yqFHXovg0f" role="3clFbG">
+                <ref role="3cqZAo" node="4aJUH_hW4LO" resolve="FG_TAG" />
+                <ref role="1PxDUh" node="7ksQUDZtHks" resolve="CustomColors" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="14StLt" id="4bWqD4C9OIl" role="V601i">
+      <property role="TrG5h" value="TermFeatureOverride" />
+      <node concept="VechU" id="4bWqD4C9OIm" role="3F10Kt">
+        <node concept="mot77" id="4bWqD4C9OIn" role="VblUZ">
+          <node concept="3clFbS" id="4bWqD4C9OIo" role="2VODD2">
+            <node concept="3clFbF" id="4bWqD4C9OIp" role="3cqZAp">
+              <node concept="10M0yZ" id="5yqFHXovg0i" role="3clFbG">
+                <ref role="3cqZAo" node="4aJUH_hWVXm" resolve="FG_OPTIONAL" />
+                <ref role="1PxDUh" node="7ksQUDZtHks" resolve="CustomColors" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="14StLt" id="4bWqD4C2vDI" role="V601i">
+      <property role="TrG5h" value="Term" />
+      <node concept="Vb9p2" id="3IIf9O_CN_$" role="3F10Kt">
+        <property role="Vbekb" value="ITALIC" />
+      </node>
+      <node concept="1X3_iC" id="4bWqD4C9OHF" role="lGtFl">
+        <property role="3V$3am" value="styleItem" />
+        <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
+        <node concept="VechU" id="4bWqD4C7tOo" role="8Wnug">
+          <node concept="mot77" id="4bWqD4C7tOp" role="VblUZ">
+            <node concept="3clFbS" id="4bWqD4C7tOq" role="2VODD2">
+              <node concept="3clFbF" id="4bWqD4C7tOr" role="3cqZAp">
+                <node concept="10M0yZ" id="5yqFHXovg0o" role="3clFbG">
+                  <ref role="3cqZAo" node="4bWqD4C7sc7" resolve="FG_TERM" />
+                  <ref role="1PxDUh" node="7ksQUDZtHks" resolve="CustomColors" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lt0LtQg3vn">
+    <property role="3GE5qa" value="logical.item" />
+    <ref role="1XX52x" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
+    <node concept="3EZMnI" id="7lt0LtQg3vp" role="2wV5jI">
+      <node concept="3EZMnI" id="7lt0LtQg3vq" role="3EZMnx">
+        <ref role="1k5W1q" node="7ksQUDZuyMD" resolve="Backquote" />
+        <node concept="VPM3Z" id="7lt0LtQg3vr" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3vyZuw" id="7lt0LtQg3vs" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="1Bsynf" id="7lt0LtQg3vt" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1Bt7hp" id="7lt0LtQg3vu" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F1sOY" id="7lt0LtQg3vy" role="3EZMnx">
+          <ref role="1NtTu8" to="5j4j:7lt0LtQg3vl" resolve="code" />
+          <node concept="11L4FC" id="7lt0LtQg3vz" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="11LMrY" id="7lt0LtQg3v$" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="7lt0LtQg3vC" role="2iSdaV" />
+      </node>
+      <node concept="l2Vlx" id="7lt0LtQg3vD" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
index 9a329b50..fe07572d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -98,6 +98,10 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <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="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
@@ -120,6 +124,8 @@
       <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" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -132,9 +138,9 @@
     </language>
   </registry>
   <node concept="3dkpOd" id="6dMt3c55sJy">
-    <property role="3GE5qa" value="treeform" />
-    <property role="TrG5h" value="Node_splice" />
-    <ref role="2ZfgGC" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="DataForm_splice" />
+    <ref role="2ZfgGC" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
     <node concept="2S6ZIM" id="6dMt3c55sJz" role="2ZfVej">
       <node concept="3clFbS" id="6dMt3c55sJ$" role="2VODD2">
         <node concept="3clFbF" id="6dMt3c55vc4" role="3cqZAp">
@@ -155,9 +161,7 @@
         <node concept="3cpWs8" id="6dMt3c55Va_" role="3cqZAp">
           <node concept="3cpWsn" id="6dMt3c55VaA" role="3cpWs9">
             <property role="TrG5h" value="attr" />
-            <node concept="3uibUv" id="6dMt3c55Va$" role="1tU5fm">
-              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-            </node>
+            <node concept="3Tqbb2" id="5p9vXslDtup" role="1tU5fm" />
             <node concept="2OqwBi" id="6dMt3c55VaB" role="33vP2m">
               <node concept="2JrnkZ" id="6dMt3c55VaC" role="2Oq$k0">
                 <node concept="2OqwBi" id="6dMt3c55VaD" role="2JrQYb">
@@ -188,8 +192,13 @@
               </node>
             </node>
             <node concept="2oxUTD" id="6dMt3c55VCu" role="2OqNvi">
-              <node concept="37vLTw" id="6dMt3c55VD_" role="2oxUTC">
-                <ref role="3cqZAo" node="6dMt3c55VaA" resolve="attr" />
+              <node concept="1PxgMI" id="5p9vXslDuCZ" role="2oxUTC">
+                <node concept="chp4Y" id="5p9vXslDuGG" role="3oSUPX">
+                  <ref role="cht4Q" to="5j4j:dfChU1zo4B" resolve="Splice" />
+                </node>
+                <node concept="37vLTw" id="6dMt3c55VD_" role="1m5AlR">
+                  <ref role="3cqZAo" node="6dMt3c55VaA" resolve="attr" />
+                </node>
               </node>
             </node>
           </node>
@@ -230,8 +239,8 @@
     </node>
   </node>
   <node concept="2S6QgY" id="1_iD3HA2fYt">
-    <property role="3GE5qa" value="treeform" />
-    <property role="TrG5h" value="Node_unsplice" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="DataForm_unsplice" />
     <ref role="2ZfgGC" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="2S6ZIM" id="1_iD3HA2fYu" role="2ZfVej">
       <node concept="3clFbS" id="1_iD3HA2fYv" role="2VODD2">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index 3bd1ab0c..ce36087e 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -20,31 +20,11 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <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="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
       <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" />
@@ -54,53 +34,19 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </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>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
       <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
@@ -120,74 +66,17 @@
         <property id="6478870542308703667" name="caption" index="3tTeZt" />
         <reference id="6478870542308703669" name="decl" index="3tTeZr" />
       </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
+      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH" />
       <concept id="6478870542308871428" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.StringPropertyInstance" flags="ig" index="3tYpXE">
         <property id="6478870542308871429" name="value" index="3tYpXF" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-      </concept>
-      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
-        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-      </concept>
-      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
-        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
-        <child id="8182547171709752112" name="expression" index="36biLW" />
-      </concept>
-    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
         <property id="2034914114981261751" name="severity" index="RRSoG" />
         <child id="2034914114981261753" name="message" index="RRSoy" />
       </concept>
     </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="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="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </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>
-      <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="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>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -198,22 +87,6 @@
         <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <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="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435807" name="elementType" index="HW$YZ" />
-        <child id="1237731803878" name="copyFrom" index="I$8f6" />
-      </concept>
-      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
-    </language>
   </registry>
   <node concept="3SyAh_" id="5NAQwIkSyC5">
     <property role="qMTe8" value="0" />
@@ -234,7 +107,6 @@
     <node concept="2tJIrI" id="5NAQwIkSyCa" role="jymVt" />
     <node concept="3tYpMH" id="5NAQwIkSz2Q" role="jymVt">
       <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
       <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
       <node concept="3Tm1VV" id="5NAQwIkSz2S" role="1B3o_S" />
       <node concept="10P_77" id="5NAQwIkSz2T" role="1tU5fm" />
@@ -251,241 +123,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="5NAQwIkSyCf" role="1B3o_S" />
       <node concept="3clFbS" id="5NAQwIkSyCh" role="3clF47">
-        <node concept="3cpWs8" id="6DOfTm$AbnK" role="3cqZAp">
-          <node concept="3cpWsn" id="6DOfTm$AbnL" role="3cpWs9">
-            <property role="TrG5h" value="instances" />
-            <node concept="_YKpA" id="6DOfTm$AbnM" role="1tU5fm">
-              <node concept="3uibUv" id="6DOfTm$AbnN" role="_ZDj9">
-                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6DOfTm$AbnO" role="33vP2m">
-              <node concept="Tc6Ow" id="6DOfTm$AbnP" role="2ShVmc">
-                <node concept="3uibUv" id="6DOfTm$AbnQ" role="HW$YZ">
-                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                </node>
-                <node concept="2OqwBi" id="6DOfTm$AbnR" role="I$8f6">
-                  <node concept="2YIFZM" id="6DOfTm$AbnS" role="2Oq$k0">
-                    <ref role="37wK5l" to="lui2:~FindUsagesFacade.getInstance():org.jetbrains.mps.openapi.module.FindUsagesFacade" resolve="getInstance" />
-                    <ref role="1Pybhc" to="lui2:~FindUsagesFacade" resolve="FindUsagesFacade" />
-                  </node>
-                  <node concept="liA8E" id="6DOfTm$AbnT" role="2OqNvi">
-                    <ref role="37wK5l" to="lui2:~FindUsagesFacade.findInstances(org.jetbrains.mps.openapi.module.SearchScope,java.util.Set,boolean,org.jetbrains.mps.openapi.util.ProgressMonitor):java.util.Set" resolve="findInstances" />
-                    <node concept="2ShNRf" id="6DOfTm$AbnU" role="37wK5m">
-                      <node concept="1pGfFk" id="6DOfTm$AbnV" role="2ShVmc">
-                        <ref role="37wK5l" to="mte5:~ModulesScope.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule...)" resolve="ModulesScope" />
-                        <node concept="37vLTw" id="6DOfTm$AbnW" role="37wK5m">
-                          <ref role="3cqZAo" node="5NAQwIkSyCj" resolve="m" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2YIFZM" id="6DOfTm$AbnX" role="37wK5m">
-                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                      <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object):java.util.Set" resolve="singleton" />
-                      <node concept="35c_gC" id="6DOfTm$AbnY" role="37wK5m">
-                        <ref role="35c_gD" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                      </node>
-                    </node>
-                    <node concept="3clFbT" id="6DOfTm$AbnZ" role="37wK5m">
-                      <property role="3clFbU" value="false" />
-                    </node>
-                    <node concept="2ShNRf" id="6DOfTm$Abo0" role="37wK5m">
-                      <node concept="1pGfFk" id="6DOfTm$Abo1" role="2ShVmc">
-                        <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="5NAQwIkSCCc" role="3cqZAp">
-          <node concept="3clFbS" id="5NAQwIkSCCf" role="2LFqv$">
-            <node concept="3cpWs8" id="428_4iYaiuN" role="3cqZAp">
-              <node concept="3cpWsn" id="428_4iYaiuO" role="3cpWs9">
-                <property role="TrG5h" value="cr" />
-                <node concept="3Tqbb2" id="428_4iYaiuL" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                </node>
-                <node concept="1PxgMI" id="428_4iYaiuP" role="33vP2m">
-                  <property role="1BlNFB" value="true" />
-                  <node concept="chp4Y" id="428_4iYaiuQ" role="3oSUPX">
-                    <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                  </node>
-                  <node concept="37vLTw" id="428_4iYaiuR" role="1m5AlR">
-                    <ref role="3cqZAo" node="5NAQwIkSCCg" resolve="inst" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="5NAQwIkSQga" role="3cqZAp">
-              <node concept="3cpWsn" id="5NAQwIkSQgb" role="3cpWs9">
-                <property role="TrG5h" value="contents" />
-                <node concept="2I9FWS" id="5NAQwIkSQg4" role="1tU5fm">
-                  <ref role="2I9WkF" to="5j4j:5lJXKARS0" resolve="TreeForm" />
-                </node>
-                <node concept="2OqwBi" id="5NAQwIkSQgc" role="33vP2m">
-                  <node concept="37vLTw" id="428_4iYaiuS" role="2Oq$k0">
-                    <ref role="3cqZAo" node="428_4iYaiuO" resolve="cr" />
-                  </node>
-                  <node concept="3Tsc0h" id="5NAQwIkSQgg" role="2OqNvi">
-                    <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="428_4iYakSQ" role="3cqZAp">
-              <node concept="3cpWsn" id="428_4iYakSR" role="3cpWs9">
-                <property role="TrG5h" value="attrsCopy" />
-                <node concept="2I9FWS" id="428_4iYakSJ" role="1tU5fm">
-                  <ref role="2I9WkF" to="tpck:4uZwTti3_$T" resolve="Attribute" />
-                </node>
-                <node concept="2ShNRf" id="428_4iYb8nV" role="33vP2m">
-                  <node concept="Tc6Ow" id="428_4iYb8Cp" role="2ShVmc">
-                    <node concept="2OqwBi" id="428_4iYakSS" role="I$8f6">
-                      <node concept="37vLTw" id="428_4iYakST" role="2Oq$k0">
-                        <ref role="3cqZAo" node="428_4iYaiuO" resolve="cr" />
-                      </node>
-                      <node concept="3Tsc0h" id="428_4iYakSU" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="5NAQwIkSEDe" role="3cqZAp">
-              <node concept="3clFbS" id="5NAQwIkSEDg" role="3clFbx">
-                <node concept="3cpWs8" id="428_4iYb9IT" role="3cqZAp">
-                  <node concept="3cpWsn" id="428_4iYb9IU" role="3cpWs9">
-                    <property role="TrG5h" value="lr" />
-                    <node concept="3Tqbb2" id="428_4iYb9IN" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-                    </node>
-                    <node concept="2OqwBi" id="428_4iYb9IV" role="33vP2m">
-                      <node concept="37vLTw" id="428_4iYb9IW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5NAQwIkSCCg" resolve="inst" />
-                      </node>
-                      <node concept="1P9Npp" id="428_4iYb9IX" role="2OqNvi">
-                        <node concept="2pJPEk" id="428_4iYb9IY" role="1P9ThW">
-                          <node concept="2pJPED" id="428_4iYb9IZ" role="2pJPEn">
-                            <ref role="2pJxaS" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-                            <node concept="2pJxcG" id="428_4iYb9J0" role="2pJxcM">
-                              <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                              <node concept="2OqwBi" id="428_4iYb9J1" role="2pJxcZ">
-                                <node concept="37vLTw" id="428_4iYb9J2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="428_4iYaiuO" resolve="cr" />
-                                </node>
-                                <node concept="3TrcHB" id="428_4iYb9J3" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2pIpSj" id="428_4iYb9J4" role="2pJxcM">
-                              <ref role="2pIpSl" to="5j4j:5NAQwIkRIYU" resolve="list" />
-                              <node concept="36biLy" id="428_4iYb9J5" role="2pJxcZ">
-                                <node concept="2OqwBi" id="428_4iYb9J6" role="36biLW">
-                                  <node concept="1PxgMI" id="428_4iYb9J7" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="chp4Y" id="428_4iYb9J8" role="3oSUPX">
-                                      <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                                    </node>
-                                    <node concept="2OqwBi" id="428_4iYb9J9" role="1m5AlR">
-                                      <node concept="37vLTw" id="428_4iYb9Ja" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5NAQwIkSQgb" resolve="contents" />
-                                      </node>
-                                      <node concept="1uHKPH" id="428_4iYb9Jb" role="2OqNvi" />
-                                    </node>
-                                  </node>
-                                  <node concept="3YRAZt" id="428_4iYb9Jc" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1DcWWT" id="428_4iYbbQV" role="3cqZAp">
-                  <node concept="3clFbS" id="428_4iYbbQY" role="2LFqv$">
-                    <node concept="3clFbF" id="5NAQwIkSYoL" role="3cqZAp">
-                      <node concept="2OqwBi" id="428_4iYbizq" role="3clFbG">
-                        <node concept="2OqwBi" id="428_4iYbgtN" role="2Oq$k0">
-                          <node concept="37vLTw" id="428_4iYb9Jd" role="2Oq$k0">
-                            <ref role="3cqZAo" node="428_4iYb9IU" resolve="lr" />
-                          </node>
-                          <node concept="3Tsc0h" id="428_4iYbgYz" role="2OqNvi">
-                            <ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="428_4iYbmog" role="2OqNvi">
-                          <node concept="2OqwBi" id="428_4iYbmNM" role="25WWJ7">
-                            <node concept="37vLTw" id="428_4iYbmzf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="428_4iYbbQZ" resolve="attr" />
-                            </node>
-                            <node concept="3YRAZt" id="428_4iYbnji" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWsn" id="428_4iYbbQZ" role="1Duv9x">
-                    <property role="TrG5h" value="attr" />
-                    <node concept="3Tqbb2" id="428_4iYbffS" role="1tU5fm">
-                      <ref role="ehGHo" to="tpck:4uZwTti3_$T" resolve="Attribute" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="428_4iYbbR4" role="1DdaDG">
-                    <ref role="3cqZAo" node="428_4iYakSR" resolve="attrsCopy" />
-                  </node>
-                </node>
-              </node>
-              <node concept="1Wc70l" id="5NAQwIkSPTZ" role="3clFbw">
-                <node concept="2OqwBi" id="5NAQwIkSWZp" role="3uHU7w">
-                  <node concept="2OqwBi" id="5NAQwIkSSqx" role="2Oq$k0">
-                    <node concept="2OqwBi" id="428_4iYajHV" role="2Oq$k0">
-                      <node concept="37vLTw" id="428_4iYajHW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="428_4iYaiuO" resolve="cr" />
-                      </node>
-                      <node concept="3Tsc0h" id="428_4iYajHX" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="1uHKPH" id="5NAQwIkSU_N" role="2OqNvi" />
-                  </node>
-                  <node concept="1mIQ4w" id="5NAQwIkSXD_" role="2OqNvi">
-                    <node concept="chp4Y" id="5NAQwIkSXYn" role="cj9EA">
-                      <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbC" id="5NAQwIkSOAD" role="3uHU7B">
-                  <node concept="2OqwBi" id="5NAQwIkSI4O" role="3uHU7B">
-                    <node concept="2OqwBi" id="428_4iYajkV" role="2Oq$k0">
-                      <node concept="37vLTw" id="428_4iYajkW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="428_4iYaiuO" resolve="cr" />
-                      </node>
-                      <node concept="3Tsc0h" id="428_4iYajkX" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="34oBXx" id="5NAQwIkSLUo" role="2OqNvi" />
-                  </node>
-                  <node concept="3cmrfG" id="5NAQwIkSOVN" role="3uHU7w">
-                    <property role="3cmrfH" value="1" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="5NAQwIkSCCg" role="1Duv9x">
-            <property role="TrG5h" value="inst" />
-            <node concept="3Tqbb2" id="5NAQwIkSE5a" role="1tU5fm" />
-          </node>
-          <node concept="37vLTw" id="5NAQwIkSCCl" role="1DdaDG">
-            <ref role="3cqZAo" node="6DOfTm$AbnL" resolve="instances" />
+        <node concept="RRSsy" id="5p9vXslWQ$k" role="3cqZAp">
+          <property role="RRSoG" value="error" />
+          <node concept="Xl_RD" id="5p9vXslWQ$l" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Extract_ListRole_from_ChildRole)" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 0382ba66..0f3ff073 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -2,15 +2,15 @@
 <model ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)">
   <persistence version="9" />
   <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <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)" 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">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -44,6 +44,7 @@
         <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>
@@ -70,91 +71,83 @@
     </language>
   </registry>
   <node concept="1TIwiD" id="6$jH9oLmUCq">
-    <property role="TrG5h" value="TreeFormExpression" />
+    <property role="TrG5h" value="DataNodeExpression" />
     <property role="EcuMT" value="7571593955706120730" />
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6$jH9oLmVNm" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="root" />
       <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7571593955706125526" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYC_">
     <property role="TrG5h" value="TermNode" />
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <property role="EcuMT" value="7571593955706137125" />
-    <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
+    <ref role="1TJDcQ" node="5lJXKARS0" resolve="DataNode" />
     <node concept="1TJgyj" id="6$jH9oLnyAp" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="role" />
       <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706284441" />
-      <ref role="20lvS9" node="6$jH9oLmYD_" resolve="Role" />
+      <ref role="20lvS9" node="6$jH9oLmYD_" resolve="RoleNode" />
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYD_">
-    <property role="TrG5h" value="Role" />
+    <property role="TrG5h" value="RoleNode" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <property role="EcuMT" value="7571593955706137189" />
-    <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
+    <ref role="1TJDcQ" node="5lJXKARS0" resolve="DataNode" />
     <node concept="PrWs8" id="6$jH9oLmYEr" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYEJ">
     <property role="TrG5h" value="ChildRole" />
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <property role="EcuMT" value="7571593955706137263" />
-    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="Role" />
+    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="6$jH9oLmYFB" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
       <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706137319" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYI0">
     <property role="TrG5h" value="ValueRole" />
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <property role="EcuMT" value="7571593955706137472" />
-    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="Role" />
+    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="6$jH9oLmYL8" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
       <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706137672" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYJ_">
     <property role="TrG5h" value="Value" />
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <property role="EcuMT" value="7571593955706137573" />
-    <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
+    <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
     <node concept="1TJgyi" id="6$jH9oLmYKA" role="1TKVEl">
       <property role="TrG5h" value="value" />
       <property role="IQ2nx" value="7571593955706137638" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
-  <node concept="1TIwiD" id="6$jH9oLnyB1">
-    <property role="TrG5h" value="Symbol" />
-    <property role="3GE5qa" value="treeform" />
-    <property role="EcuMT" value="7571593955706284481" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="6$jH9oLnyBN" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-  </node>
   <node concept="AxPO7" id="6dP_abdQnLY">
     <property role="TrG5h" value="NodeKind" />
     <property role="3lZH7k" value="derive_from_presentation" />
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
     <node concept="M4N5e" id="1dOf$WH0KX6" role="M5hS2">
       <property role="1uS6qo" value="inherit" />
@@ -173,29 +166,29 @@
     </node>
   </node>
   <node concept="1TIwiD" id="5lJXKARS0">
-    <property role="TrG5h" value="TreeForm" />
+    <property role="TrG5h" value="DataNode" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <property role="EcuMT" value="1503029989441024" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
   </node>
   <node concept="1TIwiD" id="2q_78a8W4yS">
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform" />
     <property role="TrG5h" value="Wildcard" />
     <property role="34LRSv" value="_" />
     <property role="EcuMT" value="2784663291567294648" />
-    <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
+    <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
   </node>
   <node concept="1TIwiD" id="7E86$tKsl45">
     <property role="TrG5h" value="LogicalItem" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.item" />
     <property role="EcuMT" value="8829335963591332101" />
   </node>
   <node concept="1TIwiD" id="7E86$tKt5sV">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.item" />
     <property role="TrG5h" value="ExpressionLogicalVariable" />
     <property role="EcuMT" value="8829335963591530299" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
@@ -208,7 +201,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="7E86$tKtfM3">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <property role="TrG5h" value="LogicalVariableDeclaration" />
     <property role="EcuMT" value="8829335963591572611" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
@@ -223,12 +216,12 @@
     </node>
   </node>
   <node concept="PlHQZ" id="7E86$tK$Rgo">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <property role="TrG5h" value="LogicalVariableScope" />
     <property role="EcuMT" value="8829335963593569304" />
   </node>
   <node concept="1TIwiD" id="7E86$tK_OxQ">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <property role="TrG5h" value="LogicalVariable" />
     <property role="EcuMT" value="8829335963593820278" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
@@ -247,7 +240,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1mP5b6jNC0S">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <property role="TrG5h" value="LogicalType" />
     <property role="34LRSv" value="logical" />
     <property role="EcuMT" value="1564179198502666296" />
@@ -261,8 +254,8 @@
   </node>
   <node concept="1TIwiD" id="dfChU1zo4B">
     <property role="TrG5h" value="Splice" />
-    <property role="3GE5qa" value="treeform" />
-    <property role="34LRSv" value="Node Expression" />
+    <property role="3GE5qa" value="dataform.expression" />
+    <property role="34LRSv" value="splice" />
     <property role="EcuMT" value="238586457668550951" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyj" id="dfChU1zo4I" role="1TKVEi">
@@ -274,8 +267,8 @@
     </node>
     <node concept="M6xJ_" id="dfChU1zo4C" role="lGtFl">
       <property role="Hh88m" value="splice" />
-      <node concept="trNpa" id="dfChU1zo4E" role="EQaZv">
-        <ref role="trN6q" node="5lJXKARS0" resolve="TreeForm" />
+      <node concept="trNpa" id="74q$MmS8dM9" role="EQaZv">
+        <ref role="trN6q" node="5yqFHXo6Ubn" resolve="DataForm" />
       </node>
       <node concept="tn0Fv" id="dfChU1zo4G" role="HhnKV">
         <property role="tnX3d" value="false" />
@@ -283,20 +276,20 @@
     </node>
   </node>
   <node concept="1TIwiD" id="1OShD0HAY6y">
-    <property role="3GE5qa" value="treeform" />
-    <property role="TrG5h" value="List" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="ListNode" />
     <property role="EcuMT" value="2105510410850132386" />
-    <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
+    <ref role="1TJDcQ" node="5lJXKARS0" resolve="DataNode" />
     <node concept="1TJgyj" id="1OShD0HAZ38" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
       <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="2105510410850136264" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="PlHQZ" id="75vUFrS_9Sg">
-    <property role="3GE5qa" value="constraint.variable" />
+    <property role="3GE5qa" value="logical.variable" />
     <property role="TrG5h" value="LogicalVariableDeclarationContainer" />
     <property role="EcuMT" value="8169506320648805904" />
     <node concept="1TJgyj" id="2E5lcNn8k3O" role="1TKVEi">
@@ -314,50 +307,30 @@
     </node>
   </node>
   <node concept="1TIwiD" id="7HUwyZb1HXL">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <property role="TrG5h" value="MultiLogicalType" />
     <property role="34LRSv" value="multiLogical" />
     <property role="EcuMT" value="8897567155605135217" />
     <ref role="1TJDcQ" node="1mP5b6jNC0S" resolve="LogicalType" />
   </node>
-  <node concept="1TIwiD" id="4sSe4$p4oOM">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="PatternLogicalVariable" />
-    <property role="EcuMT" value="5131913661993028914" />
-    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="4sSe4$p4oON" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="variable" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="5131913661993028915" />
-      <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariable" />
-    </node>
-    <node concept="1TJgyj" id="4sSe4$p4oOP" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="value" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="5131913661993028917" />
-      <ref role="20lvS9" node="7E86$tKsl45" resolve="LogicalItem" />
-    </node>
-    <node concept="asaX9" id="1mdVbTS8GIW" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="5NAQwIkRIXT">
     <property role="EcuMT" value="6694277639409954681" />
-    <property role="3GE5qa" value="role" />
+    <property role="3GE5qa" value="dataform.role" />
     <property role="TrG5h" value="ListRole" />
-    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="Role" />
+    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="5NAQwIkRIYU" role="1TKVEi">
       <property role="IQ2ns" value="6694277639409954746" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="list" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="1OShD0HAY6y" resolve="List" />
+      <ref role="20lvS9" node="1OShD0HAY6y" resolve="ListNode" />
     </node>
   </node>
   <node concept="1TIwiD" id="428_4iYhwbR">
     <property role="EcuMT" value="4650129638230983415" />
     <property role="TrG5h" value="ListExpression" />
     <property role="34LRSv" value="list" />
+    <property role="3GE5qa" value="dataform.expression" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="5WBVN_MJ9$7" role="1TKVEi">
       <property role="IQ2ns" value="6856711987712006407" />
@@ -369,34 +342,35 @@
   </node>
   <node concept="1TIwiD" id="5WBVN_MESCN">
     <property role="EcuMT" value="6856711987710888499" />
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="TreeFormLiteral" />
+    <property role="3GE5qa" value="logical.item" />
+    <property role="TrG5h" value="DataNodeLiteral" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MESCO" role="1TKVEi">
       <property role="IQ2ns" value="6856711987710888500" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="root" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="1TIwiD" id="5WBVN_MJ50y">
     <property role="EcuMT" value="6856711987711987746" />
     <property role="TrG5h" value="ListLiteral" />
     <property role="34LRSv" value="list" />
+    <property role="3GE5qa" value="logical.item" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MJ50Y" role="1TKVEi">
       <property role="IQ2ns" value="6856711987711987774" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="5lJXKARS0" resolve="TreeForm" />
+      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
   <node concept="1TIwiD" id="28ktUhrjnwn">
     <property role="EcuMT" value="2455719244613908503" />
     <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="ValueOfLogicalExpression" />
+    <property role="TrG5h" value="ValueOfExpression" />
     <property role="34LRSv" value="valueOf" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="28ktUhrjrp0" role="1TKVEi">
@@ -409,7 +383,8 @@
   </node>
   <node concept="1TIwiD" id="49obaclcan7">
     <property role="EcuMT" value="4780620083400582599" />
-    <property role="TrG5h" value="LogicalExpression" />
+    <property role="TrG5h" value="LogicalItemExpression" />
+    <property role="3GE5qa" value="logical.item.expression" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="49obaclcanY" role="1TKVEi">
       <property role="IQ2ns" value="4780620083400582654" />
@@ -418,5 +393,168 @@
       <ref role="20lvS9" node="7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
+  <node concept="1TIwiD" id="5yqFHXo6Ubn">
+    <property role="EcuMT" value="6384607696030245591" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="DataForm" />
+    <property role="R5$K7" value="true" />
+    <property role="R5$K2" value="false" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+  </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="dataform.constructor.feature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+  </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="dataform.constructor.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="aggregation" />
+      <property role="20kJfa" value="getter" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxTDl">
+    <property role="EcuMT" value="861509610434435669" />
+    <property role="3GE5qa" value="dataform.constructor.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="20lmBu" value="reference" />
+      <property role="20kJfa" value="feature" />
+      <property role="20lbJX" value="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="aggregation" />
+      <property role="20kJfa" value="getter" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxpXw">
+    <property role="EcuMT" value="861509610434305888" />
+    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="TrG5h" value="ListFeature" />
+    <property role="34LRSv" value="list" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+  </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="dataform.constructor.feature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+  </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="dataform.constructor" />
+    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
+    <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243078" />
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="decl" />
+      <property role="20lbJX" value="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="aggregation" />
+      <property role="20kJfa" value="override" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="JOGAOsxaC9">
+    <property role="EcuMT" value="861509610434243081" />
+    <property role="TrG5h" value="DataFormDeclaration" />
+    <property role="3GE5qa" value="dataform.constructor" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxaCc" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243084" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="template" />
+      <property role="20lbJX" value="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="20lmBu" value="reference" />
+      <property role="20kJfa" value="prototype" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+    </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="dataform.constructor" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434243105" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="contents" />
+      <property role="20lbJX" value="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>
+  <node concept="1TIwiD" id="JOGAOsxiLy">
+    <property role="EcuMT" value="861509610434276450" />
+    <property role="TrG5h" value="DataFormTemplate" />
+    <property role="3GE5qa" value="dataform.constructor" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
+      <property role="IQ2ns" value="861509610434276451" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="feature" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7lt0LtQg3tE">
+    <property role="EcuMT" value="8456919074574710634" />
+    <property role="TrG5h" value="ExpressionItem" />
+    <property role="34LRSv" value="expression" />
+    <property role="3GE5qa" value="logical.item" />
+    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
+    <node concept="1TJgyj" id="7lt0LtQg3vl" role="1TKVEi">
+      <property role="IQ2ns" value="8456919074574710741" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index a5ade3ab..42a16adc 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -2,6 +2,10 @@
 <model ref="r:63d079fa-4fab-4468-a2ee-4cf39ac1306b(jetbrains.mps.logic.typesystem)">
   <persistence version="9" />
   <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
@@ -224,6 +228,7 @@
   </registry>
   <node concept="1YbPZF" id="1pt0VTMFfZC">
     <property role="TrG5h" value="typeof_TreeFormExpression" />
+    <property role="3GE5qa" value="dataform.expression" />
     <node concept="3clFbS" id="1pt0VTMFg58" role="18ibNy">
       <node concept="3clFbJ" id="6YPNC4OxBT5" role="3cqZAp">
         <node concept="3clFbS" id="6YPNC4OxBT7" role="3clFbx">
@@ -231,7 +236,7 @@
             <node concept="mw_s8" id="6YPNC4OxD66" role="1ZfhKB">
               <node concept="2c44tf" id="6YPNC4OxD67" role="mwGJk">
                 <node concept="3uibUv" id="6YPNC4OxDfx" role="2c44tc">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
               </node>
             </node>
@@ -360,7 +365,7 @@
                 </node>
                 <node concept="1mIQ4w" id="6YPNC4P2P06" role="2OqNvi">
                   <node concept="chp4Y" id="6YPNC4P2P26" role="cj9EA">
-                    <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                    <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
                   </node>
                 </node>
               </node>
@@ -472,7 +477,7 @@
             </node>
             <node concept="1mIQ4w" id="6YPNC4OxKul" role="2OqNvi">
               <node concept="chp4Y" id="6YPNC4OxKwl" role="cj9EA">
-                <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="List" />
+                <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
               </node>
             </node>
           </node>
@@ -520,11 +525,11 @@
     </node>
     <node concept="1YaCAy" id="1pt0VTMFg5X" role="1YuTPh">
       <property role="TrG5h" value="tfe" />
-      <ref role="1YaFvo" to="5j4j:6$jH9oLmUCq" resolve="TreeFormExpression" />
+      <ref role="1YaFvo" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
     </node>
   </node>
   <node concept="2sgARr" id="1mP5b6jNJDj">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <property role="TrG5h" value="supertypesOf_LogicalType" />
     <node concept="3clFbS" id="1mP5b6jNJDk" role="2sgrp5">
       <node concept="3cpWs8" id="5f6wxQ39Kg4" role="3cqZAp">
@@ -660,7 +665,7 @@
   </node>
   <node concept="1YbPZF" id="2c3nq4GQw_E">
     <property role="TrG5h" value="typeof_LogicalVariableReference" />
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <node concept="3clFbS" id="2c3nq4GQw_F" role="18ibNy">
       <node concept="3clFbJ" id="7dgRGU4B5dx" role="3cqZAp">
         <node concept="3clFbS" id="7dgRGU4B5dz" role="3clFbx">
@@ -789,7 +794,7 @@
   </node>
   <node concept="1YbPZF" id="7dgRGU4$_5X">
     <property role="TrG5h" value="typeof_Splice" />
-    <property role="3GE5qa" value="treeform" />
+    <property role="3GE5qa" value="dataform.expression" />
     <node concept="3clFbS" id="7dgRGU4$_5Y" role="18ibNy">
       <node concept="3clFbJ" id="7dgRGU4$_64" role="3cqZAp">
         <node concept="3clFbS" id="7dgRGU4$_65" role="3clFbx">
@@ -989,7 +994,7 @@
     </node>
   </node>
   <node concept="2sgARr" id="7HUwyZb1IYy">
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.type" />
     <property role="TrG5h" value="supertypesOf_MultiLogicalType" />
     <node concept="3clFbS" id="7HUwyZb1IYz" role="2sgrp5">
       <node concept="3clFbF" id="7HUwyZb1IYI" role="3cqZAp">
@@ -1007,7 +1012,7 @@
   </node>
   <node concept="1YbPZF" id="2c3nq4GQKid">
     <property role="TrG5h" value="typeof_LogicalVariableDeclaration" />
-    <property role="3GE5qa" value="logical" />
+    <property role="3GE5qa" value="logical.variable" />
     <node concept="3clFbS" id="2c3nq4GQKie" role="18ibNy">
       <node concept="3clFbJ" id="7dgRGU4AfaF" role="3cqZAp">
         <node concept="3clFbS" id="7dgRGU4AfaH" role="3clFbx">
@@ -1118,6 +1123,7 @@
   </node>
   <node concept="1YbPZF" id="428_4iYhAjN">
     <property role="TrG5h" value="typeof_ListExpression" />
+    <property role="3GE5qa" value="dataform.expression" />
     <node concept="3clFbS" id="428_4iYhAjO" role="18ibNy">
       <node concept="1Z5TYs" id="428_4iYhACh" role="3cqZAp">
         <node concept="mw_s8" id="428_4iYhAC_" role="1ZfhKB">
@@ -1249,11 +1255,12 @@
     </node>
     <node concept="1YaCAy" id="28ktUhrEYSC" role="1YuTPh">
       <property role="TrG5h" value="vle" />
-      <ref role="1YaFvo" to="5j4j:28ktUhrjnwn" resolve="ValueOfLogicalExpression" />
+      <ref role="1YaFvo" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
     </node>
   </node>
   <node concept="1YbPZF" id="49obaclcIlr">
     <property role="TrG5h" value="typeof_LogicalExpression" />
+    <property role="3GE5qa" value="logical.item.expression" />
     <node concept="3clFbS" id="49obaclcIls" role="18ibNy">
       <node concept="1Z5TYs" id="49obaclcIIl" role="3cqZAp">
         <node concept="mw_s8" id="49obaclcIID" role="1ZfhKB">
@@ -1279,7 +1286,65 @@
     </node>
     <node concept="1YaCAy" id="49obaclcIlu" role="1YuTPh">
       <property role="TrG5h" value="le" />
-      <ref role="1YaFvo" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+      <ref role="1YaFvo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="7lt0LtQg3Cb">
+    <property role="TrG5h" value="typeof_ConstantExpressionItem" />
+    <property role="3GE5qa" value="logical.item" />
+    <node concept="3clFbS" id="7lt0LtQg3Cc" role="18ibNy">
+      <node concept="nvevp" id="7lt0LtQg3Hj" role="3cqZAp">
+        <node concept="3clFbS" id="7lt0LtQg3Hk" role="nvhr_">
+          <node concept="1Z5TYs" id="7lt0LtQg3Hl" role="3cqZAp">
+            <node concept="mw_s8" id="7lt0LtQg3Hm" role="1ZfhKB">
+              <node concept="2pJPEk" id="7lt0LtQg3Hn" role="mwGJk">
+                <node concept="2pJPED" id="7lt0LtQg3Ho" role="2pJPEn">
+                  <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
+                  <node concept="2pIpSj" id="7lt0LtQg3Hp" role="2pJxcM">
+                    <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                    <node concept="36biLy" id="7lt0LtQg3Hq" role="2pJxcZ">
+                      <node concept="1PxgMI" id="7lt0LtQg3Hr" role="36biLW">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="7lt0LtQg3Hs" role="3oSUPX">
+                          <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
+                        </node>
+                        <node concept="2X3wrD" id="7lt0LtQg3Ht" role="1m5AlR">
+                          <ref role="2X3Bk0" node="7lt0LtQg3H_" resolve="codeType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="mw_s8" id="7lt0LtQg3Hu" role="1ZfhK$">
+              <node concept="1Z2H0r" id="7lt0LtQg3Hv" role="mwGJk">
+                <node concept="1YBJjd" id="7lt0LtQg3Hw" role="1Z2MuG">
+                  <ref role="1YBMHb" node="7lt0LtQg3Ce" resolve="cei" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Z2H0r" id="7lt0LtQg3Hx" role="nvjzm">
+          <node concept="2OqwBi" id="7lt0LtQg3Hy" role="1Z2MuG">
+            <node concept="1YBJjd" id="7lt0LtQg3Hz" role="2Oq$k0">
+              <ref role="1YBMHb" node="7lt0LtQg3Ce" resolve="cei" />
+            </node>
+            <node concept="3TrEf2" id="7lt0LtQg3H$" role="2OqNvi">
+              <ref role="3Tt5mk" to="5j4j:7lt0LtQg3vl" resolve="code" />
+            </node>
+          </node>
+        </node>
+        <node concept="2X1qdy" id="7lt0LtQg3H_" role="2X0Ygz">
+          <property role="TrG5h" value="codeType" />
+          <node concept="2jxLKc" id="7lt0LtQg3HA" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7lt0LtQg3Ce" role="1YuTPh">
+      <property role="TrG5h" value="cei" />
+      <ref role="1YaFvo" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
     </node>
   </node>
 </model>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index 9113096a..f3007df1 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -2206,7 +2206,7 @@
     </node>
   </node>
   <node concept="312cEu" id="5JQSuNswOXL">
-    <property role="TrG5h" value="BranchNode" />
+    <property role="TrG5h" value="TermNode" />
     <node concept="3Tm1VV" id="5JQSuNswOXM" role="1B3o_S" />
     <node concept="3uibUv" id="5JQSuNswOY9" role="1zkMxy">
       <ref role="3uigEE" node="1msb0mq9ID4" resolve="DataNode" />
@@ -2224,7 +2224,7 @@
         <node concept="3clFbF" id="6YPNC4NI59Q" role="3cqZAp">
           <node concept="2ShNRf" id="6YPNC4NI59O" role="3clFbG">
             <node concept="1pGfFk" id="6YPNC4NI6eF" role="2ShVmc">
-              <ref role="37wK5l" node="6YPNC4NHOW5" resolve="BranchNode.Symbol" />
+              <ref role="37wK5l" node="6YPNC4NHOW5" resolve="TermNode.Symbol" />
               <node concept="37vLTw" id="6YPNC4NI6ih" role="37wK5m">
                 <ref role="3cqZAo" node="6YPNC4NI4Yl" resolve="arity" />
               </node>
@@ -2233,7 +2233,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6YPNC4NI3QL" role="3clF45">
-        <ref role="3uigEE" node="6YPNC4NHMTI" resolve="BranchNode.Symbol" />
+        <ref role="3uigEE" node="6YPNC4NHMTI" resolve="TermNode.Symbol" />
       </node>
       <node concept="3Tm1VV" id="6YPNC4NI2b6" role="1B3o_S" />
     </node>
@@ -2337,11 +2337,11 @@
           <node concept="3cpWsn" id="1R$Cm9qGVi$" role="3cpWs9">
             <property role="TrG5h" value="n" />
             <node concept="3uibUv" id="1R$Cm9qGVio" role="1tU5fm">
-              <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+              <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
             </node>
             <node concept="2ShNRf" id="1R$Cm9qGVi_" role="33vP2m">
               <node concept="1pGfFk" id="1R$Cm9qGViA" role="2ShVmc">
-                <ref role="37wK5l" node="5JQSuNswP2z" resolve="BranchNode" />
+                <ref role="37wK5l" node="5JQSuNswP2z" resolve="TermNode" />
                 <node concept="37vLTw" id="6$jH9oLdIkd" role="37wK5m">
                   <ref role="3cqZAo" node="6$jH9oLdIka" resolve="path" />
                 </node>
@@ -2389,7 +2389,7 @@
       </node>
       <node concept="3Tm1VV" id="5JQSuNsxh5a" role="1B3o_S" />
       <node concept="3uibUv" id="5JQSuNsxhdt" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="5JQSuNsxgYt" role="jymVt" />
@@ -2434,7 +2434,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6EZ0kf" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="1bm7a6EY4Ic" role="1B3o_S" />
       <node concept="3clFbS" id="1bm7a6EY4Ih" role="3clF47">
@@ -2518,7 +2518,7 @@
         <node concept="3clFbF" id="1bm7a6EY9N8" role="3cqZAp">
           <node concept="2YIFZM" id="1bm7a6EYa5i" role="3clFbG">
             <ref role="37wK5l" node="5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="TermNode" />
             <node concept="1rXfSq" id="1OShD0HEWkI" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
             </node>
@@ -2863,7 +2863,7 @@
         </node>
         <node concept="3clFbF" id="3OPtF02TEp9" role="3cqZAp">
           <node concept="2YIFZM" id="1OShD0HXM0v" role="3clFbG">
-            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="TermNode" />
             <ref role="37wK5l" node="5JQSuNsxhfn" resolve="create" />
             <node concept="1rXfSq" id="1OShD0HXM0w" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
@@ -2875,7 +2875,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1OShD0HXE6k" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="47nvOnTRJ2E" role="jymVt" />
@@ -3021,7 +3021,7 @@
             </node>
             <node concept="3y3z36" id="6YPNC4NIArB" role="3clFbw">
               <node concept="3VsKOn" id="6YPNC4NIBnW" role="3uHU7w">
-                <ref role="3VsUkX" node="6YPNC4NHMTI" resolve="BranchNode.Symbol" />
+                <ref role="3VsUkX" node="6YPNC4NHMTI" resolve="TermNode.Symbol" />
               </node>
               <node concept="2OqwBi" id="6YPNC4NI_Xm" role="3uHU7B">
                 <node concept="37vLTw" id="6YPNC4NI_UC" role="2Oq$k0">
@@ -3045,7 +3045,7 @@
                 <node concept="1eOMI4" id="6YPNC4NIGPn" role="2Oq$k0">
                   <node concept="10QFUN" id="6YPNC4NIGPk" role="1eOMHV">
                     <node concept="3uibUv" id="6YPNC4NIHqP" role="10QFUM">
-                      <ref role="3uigEE" node="6YPNC4NHMTI" resolve="BranchNode.Symbol" />
+                      <ref role="3uigEE" node="6YPNC4NHMTI" resolve="TermNode.Symbol" />
                     </node>
                     <node concept="37vLTw" id="6YPNC4NIHKa" role="10QFUP">
                       <ref role="3cqZAo" node="6YPNC4NHPNK" resolve="that" />
@@ -3313,7 +3313,7 @@
             <node concept="92FcH" id="6OUp3PsUjSh" role="qph3F">
               <node concept="TZ5HA" id="6OUp3PsUjSj" role="2XjZqd" />
               <node concept="VXe08" id="6OUp3PsUmmU" role="92FcQ">
-                <ref role="VXe09" node="5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="VXe09" node="5JQSuNswOXL" resolve="TermNode" />
               </node>
             </node>
           </node>
@@ -4378,7 +4378,7 @@
         <node concept="37vLTG" id="104EUzFOARI" role="3clF46">
           <property role="TrG5h" value="termNode" />
           <node concept="3uibUv" id="104EUzFOARJ" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
       </node>
@@ -4566,7 +4566,7 @@
           <node concept="37vLTG" id="6HT7BWBQcNP" role="3clF46">
             <property role="TrG5h" value="termNode" />
             <node concept="3uibUv" id="6HT7BWBQcNQ" role="1tU5fm">
-              <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+              <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
             </node>
           </node>
           <node concept="3clFbS" id="6HT7BWBQcNR" role="3clF47">
@@ -5091,7 +5091,7 @@
       <node concept="37vLTG" id="47nvOnTQNVL" role="3clF46">
         <property role="TrG5h" value="termNode" />
         <node concept="3uibUv" id="47nvOnTQNVM" role="1tU5fm">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="3clFbS" id="47nvOnTQNVR" role="3clF47">
@@ -5891,7 +5891,7 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="3OPtF03gFpS" role="3clF45">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
         </node>
         <node concept="3Tm1VV" id="3OPtF03gFks" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF03gFkt" role="3clF47" />
@@ -6229,7 +6229,7 @@
         <node concept="37vLTG" id="6YPNC4Pqhy6" role="3clF46">
           <property role="TrG5h" value="termNode" />
           <node concept="3uibUv" id="6YPNC4Pqhy7" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
         <node concept="2AHcQZ" id="6YPNC4Pqhyc" role="2AJF6D">
@@ -6307,7 +6307,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="3OPtF03hrNF" role="3clF45">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
         </node>
         <node concept="3Tm1VV" id="3OPtF03hrNH" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF03hrNJ" role="3clF47">
@@ -6351,7 +6351,7 @@
         <property role="TrG5h" value="result" />
         <node concept="3Tm6S6" id="3OPtF03htyA" role="1B3o_S" />
         <node concept="3uibUv" id="3OPtF03htIL" role="1tU5fm">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="312cEg" id="3OPtF03huAJ" role="jymVt">
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
similarity index 99%
rename from coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
rename to coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index ffaa6dda..cffee59a 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)">
+<model ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
@@ -13,7 +13,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
@@ -1737,7 +1737,7 @@
                       <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
                       <node concept="2ShNRf" id="_oAIrg3tHe" role="37wK5m">
                         <node concept="1pGfFk" id="_oAIrg3tHf" role="2ShVmc">
-                          <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                          <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                           <node concept="37vLTw" id="6HKur8$jCv_" role="37wK5m">
                             <ref role="3cqZAo" node="7d$oK1$qfYd" resolve="leftRepr" />
                           </node>
@@ -1955,7 +1955,7 @@
                   <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
                   <node concept="2ShNRf" id="_oAIrg3wr6" role="37wK5m">
                     <node concept="1pGfFk" id="_oAIrg3wr7" role="2ShVmc">
-                      <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                      <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                       <node concept="37vLTw" id="6HKur8$jCK9" role="37wK5m">
                         <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
                       </node>
@@ -1963,7 +1963,7 @@
                   </node>
                   <node concept="2ShNRf" id="_oAIrg3wRH" role="37wK5m">
                     <node concept="1pGfFk" id="_oAIrg3wRI" role="2ShVmc">
-                      <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                      <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                       <node concept="37vLTw" id="6HKur8$jD0Z" role="37wK5m">
                         <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
similarity index 70%
rename from coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
rename to coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
index 568d43c5..c4b2b723 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)">
+<model ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
@@ -7,17 +7,19 @@
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
+        <child id="1219921048460" name="componentType" index="8Xvag" />
+      </concept>
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -28,6 +30,13 @@
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1224500799915" name="jetbrains.mps.baseLanguage.structure.BitwiseXorExpression" flags="nn" index="pVQyQ" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
+        <child id="1173175577737" name="index" index="AHEQo" />
+        <child id="1173175590490" name="array" index="AHHXb" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -61,10 +70,12 @@
         <child id="1164903359218" name="catchBody" index="TDEfX" />
         <child id="1164903359217" name="throwable" index="TDEfY" />
       </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <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="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -76,7 +87,11 @@
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
+      </concept>
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -87,12 +102,23 @@
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <property id="1221565133444" name="isFinal" index="1EXbeo" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
+        <child id="1214996921760" name="bound" index="3ztrMU" />
+      </concept>
+      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
+        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
+      </concept>
+      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
+        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -130,7 +156,13 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -143,6 +175,8 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
+      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -157,6 +191,7 @@
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
@@ -169,7 +204,15 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
+        <child id="1184951007469" name="componentType" index="3$_nBY" />
+        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
+      </concept>
+      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
+        <child id="1184953288404" name="expression" index="3$I4v7" />
+      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -179,6 +222,13 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
+      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
+        <child id="1144231399730" name="condition" index="1Dwp0S" />
+        <child id="1144231408325" name="iteration" index="1Dwrff" />
+      </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
+        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
+      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -917,7 +967,7 @@
               <node concept="3eNFk2" id="5WBVN_M1CZI" role="3eNLev">
                 <node concept="2ZW3vV" id="5WBVN_M1Djq" role="3eO9$A">
                   <node concept="3uibUv" id="5WBVN_M1Dpb" role="2ZW6by">
-                    <ref role="3uigEE" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="3uigEE" node="5WBVN_M1BKE" resolve="LateExpression" />
                   </node>
                   <node concept="37vLTw" id="5WBVN_M1DbI" role="2ZW6bz">
                     <ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
@@ -928,13 +978,13 @@
                     <node concept="3cpWsn" id="5WBVN_M1J08" role="3cpWs9">
                       <property role="TrG5h" value="exp" />
                       <node concept="3uibUv" id="5WBVN_M1J02" role="1tU5fm">
-                        <ref role="3uigEE" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                        <ref role="3uigEE" node="5WBVN_M1BKE" resolve="LateExpression" />
                         <node concept="3qTvmN" id="5WBVN_M1J05" role="11_B2D" />
                       </node>
                       <node concept="1eOMI4" id="5WBVN_M1J09" role="33vP2m">
                         <node concept="10QFUN" id="5WBVN_M1J0a" role="1eOMHV">
                           <node concept="3uibUv" id="5WBVN_M1J0b" role="10QFUM">
-                            <ref role="3uigEE" to="yg8f:5WBVN_M1BKE" resolve="LateExpression" />
+                            <ref role="3uigEE" node="5WBVN_M1BKE" resolve="LateExpression" />
                             <node concept="3qTvmN" id="5WBVN_M1J0c" role="11_B2D" />
                           </node>
                           <node concept="37vLTw" id="5WBVN_M1J0d" role="10QFUP">
@@ -961,7 +1011,7 @@
                               <ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
                             </node>
                             <node concept="liA8E" id="5WBVN_M1GEA" role="2OqNvi">
-                              <ref role="37wK5l" to="yg8f:5WBVN_M1BSf" resolve="metaArgs" />
+                              <ref role="37wK5l" node="5WBVN_M1BSf" resolve="metaArgs" />
                             </node>
                           </node>
                         </node>
@@ -988,7 +1038,7 @@
                             <ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
                           </node>
                           <node concept="liA8E" id="5WBVN_M1JVL" role="2OqNvi">
-                            <ref role="37wK5l" to="yg8f:5WBVN_M1BLN" resolve="eval" />
+                            <ref role="37wK5l" node="5WBVN_M1BLN" resolve="eval" />
                             <node concept="37vLTw" id="6yUEjXvTvSG" role="37wK5m">
                               <ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
                             </node>
@@ -1016,9 +1066,9 @@
                     </node>
                     <node concept="liA8E" id="60zk4o6SxJ$" role="2OqNvi">
                       <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                      <node concept="2YIFZM" id="60zk4o6SxJ_" role="37wK5m">
-                        <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-                        <ref role="37wK5l" to="yg8f:4TCblo5NqWF" resolve="instantiateMetaLogicals" />
+                      <node concept="2YIFZM" id="74q$MmRB2bs" role="37wK5m">
+                        <ref role="37wK5l" node="4TCblo5NqWF" resolve="instantiateMetaLogicals" />
+                        <ref role="1Pybhc" node="677NV565N1x" resolve="LogicalUtil" />
                         <node concept="10QFUN" id="60zk4o6SxJA" role="37wK5m">
                           <node concept="3uibUv" id="60zk4o6SxJB" role="10QFUM">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
@@ -1844,5 +1894,787 @@
     </node>
     <node concept="2tJIrI" id="78CwJJcX5vW" role="jymVt" />
   </node>
+  <node concept="3HP615" id="qubcdtxBiR">
+    <property role="TrG5h" value="EvaluationTraceExt" />
+    <node concept="2tJIrI" id="qubcdtxBuI" role="jymVt" />
+    <node concept="Wx3nA" id="24Vro6cS5rK" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="NULL" />
+      <node concept="3Tm1VV" id="24Vro6cS5rM" role="1B3o_S" />
+      <node concept="2ShNRf" id="24Vro6cS5M$" role="33vP2m">
+        <node concept="HV5vD" id="15BaR5AeZD1" role="2ShVmc">
+          <ref role="HV5vE" node="15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="qubcdtxJQt" role="1tU5fm">
+        <ref role="3uigEE" node="qubcdtxBiR" resolve="EvaluationTraceExt" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="qubcdtxJFT" role="jymVt" />
+    <node concept="3clFb_" id="5cnt3vhfW9c" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="restored" />
+      <node concept="37vLTG" id="5cnt3vhfW9d" role="3clF46">
+        <property role="TrG5h" value="occurrence" />
+        <node concept="3uibUv" id="5cnt3vhfW9e" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5cnt3vhfW9f" role="3clF45" />
+      <node concept="3Tm1VV" id="5cnt3vhfW9g" role="1B3o_S" />
+      <node concept="3clFbS" id="5cnt3vhfW9h" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5cnt3vhg0gW" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7gU0T" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="result" />
+      <node concept="37vLTG" id="7nkyKX7gU0U" role="3clF46">
+        <property role="TrG5h" value="occurrence" />
+        <node concept="3uibUv" id="5mr7UHccdcS" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7nkyKX7gU0Y" role="3clF45" />
+      <node concept="3Tm1VV" id="7nkyKX7gU0Z" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7gU10" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7nkyKX7gUfX" role="jymVt" />
+    <node concept="3clFb_" id="7nkyKX7gU3L" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="garbage" />
+      <node concept="37vLTG" id="7nkyKX7gU3M" role="3clF46">
+        <property role="TrG5h" value="occurrence" />
+        <node concept="3uibUv" id="5mr7UHccdlH" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7nkyKX7gU3Q" role="3clF45" />
+      <node concept="3Tm1VV" id="7nkyKX7gU3R" role="1B3o_S" />
+      <node concept="3clFbS" id="7nkyKX7gU3S" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="18cJbc1jRCJ" role="jymVt" />
+    <node concept="3clFb_" id="18cJbc1jRnT" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="info" />
+      <node concept="37vLTG" id="18cJbc1jRnU" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="18cJbc1jS2s" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="18cJbc1jRnW" role="3clF45" />
+      <node concept="3Tm1VV" id="18cJbc1jRnX" role="1B3o_S" />
+      <node concept="3clFbS" id="18cJbc1jRnY" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="qubcdtxBuK" role="jymVt" />
+    <node concept="312cEu" id="15BaR5AeJIv" role="jymVt">
+      <property role="TrG5h" value="Stub" />
+      <node concept="3clFb_" id="1n2ZgJ3M2s0" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="activate" />
+        <node concept="37vLTG" id="1n2ZgJ3M2s1" role="3clF46">
+          <property role="TrG5h" value="occurrence" />
+          <node concept="3uibUv" id="1n2ZgJ3M2s2" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1n2ZgJ3M2s3" role="3clF45" />
+        <node concept="3Tm1VV" id="1n2ZgJ3M2s4" role="1B3o_S" />
+        <node concept="3clFbS" id="1n2ZgJ3M2s8" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeQHM" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1n2ZgJ3M2s9" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="reactivate" />
+        <node concept="37vLTG" id="1n2ZgJ3M2sa" role="3clF46">
+          <property role="TrG5h" value="occurrence" />
+          <node concept="3uibUv" id="1n2ZgJ3M2sb" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1n2ZgJ3M2sc" role="3clF45" />
+        <node concept="3Tm1VV" id="1n2ZgJ3M2sd" role="1B3o_S" />
+        <node concept="3clFbS" id="1n2ZgJ3M2sh" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeRah" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1n2ZgJ3M2si" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="suspend" />
+        <node concept="37vLTG" id="1n2ZgJ3M2sj" role="3clF46">
+          <property role="TrG5h" value="occurrence" />
+          <node concept="3uibUv" id="1n2ZgJ3M2sk" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1n2ZgJ3M2sl" role="3clF45" />
+        <node concept="3Tm1VV" id="1n2ZgJ3M2sm" role="1B3o_S" />
+        <node concept="3clFbS" id="1n2ZgJ3M2sq" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeRAS" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1n2ZgJ3M2sr" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="discard" />
+        <node concept="37vLTG" id="1n2ZgJ3M2ss" role="3clF46">
+          <property role="TrG5h" value="occurrence" />
+          <node concept="3uibUv" id="1n2ZgJ3M2st" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1n2ZgJ3M2su" role="3clF45" />
+        <node concept="3Tm1VV" id="1n2ZgJ3M2sv" role="1B3o_S" />
+        <node concept="3clFbS" id="1n2ZgJ3M2sz" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeS3B" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1n2ZgJ3MiVn" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="trigger" />
+        <node concept="37vLTG" id="4TCblo5JLfn" role="3clF46">
+          <property role="TrG5h" value="matchRule" />
+          <node concept="3uibUv" id="4TCblo5JLfk" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="1n2ZgJ3MiVq" role="3clF45" />
+        <node concept="3Tm1VV" id="1n2ZgJ3MiVr" role="1B3o_S" />
+        <node concept="3clFbS" id="1n2ZgJ3MiVv" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeSwu" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2_NfR5whEhF" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="retry" />
+        <node concept="37vLTG" id="2_NfR5whEhG" role="3clF46">
+          <property role="TrG5h" value="matchRule" />
+          <node concept="3uibUv" id="2_NfR5whEhH" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2_NfR5whEhI" role="3clF45" />
+        <node concept="3Tm1VV" id="2_NfR5whEhJ" role="1B3o_S" />
+        <node concept="3clFbS" id="2_NfR5whEhN" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeSXt" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2UGjFq48gId" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="trying" />
+        <node concept="37vLTG" id="2UGjFq48gIe" role="3clF46">
+          <property role="TrG5h" value="matchRule" />
+          <node concept="3uibUv" id="2UGjFq48gIf" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2UGjFq48gIg" role="3clF45" />
+        <node concept="3Tm1VV" id="2UGjFq48gIh" role="1B3o_S" />
+        <node concept="3clFbS" id="2UGjFq48gIl" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeTq$" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2T1p0CFMNWu" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="reject" />
+        <node concept="37vLTG" id="2T1p0CFMNWv" role="3clF46">
+          <property role="TrG5h" value="matchRule" />
+          <node concept="3uibUv" id="2T1p0CFMNWw" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2T1p0CFMNWx" role="3clF45" />
+        <node concept="3Tm1VV" id="2T1p0CFMNWy" role="1B3o_S" />
+        <node concept="3clFbS" id="2T1p0CFMNWA" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeTRN" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2UGjFq48h1G" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="finish" />
+        <node concept="37vLTG" id="2UGjFq48h1H" role="3clF46">
+          <property role="TrG5h" value="matchRule" />
+          <node concept="3uibUv" id="2UGjFq48h1I" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2UGjFq48h1J" role="3clF45" />
+        <node concept="3Tm1VV" id="2UGjFq48h1K" role="1B3o_S" />
+        <node concept="3clFbS" id="2UGjFq48h1O" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeUla" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2UGjFq48k4$" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="tell" />
+        <node concept="37vLTG" id="2UGjFq48k4_" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="2UGjFq48k4A" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2UGjFq48k4B" role="3clF45" />
+        <node concept="3Tm1VV" id="2UGjFq48k4C" role="1B3o_S" />
+        <node concept="3clFbS" id="2UGjFq48k4G" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeUMD" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="2UGjFq48k4H" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="ask" />
+        <node concept="37vLTG" id="2UGjFq48k4I" role="3clF46">
+          <property role="TrG5h" value="result" />
+          <node concept="10P_77" id="2UGjFq48k4J" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="2UGjFq48k4K" role="3clF46">
+          <property role="TrG5h" value="invocation" />
+          <node concept="3uibUv" id="2UGjFq48k4L" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2UGjFq48k4M" role="3clF45" />
+        <node concept="3Tm1VV" id="2UGjFq48k4N" role="1B3o_S" />
+        <node concept="3clFbS" id="2UGjFq48k4R" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeVgk" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="7vxJ_H4tnOC" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="failure" />
+        <node concept="37vLTG" id="7vxJ_H4tnOD" role="3clF46">
+          <property role="TrG5h" value="fail" />
+          <node concept="3uibUv" id="7vxJ_H4tnOE" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7vxJ_H4tnOF" role="3clF45" />
+        <node concept="3Tm1VV" id="7vxJ_H4tnOG" role="1B3o_S" />
+        <node concept="3clFbS" id="7vxJ_H4tnOK" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeVI3" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="7feMCq_cIyn" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="reportFailure" />
+        <node concept="37vLTG" id="7feMCq_cIyo" role="3clF46">
+          <property role="TrG5h" value="message" />
+          <node concept="17QB3L" id="7feMCq_cIyp" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="7feMCq_cIyq" role="3clF45" />
+        <node concept="3Tm1VV" id="7feMCq_cIyr" role="1B3o_S" />
+        <node concept="3clFbS" id="7feMCq_cIyv" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeWc4" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="5cnt3vhg2Ou" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="restored" />
+        <node concept="37vLTG" id="5cnt3vhg2Ov" role="3clF46">
+          <property role="TrG5h" value="occurrence" />
+          <node concept="3uibUv" id="5cnt3vhg2Ow" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="5cnt3vhg2Ox" role="3clF45" />
+        <node concept="3Tm1VV" id="5cnt3vhg2Oy" role="1B3o_S" />
+        <node concept="3clFbS" id="5cnt3vhg2O$" role="3clF47" />
+        <node concept="2AHcQZ" id="5cnt3vhg2O_" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="7nkyKX7h9eG" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="result" />
+        <node concept="37vLTG" id="7nkyKX7h9eH" role="3clF46">
+          <property role="TrG5h" value="constraint" />
+          <node concept="3uibUv" id="5mr7UHccduP" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7nkyKX7h9eJ" role="3clF45" />
+        <node concept="3Tm1VV" id="7nkyKX7h9eK" role="1B3o_S" />
+        <node concept="3clFbS" id="7nkyKX7h9eN" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeWE1" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="7nkyKX7h9eO" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="garbage" />
+        <node concept="37vLTG" id="7nkyKX7h9eP" role="3clF46">
+          <property role="TrG5h" value="constraint" />
+          <node concept="3uibUv" id="5mr7UHccd_Z" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7nkyKX7h9eR" role="3clF45" />
+        <node concept="3Tm1VV" id="7nkyKX7h9eS" role="1B3o_S" />
+        <node concept="3clFbS" id="7nkyKX7h9eV" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeX86" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="18cJbc1jSg7" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="info" />
+        <node concept="37vLTG" id="18cJbc1jSg8" role="3clF46">
+          <property role="TrG5h" value="message" />
+          <node concept="17QB3L" id="18cJbc1jSg9" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="18cJbc1jSga" role="3clF45" />
+        <node concept="3Tm1VV" id="18cJbc1jSgb" role="1B3o_S" />
+        <node concept="3clFbS" id="18cJbc1jSge" role="3clF47" />
+        <node concept="2AHcQZ" id="15BaR5AeXAn" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="15BaR5AeJIw" role="1B3o_S" />
+      <node concept="3uibUv" id="15BaR5AeNrp" role="EKbjA">
+        <ref role="3uigEE" node="qubcdtxBiR" resolve="EvaluationTraceExt" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="15BaR5AeJ4Y" role="jymVt" />
+    <node concept="3Tm1VV" id="qubcdtxBiS" role="1B3o_S" />
+    <node concept="3uibUv" id="qubcdtxBjm" role="3HQHJm">
+      <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
+    </node>
+  </node>
+  <node concept="3HP615" id="5WBVN_M1BKE">
+    <property role="TrG5h" value="LateExpression" />
+    <node concept="2tJIrI" id="5WBVN_M1BL8" role="jymVt" />
+    <node concept="3clFb_" id="5WBVN_M1BSf" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="metaArgs" />
+      <node concept="10Q1$e" id="5WBVN_MlESz" role="3clF45">
+        <node concept="3uibUv" id="5WBVN_MlERY" role="10Q1$1">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5WBVN_M1BSi" role="1B3o_S" />
+      <node concept="3clFbS" id="5WBVN_M1BSj" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5WBVN_M1BRL" role="jymVt" />
+    <node concept="3clFb_" id="5WBVN_M1BLN" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="eval" />
+      <node concept="37vLTG" id="6yUEjXvTuvu" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="6yUEjXvTu_d" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5WBVN_M1BNS" role="3clF46">
+        <property role="TrG5h" value="args" />
+        <node concept="8X2XB" id="5WBVN_M1BOF" role="1tU5fm">
+          <node concept="3uibUv" id="5WBVN_M1BOh" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="5WBVN_M1BQX" role="3clF45">
+        <ref role="16sUi3" node="5WBVN_M1BQ$" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="5WBVN_M1BLQ" role="1B3o_S" />
+      <node concept="3clFbS" id="5WBVN_M1BLR" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5WBVN_M1BLq" role="jymVt" />
+    <node concept="3Tm1VV" id="5WBVN_M1BKF" role="1B3o_S" />
+    <node concept="16euLQ" id="5WBVN_M1BQ$" role="16eVyc">
+      <property role="TrG5h" value="T" />
+    </node>
+  </node>
+  <node concept="312cEu" id="677NV565N1x">
+    <property role="TrG5h" value="LogicalUtil" />
+    <node concept="2tJIrI" id="7HUwyZb7alE" role="jymVt" />
+    <node concept="2YIFZL" id="7HUwyZb7b7C" role="jymVt">
+      <property role="TrG5h" value="asVariableArray" />
+      <node concept="37vLTG" id="7HUwyZb7b7D" role="3clF46">
+        <property role="TrG5h" value="multiMetaLogical" />
+        <node concept="3uibUv" id="7HUwyZb7bf2" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
+        </node>
+      </node>
+      <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
+        <node concept="3uibUv" id="kTK1BeAfdG" role="10Q1$1">
+          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7HUwyZb7b7I" role="1B3o_S" />
+      <node concept="3clFbS" id="7HUwyZb7b7J" role="3clF47">
+        <node concept="3cpWs8" id="7HUwyZb7b7R" role="3cqZAp">
+          <node concept="3cpWsn" id="7HUwyZb7b7S" role="3cpWs9">
+            <property role="TrG5h" value="array" />
+            <node concept="10Q1$e" id="7HUwyZb7b7T" role="1tU5fm">
+              <node concept="3uibUv" id="kTK1BeAf2h" role="10Q1$1">
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7HUwyZb7b7V" role="33vP2m">
+              <node concept="3$_iS1" id="7HUwyZb7b7W" role="2ShVmc">
+                <node concept="3$GHV9" id="7HUwyZb7b7X" role="3$GQph">
+                  <node concept="2OqwBi" id="7HUwyZb7b7Y" role="3$I4v7">
+                    <node concept="37vLTw" id="7HUwyZb7b7Z" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
+                    </node>
+                    <node concept="liA8E" id="7HUwyZbdR3y" role="2OqNvi">
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="kTK1BeAf7Z" role="3$_nBY">
+                  <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="7HUwyZb7b83" role="3cqZAp">
+          <node concept="3clFbS" id="7HUwyZb7b84" role="2LFqv$">
+            <node concept="3clFbF" id="7HUwyZb7b85" role="3cqZAp">
+              <node concept="37vLTI" id="7HUwyZb7b86" role="3clFbG">
+                <node concept="AH0OO" id="7HUwyZb7b8e" role="37vLTJ">
+                  <node concept="37vLTw" id="7HUwyZb7b8f" role="AHEQo">
+                    <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
+                  </node>
+                  <node concept="37vLTw" id="7HUwyZb7b8g" role="AHHXb">
+                    <ref role="3cqZAo" node="7HUwyZb7b7S" resolve="array" />
+                  </node>
+                </node>
+                <node concept="1rXfSq" id="7HUwyZbdRag" role="37vLTx">
+                  <ref role="37wK5l" node="7HUwyZb7chj" resolve="asVariable" />
+                  <node concept="2OqwBi" id="7HUwyZbdRec" role="37wK5m">
+                    <node concept="37vLTw" id="7HUwyZbdRce" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
+                    </node>
+                    <node concept="liA8E" id="7HUwyZbdRgZ" role="2OqNvi">
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
+                      <node concept="37vLTw" id="7HUwyZbdRiC" role="37wK5m">
+                        <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7HUwyZb7b8h" role="1Duv9x">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="7HUwyZb7b8i" role="1tU5fm" />
+            <node concept="3cmrfG" id="7HUwyZb7b8j" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+          <node concept="3eOVzh" id="7HUwyZb7b8k" role="1Dwp0S">
+            <node concept="37vLTw" id="7HUwyZb7b8l" role="3uHU7B">
+              <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
+            </node>
+            <node concept="2OqwBi" id="7HUwyZb7b8m" role="3uHU7w">
+              <node concept="37vLTw" id="7HUwyZb7b8n" role="2Oq$k0">
+                <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
+              </node>
+              <node concept="liA8E" id="7HUwyZbdR6B" role="2OqNvi">
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
+              </node>
+            </node>
+          </node>
+          <node concept="3uNrnE" id="7HUwyZb7b8p" role="1Dwrff">
+            <node concept="37vLTw" id="7HUwyZb7b8q" role="2$L3a6">
+              <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7HUwyZb7b8s" role="3cqZAp">
+          <node concept="37vLTw" id="7HUwyZb7b8t" role="3clFbG">
+            <ref role="3cqZAo" node="7HUwyZb7b7S" resolve="array" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7HUwyZb7clq" role="jymVt" />
+    <node concept="2YIFZL" id="7HUwyZb7chj" role="jymVt">
+      <property role="TrG5h" value="asVariable" />
+      <node concept="16euLQ" id="4TCblo5YIpd" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="7HUwyZb7chk" role="3clF46">
+        <property role="TrG5h" value="metaLogical" />
+        <node concept="3uibUv" id="7HUwyZb7chm" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+          <node concept="3qTvmN" id="4TCblo5YIjG" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="kTK1BeAdVX" role="3clF45">
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+      </node>
+      <node concept="3Tm1VV" id="7HUwyZb7chp" role="1B3o_S" />
+      <node concept="3clFbS" id="7HUwyZb7chq" role="3clF47">
+        <node concept="3clFbF" id="7HUwyZbdQz9" role="3cqZAp">
+          <node concept="2ShNRf" id="7HUwyZbdQz7" role="3clFbG">
+            <node concept="1pGfFk" id="7HUwyZbdQMO" role="2ShVmc">
+              <ref role="37wK5l" to="oy3s:7HUwyZbdNAd" resolve="MetaLogicalDataForm" />
+              <node concept="37vLTw" id="7HUwyZbdQO9" role="37wK5m">
+                <ref role="3cqZAo" node="7HUwyZb7chk" resolve="metaLogical" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4TCblo5YI1R" role="jymVt" />
+    <node concept="2YIFZL" id="4TCblo5YI1H" role="jymVt">
+      <property role="TrG5h" value="asVariable" />
+      <node concept="37vLTG" id="4TCblo5YI1I" role="3clF46">
+        <property role="TrG5h" value="logical" />
+        <node concept="3uibUv" id="4TCblo5YI1J" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+          <node concept="16syzq" id="4TCblo5YIOD" role="11_B2D">
+            <ref role="16sUi3" node="4TCblo5YIIG" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="kTK1BeAeTc" role="3clF45">
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+      </node>
+      <node concept="3Tm1VV" id="4TCblo5YI1L" role="1B3o_S" />
+      <node concept="3clFbS" id="4TCblo5YI1M" role="3clF47">
+        <node concept="3clFbF" id="4TCblo5YITN" role="3cqZAp">
+          <node concept="2ShNRf" id="4TCblo5YITJ" role="3clFbG">
+            <node concept="1pGfFk" id="4TCblo5YJa3" role="2ShVmc">
+              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+              <node concept="37vLTw" id="4TCblo5YJCY" role="37wK5m">
+                <ref role="3cqZAo" node="4TCblo5YI1I" resolve="logical" />
+              </node>
+              <node concept="16syzq" id="4TCblo5YJyT" role="1pMfVU">
+                <ref role="16sUi3" node="4TCblo5YIIG" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="4TCblo5YIIG" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="4TCblo5YJ_1" role="3ztrMU">
+          <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="677NV565VBQ" role="jymVt" />
+    <node concept="2YIFZL" id="4TCblo5NqWF" role="jymVt">
+      <property role="TrG5h" value="instantiateMetaLogicals" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="4TCblo5NkoL" role="3clF47">
+        <node concept="3clFbF" id="4TCblo5NkJr" role="3cqZAp">
+          <node concept="2OqwBi" id="4TCblo5Nl4W" role="3clFbG">
+            <node concept="2YIFZM" id="4TCblo5NkK4" role="2Oq$k0">
+              <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
+              <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
+              <node concept="2ShNRf" id="4TCblo5NkKU" role="37wK5m">
+                <node concept="1pGfFk" id="4TCblo5Nl1t" role="2ShVmc">
+                  <ref role="37wK5l" node="4TCblo5MHYk" resolve="LogicalUtil.InstantiateDelegate" />
+                  <node concept="37vLTw" id="4TCblo5Nl3R" role="37wK5m">
+                    <ref role="3cqZAo" node="4TCblo5NkwR" resolve="logicalContext" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="4TCblo5Nl7d" role="2OqNvi">
+              <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+              <node concept="37vLTw" id="4TCblo5Nl9o" role="37wK5m">
+                <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4TCblo5NkAJ" role="3clF46">
+        <property role="TrG5h" value="tf" />
+        <node concept="3uibUv" id="4TCblo5NkFx" role="1tU5fm">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3uibUv" id="4TCblo5Nk_K" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+      </node>
+      <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4TCblo5Nkhd" role="jymVt" />
+    <node concept="312cEu" id="4TCblo5MG7R" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <property role="TrG5h" value="InstantiateDelegate" />
+      <node concept="2tJIrI" id="4TCblo5MHSq" role="jymVt" />
+      <node concept="3clFbW" id="4TCblo5MHYk" role="jymVt">
+        <node concept="3cqZAl" id="4TCblo5MHYm" role="3clF45" />
+        <node concept="3Tm6S6" id="4TCblo5MHYn" role="1B3o_S" />
+        <node concept="3clFbS" id="4TCblo5MHYo" role="3clF47">
+          <node concept="3clFbF" id="4TCblo5MI7v" role="3cqZAp">
+            <node concept="37vLTI" id="4TCblo5MI7x" role="3clFbG">
+              <node concept="2OqwBi" id="4TCblo5MI7_" role="37vLTJ">
+                <node concept="Xjq3P" id="4TCblo5MI7C" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4TCblo5MI7$" role="2OqNvi">
+                  <ref role="2Oxat5" node="4TCblo5MI7r" resolve="logicalContext" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="4TCblo5MI7D" role="37vLTx">
+                <ref role="3cqZAo" node="4TCblo5MI32" resolve="logicalContext" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="4TCblo5MI32" role="3clF46">
+          <property role="TrG5h" value="logicalContext" />
+          <node concept="3uibUv" id="4TCblo5MI31" role="1tU5fm">
+            <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4TCblo5MHTP" role="jymVt" />
+      <node concept="3Tm6S6" id="4TCblo5MG2k" role="1B3o_S" />
+      <node concept="3uibUv" id="4TCblo5MGIz" role="EKbjA">
+        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+      </node>
+      <node concept="3clFb_" id="6HT7BWBPa9I" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="canMap" />
+        <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
+          <property role="TrG5h" value="tf" />
+          <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+        </node>
+        <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
+        <node concept="3Tm1VV" id="6HT7BWBPa9M" role="1B3o_S" />
+        <node concept="3clFbS" id="6HT7BWBPa9N" role="3clF47">
+          <node concept="3clFbF" id="5BGv8yzxlPR" role="3cqZAp">
+            <node concept="3eOSWO" id="5BGv8yzxmvm" role="3clFbG">
+              <node concept="3cmrfG" id="5BGv8yzxmwO" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="2OqwBi" id="5BGv8yzxm1a" role="3uHU7B">
+                <node concept="37vLTw" id="5BGv8yzxlPP" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
+                </node>
+                <node concept="liA8E" id="5BGv8yzxmhs" role="2OqNvi">
+                  <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4TCblo5MIEy" role="jymVt" />
+      <node concept="3clFb_" id="6HT7BWBPa9O" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="map" />
+        <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
+          <property role="TrG5h" value="tf" />
+          <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
+          <property role="TrG5h" value="fallback" />
+          <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
+            <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
+        <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        </node>
+        <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
+          <node concept="3clFbJ" id="5BGv8yzxmXQ" role="3cqZAp">
+            <node concept="3clFbS" id="5BGv8yzxmXS" role="3clFbx">
+              <node concept="3cpWs6" id="5BGv8yzxnrb" role="3cqZAp">
+                <node concept="2ShNRf" id="4TCblo5Pq8Z" role="3cqZAk">
+                  <node concept="1pGfFk" id="4TCblo5PqjT" role="2ShVmc">
+                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                    <node concept="2OqwBi" id="4TCblo5PabD" role="37wK5m">
+                      <node concept="37vLTw" id="4TCblo5PabE" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
+                      </node>
+                      <node concept="liA8E" id="4TCblo5PabF" role="2OqNvi">
+                        <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
+                        <node concept="2OqwBi" id="4TCblo5PabG" role="37wK5m">
+                          <node concept="1eOMI4" id="4TCblo5PabH" role="2Oq$k0">
+                            <node concept="10QFUN" id="4TCblo5PabI" role="1eOMHV">
+                              <node concept="37vLTw" id="4TCblo5PabJ" role="10QFUP">
+                                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
+                              </node>
+                              <node concept="3uibUv" id="4TCblo5PabK" role="10QFUM">
+                                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalDataForm" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="4TCblo5PabL" role="2OqNvi">
+                            <ref role="37wK5l" to="oy3s:514BAS_Xsp_" resolve="metaLogical" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5BGv8yzxoz$" role="3cqZAp" />
+            </node>
+            <node concept="2ZW3vV" id="4TCblo5MCk$" role="3clFbw">
+              <node concept="3uibUv" id="4TCblo5MCof" role="2ZW6by">
+                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalDataForm" />
+              </node>
+              <node concept="37vLTw" id="bUIfhjJCGB" role="2ZW6bz">
+                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
+              </node>
+            </node>
+            <node concept="9aQIb" id="5BGv8yzxoqo" role="9aQIa">
+              <node concept="3clFbS" id="5BGv8yzxoqp" role="9aQI4">
+                <node concept="3cpWs6" id="5BGv8yzxpdJ" role="3cqZAp">
+                  <node concept="2OqwBi" id="5BGv8yzxl7m" role="3cqZAk">
+                    <node concept="37vLTw" id="5BGv8yzxkWc" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
+                    </node>
+                    <node concept="liA8E" id="5BGv8yzxlnb" role="2OqNvi">
+                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                      <node concept="37vLTw" id="5BGv8yzxlyp" role="37wK5m">
+                        <ref role="3cqZAo" node="6HT7BWBPa9R" resolve="fallback" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4TCblo5MI$W" role="jymVt" />
+      <node concept="312cEg" id="4TCblo5MI7r" role="jymVt">
+        <property role="TrG5h" value="logicalContext" />
+        <node concept="3Tm6S6" id="4TCblo5MI7s" role="1B3o_S" />
+        <node concept="3uibUv" id="4TCblo5MI7u" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4TCblo5NlYH" role="jymVt" />
+    <node concept="3Tm1VV" id="677NV565N1y" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
similarity index 99%
rename from coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
rename to coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
index b20c0bdd..0aa2e76a 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)">
+<model ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)">
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -166,7 +166,7 @@
     </language>
   </registry>
   <node concept="312cEu" id="7HUwyZbdMWH">
-    <property role="TrG5h" value="MetaLogicalTreeForm" />
+    <property role="TrG5h" value="MetaLogicalDataForm" />
     <node concept="2tJIrI" id="7HUwyZbdN_B" role="jymVt" />
     <node concept="3clFbW" id="7HUwyZbdNAd" role="jymVt">
       <node concept="3cqZAl" id="7HUwyZbdNAf" role="3clF45" />
@@ -325,7 +325,7 @@
     </node>
   </node>
   <node concept="312cEu" id="4TCblo5MJ1m">
-    <property role="TrG5h" value="LogicalTreeForm" />
+    <property role="TrG5h" value="LogicalDataForm" />
     <node concept="2tJIrI" id="4TCblo5MOJG" role="jymVt" />
     <node concept="312cEg" id="4TCblo5MOOn" role="jymVt">
       <property role="TrG5h" value="logical" />
@@ -682,7 +682,7 @@
           <node concept="3fqX7Q" id="4TCblo5N6Ds" role="3clFbw">
             <node concept="2ZW3vV" id="4TCblo5N6QY" role="3fr31v">
               <node concept="3uibUv" id="4TCblo5N6YK" role="2ZW6by">
-                <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
               <node concept="37vLTw" id="4TCblo5N6Ff" role="2ZW6bz">
                 <ref role="3cqZAo" node="4TCblo5N1M1" resolve="that" />
@@ -707,7 +707,7 @@
                       <ref role="3cqZAo" node="4TCblo5N1M1" resolve="that" />
                     </node>
                     <node concept="3uibUv" id="4TCblo5N9Mf" role="10QFUM">
-                      <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalTreeForm" />
+                      <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalDataForm" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
deleted file mode 100644
index 801f9896..00000000
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ /dev/null
@@ -1,1599 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)">
-  <persistence version="9" />
-  <languages>
-    <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="6" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
-      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
-        <child id="1239714902950" name="expression" index="2$L3a6" />
-      </concept>
-      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
-        <child id="1173175577737" name="index" index="AHEQo" />
-        <child id="1173175590490" name="array" index="AHHXb" />
-      </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="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
-        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
-      </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="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
-      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
-      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
-        <child id="1081256993305" name="classType" index="2ZW6by" />
-        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </concept>
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
-        <property id="1221565133444" name="isFinal" index="1EXbeo" />
-        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
-        <child id="1214996921760" name="bound" index="3ztrMU" />
-      </concept>
-      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
-        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
-      </concept>
-      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
-        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
-      </concept>
-      <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="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
-        <child id="1206060619838" name="condition" index="3eO9$A" />
-        <child id="1206060644605" name="statementList" index="3eOfB_" />
-      </concept>
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
-      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
-        <child id="1160998896846" name="condition" index="1gVkn0" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
-        <child id="1171903916107" name="bound" index="3qUE_r" />
-      </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </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="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
-        <child id="1184951007469" name="componentType" index="3$_nBY" />
-        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
-      </concept>
-      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
-        <child id="1184953288404" name="expression" index="3$I4v7" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
-      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
-        <child id="1144231399730" name="condition" index="1Dwp0S" />
-        <child id="1144231408325" name="iteration" index="1Dwrff" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
-      </concept>
-      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
-        <reference id="1116615189566" name="classifier" index="3VsUkX" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="677NV565N1x">
-    <property role="TrG5h" value="LogicalUtil" />
-    <node concept="2tJIrI" id="7HUwyZb7alE" role="jymVt" />
-    <node concept="2YIFZL" id="7HUwyZb7b7C" role="jymVt">
-      <property role="TrG5h" value="asVariableArray" />
-      <node concept="37vLTG" id="7HUwyZb7b7D" role="3clF46">
-        <property role="TrG5h" value="multiMetaLogical" />
-        <node concept="3uibUv" id="7HUwyZb7bf2" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MultiMetaLogical" resolve="MultiMetaLogical" />
-        </node>
-      </node>
-      <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
-        <node concept="3uibUv" id="kTK1BeAfdG" role="10Q1$1">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZb7b7I" role="1B3o_S" />
-      <node concept="3clFbS" id="7HUwyZb7b7J" role="3clF47">
-        <node concept="3cpWs8" id="7HUwyZb7b7R" role="3cqZAp">
-          <node concept="3cpWsn" id="7HUwyZb7b7S" role="3cpWs9">
-            <property role="TrG5h" value="array" />
-            <node concept="10Q1$e" id="7HUwyZb7b7T" role="1tU5fm">
-              <node concept="3uibUv" id="kTK1BeAf2h" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7HUwyZb7b7V" role="33vP2m">
-              <node concept="3$_iS1" id="7HUwyZb7b7W" role="2ShVmc">
-                <node concept="3$GHV9" id="7HUwyZb7b7X" role="3$GQph">
-                  <node concept="2OqwBi" id="7HUwyZb7b7Y" role="3$I4v7">
-                    <node concept="37vLTw" id="7HUwyZb7b7Z" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
-                    </node>
-                    <node concept="liA8E" id="7HUwyZbdR3y" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3uibUv" id="kTK1BeAf7Z" role="3$_nBY">
-                  <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Dw8fO" id="7HUwyZb7b83" role="3cqZAp">
-          <node concept="3clFbS" id="7HUwyZb7b84" role="2LFqv$">
-            <node concept="3clFbF" id="7HUwyZb7b85" role="3cqZAp">
-              <node concept="37vLTI" id="7HUwyZb7b86" role="3clFbG">
-                <node concept="AH0OO" id="7HUwyZb7b8e" role="37vLTJ">
-                  <node concept="37vLTw" id="7HUwyZb7b8f" role="AHEQo">
-                    <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
-                  </node>
-                  <node concept="37vLTw" id="7HUwyZb7b8g" role="AHHXb">
-                    <ref role="3cqZAo" node="7HUwyZb7b7S" resolve="array" />
-                  </node>
-                </node>
-                <node concept="1rXfSq" id="7HUwyZbdRag" role="37vLTx">
-                  <ref role="37wK5l" node="7HUwyZb7chj" resolve="asVariable" />
-                  <node concept="2OqwBi" id="7HUwyZbdRec" role="37wK5m">
-                    <node concept="37vLTw" id="7HUwyZbdRce" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
-                    </node>
-                    <node concept="liA8E" id="7HUwyZbdRgZ" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
-                      <node concept="37vLTw" id="7HUwyZbdRiC" role="37wK5m">
-                        <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="7HUwyZb7b8h" role="1Duv9x">
-            <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="7HUwyZb7b8i" role="1tU5fm" />
-            <node concept="3cmrfG" id="7HUwyZb7b8j" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-          <node concept="3eOVzh" id="7HUwyZb7b8k" role="1Dwp0S">
-            <node concept="37vLTw" id="7HUwyZb7b8l" role="3uHU7B">
-              <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
-            </node>
-            <node concept="2OqwBi" id="7HUwyZb7b8m" role="3uHU7w">
-              <node concept="37vLTw" id="7HUwyZb7b8n" role="2Oq$k0">
-                <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
-              </node>
-              <node concept="liA8E" id="7HUwyZbdR6B" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
-              </node>
-            </node>
-          </node>
-          <node concept="3uNrnE" id="7HUwyZb7b8p" role="1Dwrff">
-            <node concept="37vLTw" id="7HUwyZb7b8q" role="2$L3a6">
-              <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7HUwyZb7b8s" role="3cqZAp">
-          <node concept="37vLTw" id="7HUwyZb7b8t" role="3clFbG">
-            <ref role="3cqZAo" node="7HUwyZb7b7S" resolve="array" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7HUwyZb7clq" role="jymVt" />
-    <node concept="2YIFZL" id="7HUwyZb7chj" role="jymVt">
-      <property role="TrG5h" value="asVariable" />
-      <node concept="16euLQ" id="4TCblo5YIpd" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
-      <node concept="37vLTG" id="7HUwyZb7chk" role="3clF46">
-        <property role="TrG5h" value="metaLogical" />
-        <node concept="3uibUv" id="7HUwyZb7chm" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3qTvmN" id="4TCblo5YIjG" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="kTK1BeAdVX" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-      </node>
-      <node concept="3Tm1VV" id="7HUwyZb7chp" role="1B3o_S" />
-      <node concept="3clFbS" id="7HUwyZb7chq" role="3clF47">
-        <node concept="3clFbF" id="7HUwyZbdQz9" role="3cqZAp">
-          <node concept="2ShNRf" id="7HUwyZbdQz7" role="3clFbG">
-            <node concept="1pGfFk" id="7HUwyZbdQMO" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:7HUwyZbdNAd" resolve="MetaLogicalTreeForm" />
-              <node concept="37vLTw" id="7HUwyZbdQO9" role="37wK5m">
-                <ref role="3cqZAo" node="7HUwyZb7chk" resolve="metaLogical" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4TCblo5YI1R" role="jymVt" />
-    <node concept="2YIFZL" id="4TCblo5YI1H" role="jymVt">
-      <property role="TrG5h" value="asVariable" />
-      <node concept="37vLTG" id="4TCblo5YI1I" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="4TCblo5YI1J" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-          <node concept="16syzq" id="4TCblo5YIOD" role="11_B2D">
-            <ref role="16sUi3" node="4TCblo5YIIG" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="kTK1BeAeTc" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
-      </node>
-      <node concept="3Tm1VV" id="4TCblo5YI1L" role="1B3o_S" />
-      <node concept="3clFbS" id="4TCblo5YI1M" role="3clF47">
-        <node concept="3clFbF" id="4TCblo5YITN" role="3cqZAp">
-          <node concept="2ShNRf" id="4TCblo5YITJ" role="3clFbG">
-            <node concept="1pGfFk" id="4TCblo5YJa3" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
-              <node concept="37vLTw" id="4TCblo5YJCY" role="37wK5m">
-                <ref role="3cqZAo" node="4TCblo5YI1I" resolve="logical" />
-              </node>
-              <node concept="16syzq" id="4TCblo5YJyT" role="1pMfVU">
-                <ref role="16sUi3" node="4TCblo5YIIG" resolve="T" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16euLQ" id="4TCblo5YIIG" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="4TCblo5YJ_1" role="3ztrMU">
-          <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="677NV565VBQ" role="jymVt" />
-    <node concept="2YIFZL" id="4TCblo5NqWF" role="jymVt">
-      <property role="TrG5h" value="instantiateMetaLogicals" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="4TCblo5NkoL" role="3clF47">
-        <node concept="3clFbF" id="4TCblo5NkJr" role="3cqZAp">
-          <node concept="2OqwBi" id="4TCblo5Nl4W" role="3clFbG">
-            <node concept="2YIFZM" id="4TCblo5NkK4" role="2Oq$k0">
-              <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
-              <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
-              <node concept="2ShNRf" id="4TCblo5NkKU" role="37wK5m">
-                <node concept="1pGfFk" id="4TCblo5Nl1t" role="2ShVmc">
-                  <ref role="37wK5l" node="4TCblo5MHYk" resolve="LogicalUtil.InstantiateDelegate" />
-                  <node concept="37vLTw" id="4TCblo5Nl3R" role="37wK5m">
-                    <ref role="3cqZAo" node="4TCblo5NkwR" resolve="logicalContext" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="4TCblo5Nl7d" role="2OqNvi">
-              <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
-              <node concept="37vLTw" id="4TCblo5Nl9o" role="37wK5m">
-                <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4TCblo5NkAJ" role="3clF46">
-        <property role="TrG5h" value="tf" />
-        <node concept="3uibUv" id="4TCblo5NkFx" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="4TCblo5Nk_K" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-      </node>
-      <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="4TCblo5Nkhd" role="jymVt" />
-    <node concept="312cEu" id="4TCblo5MG7R" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="1sVAO0" value="false" />
-      <property role="1EXbeo" value="false" />
-      <property role="TrG5h" value="InstantiateDelegate" />
-      <node concept="2tJIrI" id="4TCblo5MHSq" role="jymVt" />
-      <node concept="3clFbW" id="4TCblo5MHYk" role="jymVt">
-        <node concept="3cqZAl" id="4TCblo5MHYm" role="3clF45" />
-        <node concept="3Tm6S6" id="4TCblo5MHYn" role="1B3o_S" />
-        <node concept="3clFbS" id="4TCblo5MHYo" role="3clF47">
-          <node concept="3clFbF" id="4TCblo5MI7v" role="3cqZAp">
-            <node concept="37vLTI" id="4TCblo5MI7x" role="3clFbG">
-              <node concept="2OqwBi" id="4TCblo5MI7_" role="37vLTJ">
-                <node concept="Xjq3P" id="4TCblo5MI7C" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4TCblo5MI7$" role="2OqNvi">
-                  <ref role="2Oxat5" node="4TCblo5MI7r" resolve="logicalContext" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="4TCblo5MI7D" role="37vLTx">
-                <ref role="3cqZAo" node="4TCblo5MI32" resolve="logicalContext" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="4TCblo5MI32" role="3clF46">
-          <property role="TrG5h" value="logicalContext" />
-          <node concept="3uibUv" id="4TCblo5MI31" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4TCblo5MHTP" role="jymVt" />
-      <node concept="3Tm6S6" id="4TCblo5MG2k" role="1B3o_S" />
-      <node concept="3uibUv" id="4TCblo5MGIz" role="EKbjA">
-        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
-      </node>
-      <node concept="3clFb_" id="6HT7BWBPa9I" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="canMap" />
-        <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
-          <property role="TrG5h" value="tf" />
-          <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-        <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
-        <node concept="3Tm1VV" id="6HT7BWBPa9M" role="1B3o_S" />
-        <node concept="3clFbS" id="6HT7BWBPa9N" role="3clF47">
-          <node concept="3clFbF" id="5BGv8yzxlPR" role="3cqZAp">
-            <node concept="3eOSWO" id="5BGv8yzxmvm" role="3clFbG">
-              <node concept="3cmrfG" id="5BGv8yzxmwO" role="3uHU7w">
-                <property role="3cmrfH" value="0" />
-              </node>
-              <node concept="2OqwBi" id="5BGv8yzxm1a" role="3uHU7B">
-                <node concept="37vLTw" id="5BGv8yzxlPP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
-                </node>
-                <node concept="liA8E" id="5BGv8yzxmhs" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4TCblo5MIEy" role="jymVt" />
-      <node concept="3clFb_" id="6HT7BWBPa9O" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="map" />
-        <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
-          <property role="TrG5h" value="tf" />
-          <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
-          <property role="TrG5h" value="fallback" />
-          <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
-        <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-        <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
-          <node concept="3clFbJ" id="5BGv8yzxmXQ" role="3cqZAp">
-            <node concept="3clFbS" id="5BGv8yzxmXS" role="3clFbx">
-              <node concept="3cpWs6" id="5BGv8yzxnrb" role="3cqZAp">
-                <node concept="2ShNRf" id="4TCblo5Pq8Z" role="3cqZAk">
-                  <node concept="1pGfFk" id="4TCblo5PqjT" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
-                    <node concept="2OqwBi" id="4TCblo5PabD" role="37wK5m">
-                      <node concept="37vLTw" id="4TCblo5PabE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
-                      </node>
-                      <node concept="liA8E" id="4TCblo5PabF" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
-                        <node concept="2OqwBi" id="4TCblo5PabG" role="37wK5m">
-                          <node concept="1eOMI4" id="4TCblo5PabH" role="2Oq$k0">
-                            <node concept="10QFUN" id="4TCblo5PabI" role="1eOMHV">
-                              <node concept="37vLTw" id="4TCblo5PabJ" role="10QFUP">
-                                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
-                              </node>
-                              <node concept="3uibUv" id="4TCblo5PabK" role="10QFUM">
-                                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4TCblo5PabL" role="2OqNvi">
-                            <ref role="37wK5l" to="oy3s:514BAS_Xsp_" resolve="metaLogical" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5BGv8yzxoz$" role="3cqZAp" />
-            </node>
-            <node concept="2ZW3vV" id="4TCblo5MCk$" role="3clFbw">
-              <node concept="3uibUv" id="4TCblo5MCof" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
-              </node>
-              <node concept="37vLTw" id="bUIfhjJCGB" role="2ZW6bz">
-                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
-              </node>
-            </node>
-            <node concept="9aQIb" id="5BGv8yzxoqo" role="9aQIa">
-              <node concept="3clFbS" id="5BGv8yzxoqp" role="9aQI4">
-                <node concept="3cpWs6" id="5BGv8yzxpdJ" role="3cqZAp">
-                  <node concept="2OqwBi" id="5BGv8yzxl7m" role="3cqZAk">
-                    <node concept="37vLTw" id="5BGv8yzxkWc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
-                    </node>
-                    <node concept="liA8E" id="5BGv8yzxlnb" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
-                      <node concept="37vLTw" id="5BGv8yzxlyp" role="37wK5m">
-                        <ref role="3cqZAo" node="6HT7BWBPa9R" resolve="fallback" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4TCblo5MI$W" role="jymVt" />
-      <node concept="312cEg" id="4TCblo5MI7r" role="jymVt">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3Tm6S6" id="4TCblo5MI7s" role="1B3o_S" />
-        <node concept="3uibUv" id="4TCblo5MI7u" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4TCblo5NlYH" role="jymVt" />
-    <node concept="3Tm1VV" id="677NV565N1y" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="5_6ImQZ8j9D">
-    <property role="TrG5h" value="SolverUtil" />
-    <node concept="2tJIrI" id="5_6ImQZ8j9N" role="jymVt" />
-    <node concept="2YIFZL" id="5_6ImQZ8ja0" role="jymVt">
-      <property role="TrG5h" value="fail" />
-      <node concept="3cqZAl" id="5_6ImQZ8ja2" role="3clF45" />
-      <node concept="3Tm1VV" id="5_6ImQZ8ja3" role="1B3o_S" />
-      <node concept="3clFbS" id="5_6ImQZ8ja4" role="3clF47">
-        <node concept="YS8fn" id="5_6ImQZ8jaz" role="3cqZAp">
-          <node concept="2ShNRf" id="5_6ImQZ8jaX" role="YScLw">
-            <node concept="1pGfFk" id="5_6ImQZ8l0Z" role="2ShVmc">
-              <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
-              <node concept="37vLTw" id="5_6ImQZ8l2j" role="37wK5m">
-                <ref role="3cqZAo" node="5_6ImQZ8l1u" resolve="message" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5_6ImQZ8l1u" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="5_6ImQZ8l1t" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="5_6ImQZ8j9E" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="qubcdtxBiR">
-    <property role="TrG5h" value="EvaluationTraceExt" />
-    <node concept="2tJIrI" id="qubcdtxBuI" role="jymVt" />
-    <node concept="Wx3nA" id="24Vro6cS5rK" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="NULL" />
-      <node concept="3Tm1VV" id="24Vro6cS5rM" role="1B3o_S" />
-      <node concept="2ShNRf" id="24Vro6cS5M$" role="33vP2m">
-        <node concept="HV5vD" id="15BaR5AeZD1" role="2ShVmc">
-          <ref role="HV5vE" node="15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="qubcdtxJQt" role="1tU5fm">
-        <ref role="3uigEE" node="qubcdtxBiR" resolve="EvaluationTraceExt" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="qubcdtxJFT" role="jymVt" />
-    <node concept="3clFb_" id="5cnt3vhfW9c" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="restored" />
-      <node concept="37vLTG" id="5cnt3vhfW9d" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="5cnt3vhfW9e" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5cnt3vhfW9f" role="3clF45" />
-      <node concept="3Tm1VV" id="5cnt3vhfW9g" role="1B3o_S" />
-      <node concept="3clFbS" id="5cnt3vhfW9h" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5cnt3vhg0gW" role="jymVt" />
-    <node concept="3clFb_" id="7nkyKX7gU0T" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="result" />
-      <node concept="37vLTG" id="7nkyKX7gU0U" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="5mr7UHccdcS" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7nkyKX7gU0Y" role="3clF45" />
-      <node concept="3Tm1VV" id="7nkyKX7gU0Z" role="1B3o_S" />
-      <node concept="3clFbS" id="7nkyKX7gU10" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7nkyKX7gUfX" role="jymVt" />
-    <node concept="3clFb_" id="7nkyKX7gU3L" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="garbage" />
-      <node concept="37vLTG" id="7nkyKX7gU3M" role="3clF46">
-        <property role="TrG5h" value="occurrence" />
-        <node concept="3uibUv" id="5mr7UHccdlH" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7nkyKX7gU3Q" role="3clF45" />
-      <node concept="3Tm1VV" id="7nkyKX7gU3R" role="1B3o_S" />
-      <node concept="3clFbS" id="7nkyKX7gU3S" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="18cJbc1jRCJ" role="jymVt" />
-    <node concept="3clFb_" id="18cJbc1jRnT" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="info" />
-      <node concept="37vLTG" id="18cJbc1jRnU" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="18cJbc1jS2s" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="18cJbc1jRnW" role="3clF45" />
-      <node concept="3Tm1VV" id="18cJbc1jRnX" role="1B3o_S" />
-      <node concept="3clFbS" id="18cJbc1jRnY" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="qubcdtxBuK" role="jymVt" />
-    <node concept="312cEu" id="15BaR5AeJIv" role="jymVt">
-      <property role="TrG5h" value="Stub" />
-      <node concept="3clFb_" id="1n2ZgJ3M2s0" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="activate" />
-        <node concept="37vLTG" id="1n2ZgJ3M2s1" role="3clF46">
-          <property role="TrG5h" value="occurrence" />
-          <node concept="3uibUv" id="1n2ZgJ3M2s2" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1n2ZgJ3M2s3" role="3clF45" />
-        <node concept="3Tm1VV" id="1n2ZgJ3M2s4" role="1B3o_S" />
-        <node concept="3clFbS" id="1n2ZgJ3M2s8" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeQHM" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1n2ZgJ3M2s9" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="reactivate" />
-        <node concept="37vLTG" id="1n2ZgJ3M2sa" role="3clF46">
-          <property role="TrG5h" value="occurrence" />
-          <node concept="3uibUv" id="1n2ZgJ3M2sb" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1n2ZgJ3M2sc" role="3clF45" />
-        <node concept="3Tm1VV" id="1n2ZgJ3M2sd" role="1B3o_S" />
-        <node concept="3clFbS" id="1n2ZgJ3M2sh" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeRah" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1n2ZgJ3M2si" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="suspend" />
-        <node concept="37vLTG" id="1n2ZgJ3M2sj" role="3clF46">
-          <property role="TrG5h" value="occurrence" />
-          <node concept="3uibUv" id="1n2ZgJ3M2sk" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1n2ZgJ3M2sl" role="3clF45" />
-        <node concept="3Tm1VV" id="1n2ZgJ3M2sm" role="1B3o_S" />
-        <node concept="3clFbS" id="1n2ZgJ3M2sq" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeRAS" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1n2ZgJ3M2sr" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="discard" />
-        <node concept="37vLTG" id="1n2ZgJ3M2ss" role="3clF46">
-          <property role="TrG5h" value="occurrence" />
-          <node concept="3uibUv" id="1n2ZgJ3M2st" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1n2ZgJ3M2su" role="3clF45" />
-        <node concept="3Tm1VV" id="1n2ZgJ3M2sv" role="1B3o_S" />
-        <node concept="3clFbS" id="1n2ZgJ3M2sz" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeS3B" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1n2ZgJ3MiVn" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="trigger" />
-        <node concept="37vLTG" id="4TCblo5JLfn" role="3clF46">
-          <property role="TrG5h" value="matchRule" />
-          <node concept="3uibUv" id="4TCblo5JLfk" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1n2ZgJ3MiVq" role="3clF45" />
-        <node concept="3Tm1VV" id="1n2ZgJ3MiVr" role="1B3o_S" />
-        <node concept="3clFbS" id="1n2ZgJ3MiVv" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeSwu" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2_NfR5whEhF" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="retry" />
-        <node concept="37vLTG" id="2_NfR5whEhG" role="3clF46">
-          <property role="TrG5h" value="matchRule" />
-          <node concept="3uibUv" id="2_NfR5whEhH" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2_NfR5whEhI" role="3clF45" />
-        <node concept="3Tm1VV" id="2_NfR5whEhJ" role="1B3o_S" />
-        <node concept="3clFbS" id="2_NfR5whEhN" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeSXt" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2UGjFq48gId" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="trying" />
-        <node concept="37vLTG" id="2UGjFq48gIe" role="3clF46">
-          <property role="TrG5h" value="matchRule" />
-          <node concept="3uibUv" id="2UGjFq48gIf" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2UGjFq48gIg" role="3clF45" />
-        <node concept="3Tm1VV" id="2UGjFq48gIh" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq48gIl" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeTq$" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2T1p0CFMNWu" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="reject" />
-        <node concept="37vLTG" id="2T1p0CFMNWv" role="3clF46">
-          <property role="TrG5h" value="matchRule" />
-          <node concept="3uibUv" id="2T1p0CFMNWw" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2T1p0CFMNWx" role="3clF45" />
-        <node concept="3Tm1VV" id="2T1p0CFMNWy" role="1B3o_S" />
-        <node concept="3clFbS" id="2T1p0CFMNWA" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeTRN" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2UGjFq48h1G" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="finish" />
-        <node concept="37vLTG" id="2UGjFq48h1H" role="3clF46">
-          <property role="TrG5h" value="matchRule" />
-          <node concept="3uibUv" id="2UGjFq48h1I" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2UGjFq48h1J" role="3clF45" />
-        <node concept="3Tm1VV" id="2UGjFq48h1K" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq48h1O" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeUla" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2UGjFq48k4$" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="tell" />
-        <node concept="37vLTG" id="2UGjFq48k4_" role="3clF46">
-          <property role="TrG5h" value="invocation" />
-          <node concept="3uibUv" id="2UGjFq48k4A" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2UGjFq48k4B" role="3clF45" />
-        <node concept="3Tm1VV" id="2UGjFq48k4C" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq48k4G" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeUMD" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="2UGjFq48k4H" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="ask" />
-        <node concept="37vLTG" id="2UGjFq48k4I" role="3clF46">
-          <property role="TrG5h" value="result" />
-          <node concept="10P_77" id="2UGjFq48k4J" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="2UGjFq48k4K" role="3clF46">
-          <property role="TrG5h" value="invocation" />
-          <node concept="3uibUv" id="2UGjFq48k4L" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="2UGjFq48k4M" role="3clF45" />
-        <node concept="3Tm1VV" id="2UGjFq48k4N" role="1B3o_S" />
-        <node concept="3clFbS" id="2UGjFq48k4R" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeVgk" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="7vxJ_H4tnOC" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="failure" />
-        <node concept="37vLTG" id="7vxJ_H4tnOD" role="3clF46">
-          <property role="TrG5h" value="fail" />
-          <node concept="3uibUv" id="7vxJ_H4tnOE" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7vxJ_H4tnOF" role="3clF45" />
-        <node concept="3Tm1VV" id="7vxJ_H4tnOG" role="1B3o_S" />
-        <node concept="3clFbS" id="7vxJ_H4tnOK" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeVI3" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="7feMCq_cIyn" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="reportFailure" />
-        <node concept="37vLTG" id="7feMCq_cIyo" role="3clF46">
-          <property role="TrG5h" value="message" />
-          <node concept="17QB3L" id="7feMCq_cIyp" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="7feMCq_cIyq" role="3clF45" />
-        <node concept="3Tm1VV" id="7feMCq_cIyr" role="1B3o_S" />
-        <node concept="3clFbS" id="7feMCq_cIyv" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeWc4" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="5cnt3vhg2Ou" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="restored" />
-        <node concept="37vLTG" id="5cnt3vhg2Ov" role="3clF46">
-          <property role="TrG5h" value="occurrence" />
-          <node concept="3uibUv" id="5cnt3vhg2Ow" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="5cnt3vhg2Ox" role="3clF45" />
-        <node concept="3Tm1VV" id="5cnt3vhg2Oy" role="1B3o_S" />
-        <node concept="3clFbS" id="5cnt3vhg2O$" role="3clF47" />
-        <node concept="2AHcQZ" id="5cnt3vhg2O_" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="7nkyKX7h9eG" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="result" />
-        <node concept="37vLTG" id="7nkyKX7h9eH" role="3clF46">
-          <property role="TrG5h" value="constraint" />
-          <node concept="3uibUv" id="5mr7UHccduP" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7nkyKX7h9eJ" role="3clF45" />
-        <node concept="3Tm1VV" id="7nkyKX7h9eK" role="1B3o_S" />
-        <node concept="3clFbS" id="7nkyKX7h9eN" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeWE1" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="7nkyKX7h9eO" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="garbage" />
-        <node concept="37vLTG" id="7nkyKX7h9eP" role="3clF46">
-          <property role="TrG5h" value="constraint" />
-          <node concept="3uibUv" id="5mr7UHccd_Z" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7nkyKX7h9eR" role="3clF45" />
-        <node concept="3Tm1VV" id="7nkyKX7h9eS" role="1B3o_S" />
-        <node concept="3clFbS" id="7nkyKX7h9eV" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeX86" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="18cJbc1jSg7" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="info" />
-        <node concept="37vLTG" id="18cJbc1jSg8" role="3clF46">
-          <property role="TrG5h" value="message" />
-          <node concept="17QB3L" id="18cJbc1jSg9" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="18cJbc1jSga" role="3clF45" />
-        <node concept="3Tm1VV" id="18cJbc1jSgb" role="1B3o_S" />
-        <node concept="3clFbS" id="18cJbc1jSge" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeXAn" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="15BaR5AeJIw" role="1B3o_S" />
-      <node concept="3uibUv" id="15BaR5AeNrp" role="EKbjA">
-        <ref role="3uigEE" node="qubcdtxBiR" resolve="EvaluationTraceExt" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="15BaR5AeJ4Y" role="jymVt" />
-    <node concept="3Tm1VV" id="qubcdtxBiS" role="1B3o_S" />
-    <node concept="3uibUv" id="qubcdtxBjm" role="3HQHJm">
-      <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
-    </node>
-  </node>
-  <node concept="312cEu" id="5uFPQ7BZsAX">
-    <property role="TrG5h" value="AbstractConstraint" />
-    <node concept="2tJIrI" id="5uFPQ7BZsC9" role="jymVt" />
-    <node concept="3clFbW" id="5uFPQ7BZtsU" role="jymVt">
-      <node concept="37vLTG" id="5uFPQ7BZtxe" role="3clF46">
-        <property role="TrG5h" value="constraintSymbol" />
-        <node concept="3uibUv" id="5uFPQ7BZtBR" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5uFPQ7BZtIF" role="3clF46">
-        <property role="TrG5h" value="arguments" />
-        <node concept="10Q1$e" id="4sSe4$oSOBc" role="1tU5fm">
-          <node concept="3uibUv" id="5uFPQ7BZzov" role="10Q1$1">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4sSe4$oSOVM" role="3clF46">
-        <property role="TrG5h" value="logicals" />
-        <node concept="10Q1$e" id="4sSe4$oSP_q" role="1tU5fm">
-          <node concept="3uibUv" id="4sSe4$oSPgO" role="10Q1$1">
-            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5uFPQ7BZtsW" role="3clF45" />
-      <node concept="3Tm1VV" id="5uFPQ7BZtsX" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BZtsY" role="3clF47">
-        <node concept="3clFbF" id="5uFPQ7BZu64" role="3cqZAp">
-          <node concept="37vLTI" id="5uFPQ7BZu66" role="3clFbG">
-            <node concept="2OqwBi" id="5uFPQ7BZu6a" role="37vLTJ">
-              <node concept="Xjq3P" id="5uFPQ7BZu6d" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5uFPQ7BZu69" role="2OqNvi">
-                <ref role="2Oxat5" node="5uFPQ7BZu60" resolve="symbol" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5uFPQ7BZu6e" role="37vLTx">
-              <ref role="3cqZAo" node="5uFPQ7BZtxe" resolve="constraintSymbol" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5uFPQ7BZuek" role="3cqZAp">
-          <node concept="37vLTI" id="5uFPQ7BZuem" role="3clFbG">
-            <node concept="2OqwBi" id="5uFPQ7BZueq" role="37vLTJ">
-              <node concept="Xjq3P" id="5uFPQ7BZuet" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5uFPQ7BZuep" role="2OqNvi">
-                <ref role="2Oxat5" node="5uFPQ7BZuef" resolve="arguments" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5uFPQ7BZueu" role="37vLTx">
-              <ref role="3cqZAo" node="5uFPQ7BZtIF" resolve="arguments" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4sSe4$oSRPQ" role="3cqZAp">
-          <node concept="37vLTI" id="4sSe4$oSRPS" role="3clFbG">
-            <node concept="2OqwBi" id="4sSe4$oSRPW" role="37vLTJ">
-              <node concept="Xjq3P" id="4sSe4$oSRPZ" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4sSe4$oSRPV" role="2OqNvi">
-                <ref role="2Oxat5" node="4sSe4$oSRPL" resolve="logicals" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4sSe4$oSRQ0" role="37vLTx">
-              <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="4sSe4$oYGyc" role="3cqZAp">
-          <node concept="3SKdUq" id="4sSe4$oYGye" role="3SKWNk">
-            <property role="3SKdUp" value="invariant: if the logicals array is not empty, it must be the same size as the arguments array" />
-          </node>
-        </node>
-        <node concept="1gVbGN" id="4sSe4$oYAeU" role="3cqZAp">
-          <node concept="22lmx$" id="4sSe4$oYCHi" role="1gVkn0">
-            <node concept="3clFbC" id="4sSe4$oYEu3" role="3uHU7w">
-              <node concept="2OqwBi" id="4sSe4$oYFjm" role="3uHU7w">
-                <node concept="37vLTw" id="4sSe4$oYESh" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5uFPQ7BZtIF" resolve="arguments" />
-                </node>
-                <node concept="1Rwk04" id="4sSe4$oYFIW" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="4sSe4$oYDx8" role="3uHU7B">
-                <node concept="37vLTw" id="4sSe4$oYD7p" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
-                </node>
-                <node concept="1Rwk04" id="4sSe4$oYDXu" role="2OqNvi" />
-              </node>
-            </node>
-            <node concept="3clFbC" id="4sSe4$oYBY7" role="3uHU7B">
-              <node concept="2OqwBi" id="4sSe4$oYB22" role="3uHU7B">
-                <node concept="37vLTw" id="4sSe4$oYACI" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
-                </node>
-                <node concept="1Rwk04" id="4sSe4$oYBtX" role="2OqNvi" />
-              </node>
-              <node concept="3cmrfG" id="4sSe4$oYCn9" role="3uHU7w">
-                <property role="3cmrfH" value="0" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BZto4" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BZsCD" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="symbol" />
-      <node concept="3uibUv" id="5uFPQ7BZsCE" role="3clF45">
-        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-      </node>
-      <node concept="3Tm1VV" id="5uFPQ7BZsCF" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BZsCH" role="3clF47">
-        <node concept="3clFbF" id="5uFPQ7BZvwz" role="3cqZAp">
-          <node concept="37vLTw" id="5uFPQ7BZvwy" role="3clFbG">
-            <ref role="3cqZAo" node="5uFPQ7BZu60" resolve="symbol" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5uFPQ7BZvzp" role="jymVt" />
-    <node concept="3clFb_" id="5uFPQ7BZsCK" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="arguments" />
-      <node concept="3Tm1VV" id="5uFPQ7BZsCO" role="1B3o_S" />
-      <node concept="3clFbS" id="5uFPQ7BZsCS" role="3clF47">
-        <node concept="3clFbF" id="5uFPQ7BZvJl" role="3cqZAp">
-          <node concept="2YIFZM" id="5uFPQ7BZvJm" role="3clFbG">
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
-            <node concept="2YIFZM" id="5uFPQ7BZvJn" role="37wK5m">
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
-              <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-              <node concept="37vLTw" id="5uFPQ7BZvJo" role="37wK5m">
-                <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="7HUwyZaBHhW" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3qTvmN" id="7HUwyZaBHwS" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78CwJJcOxO4" role="jymVt" />
-    <node concept="3clFb_" id="78CwJJcOxDH" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="argumentTypes" />
-      <node concept="3uibUv" id="78CwJJcOxDI" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="78CwJJcOxDJ" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="3qTvmN" id="78CwJJcOxDK" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="78CwJJcOxDL" role="1B3o_S" />
-      <node concept="3clFbS" id="78CwJJcOxDN" role="3clF47">
-        <node concept="3cpWs8" id="78CwJJcO$LY" role="3cqZAp">
-          <node concept="3cpWsn" id="78CwJJcO$LZ" role="3cpWs9">
-            <property role="TrG5h" value="types" />
-            <node concept="3uibUv" id="78CwJJcO$LM" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
-              <node concept="3uibUv" id="78CwJJcO$LS" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                <node concept="3qTvmN" id="78CwJJcO$LT" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="78CwJJcO$M0" role="33vP2m">
-              <node concept="1pGfFk" id="78CwJJcO$M1" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                <node concept="2OqwBi" id="78CwJJcO$M2" role="37wK5m">
-                  <node concept="37vLTw" id="78CwJJcO$M3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
-                  </node>
-                  <node concept="1Rwk04" id="78CwJJcO$M4" role="2OqNvi" />
-                </node>
-                <node concept="3uibUv" id="78CwJJcO$M5" role="1pMfVU">
-                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                  <node concept="3qTvmN" id="78CwJJcO$M6" role="11_B2D" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="78CwJJcO_52" role="3cqZAp">
-          <node concept="3clFbS" id="78CwJJcO_54" role="2LFqv$">
-            <node concept="3clFbJ" id="7HUwyZbi3jO" role="3cqZAp">
-              <node concept="3clFbS" id="7HUwyZbi3jQ" role="3clFbx">
-                <node concept="3clFbF" id="7HUwyZbi3VL" role="3cqZAp">
-                  <node concept="2OqwBi" id="7HUwyZbi418" role="3clFbG">
-                    <node concept="37vLTw" id="7HUwyZbi3VJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
-                    </node>
-                    <node concept="liA8E" id="7HUwyZbi4hh" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                      <node concept="2OqwBi" id="7HUwyZbi4Af" role="37wK5m">
-                        <node concept="1eOMI4" id="7HUwyZbi4o9" role="2Oq$k0">
-                          <node concept="10QFUN" id="7HUwyZbi4o6" role="1eOMHV">
-                            <node concept="37vLTw" id="7HUwyZbi4yM" role="10QFUP">
-                              <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
-                            </node>
-                            <node concept="3uibUv" id="7HUwyZbi4uN" role="10QFUM">
-                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7HUwyZbi4HE" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4TCblo5YN91" role="3cqZAp" />
-              </node>
-              <node concept="2ZW3vV" id="7HUwyZbi3ty" role="3clFbw">
-                <node concept="3uibUv" id="7HUwyZbi3vq" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                </node>
-                <node concept="37vLTw" id="7HUwyZbi3rn" role="2ZW6bz">
-                  <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
-                </node>
-              </node>
-              <node concept="3eNFk2" id="4sSe4$prurd" role="3eNLev">
-                <node concept="2ZW3vV" id="4sSe4$prvtz" role="3eO9$A">
-                  <node concept="3uibUv" id="4sSe4$ps1yr" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
-                  </node>
-                  <node concept="37vLTw" id="4sSe4$prv0k" role="2ZW6bz">
-                    <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="4sSe4$prurf" role="3eOfB_">
-                  <node concept="3SKdUt" id="4sSe4$prxfA" role="3cqZAp">
-                    <node concept="3SKdUq" id="4sSe4$prxfC" role="3SKWNk">
-                      <property role="3SKdUp" value="FIXME: need a way to find the interface class of the argument " />
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="4sSe4$prGBU" role="3cqZAp">
-                    <node concept="2OqwBi" id="4sSe4$prHi8" role="3clFbG">
-                      <node concept="37vLTw" id="4sSe4$prGBS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
-                      </node>
-                      <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                        <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
-                          <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4sSe4$prwMh" role="3cqZAp" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="7HUwyZbi4Sk" role="9aQIa">
-                <node concept="3clFbS" id="7HUwyZbi4Sl" role="9aQI4">
-                  <node concept="3clFbF" id="78CwJJcO_ku" role="3cqZAp">
-                    <node concept="2OqwBi" id="78CwJJcO_ok" role="3clFbG">
-                      <node concept="37vLTw" id="78CwJJcO_ks" role="2Oq$k0">
-                        <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
-                      </node>
-                      <node concept="liA8E" id="78CwJJcO_AW" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                        <node concept="2OqwBi" id="78CwJJcO_HO" role="37wK5m">
-                          <node concept="37vLTw" id="78CwJJcO_G3" role="2Oq$k0">
-                            <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
-                          </node>
-                          <node concept="liA8E" id="78CwJJcO_ND" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="78CwJJcO_55" role="1Duv9x">
-            <property role="TrG5h" value="arg" />
-            <node concept="3uibUv" id="78CwJJcO_9N" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="78CwJJcO_hl" role="1DdaDG">
-            <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="78CwJJcOAQH" role="3cqZAp">
-          <node concept="37vLTw" id="78CwJJcOAQF" role="3clFbG">
-            <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4TCblo5M5Qi" role="jymVt" />
-    <node concept="3clFb_" id="4sSe4$oZGZ9" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="patternPredicates" />
-      <node concept="37vLTG" id="6v0X_XJLN7q" role="3clF46">
-        <property role="TrG5h" value="occurrenceArgs" />
-        <node concept="3uibUv" id="6v0X_XJLNp1" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-          <node concept="3qTvmN" id="6v0X_XJLNPD" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="4sSe4$oZGZa" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        <node concept="3qUE_q" id="4sSe4$oZGZb" role="11_B2D">
-          <node concept="3uibUv" id="4sSe4$oZGZc" role="3qUE_r">
-            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4sSe4$oZGZd" role="1B3o_S" />
-      <node concept="3clFbS" id="4sSe4$oZGZo" role="3clF47">
-        <node concept="3cpWs8" id="4sSe4$p01mP" role="3cqZAp">
-          <node concept="3cpWsn" id="4sSe4$p01mQ" role="3cpWs9">
-            <property role="TrG5h" value="res" />
-            <node concept="3uibUv" id="4sSe4$p01mH" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
-              <node concept="3uibUv" id="4sSe4$p01mK" role="11_B2D">
-                <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="4sSe4$p01mR" role="33vP2m">
-              <node concept="1pGfFk" id="4sSe4$p01mS" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                <node concept="3uibUv" id="4sSe4$p01mT" role="1pMfVU">
-                  <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-                </node>
-                <node concept="3cmrfG" id="6v0X_XJM1xt" role="37wK5m">
-                  <property role="3cmrfH" value="4" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4sSe4$oZLsl" role="3cqZAp">
-          <node concept="3cpWsn" id="4sSe4$oZLsm" role="3cpWs9">
-            <property role="TrG5h" value="idx" />
-            <node concept="10Oyi0" id="4sSe4$oZLsn" role="1tU5fm" />
-            <node concept="3cmrfG" id="4sSe4$oZLso" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="4sSe4$oZLsp" role="3cqZAp">
-          <node concept="3clFbS" id="4sSe4$oZLsq" role="2LFqv$">
-            <node concept="3cpWs8" id="4sSe4$oZLsu" role="3cqZAp">
-              <node concept="3cpWsn" id="4sSe4$oZLsv" role="3cpWs9">
-                <property role="TrG5h" value="logicalToBind" />
-                <node concept="3uibUv" id="4sSe4$oZLsw" role="1tU5fm">
-                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                  <node concept="3qTvmN" id="4sSe4$oZLsx" role="11_B2D" />
-                </node>
-                <node concept="1rXfSq" id="6v0X_XJLW3d" role="33vP2m">
-                  <ref role="37wK5l" node="4sSe4$oTo$P" resolve="logicalToBind" />
-                  <node concept="37vLTw" id="6v0X_XJLWFm" role="37wK5m">
-                    <ref role="3cqZAo" node="4sSe4$oZLsm" resolve="idx" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="4sSe4$oZLs$" role="3cqZAp">
-              <node concept="3clFbS" id="4sSe4$oZLs_" role="3clFbx">
-                <node concept="3clFbF" id="4sSe4$p0gUm" role="3cqZAp">
-                  <node concept="2OqwBi" id="4sSe4$p0h_D" role="3clFbG">
-                    <node concept="37vLTw" id="4sSe4$p0gUk" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
-                    </node>
-                    <node concept="liA8E" id="4sSe4$p0iRE" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                      <node concept="2ShNRf" id="4sSe4$p0jEu" role="37wK5m">
-                        <node concept="1pGfFk" id="4sSe4$p0lnr" role="2ShVmc">
-                          <ref role="37wK5l" to="cxk7:4xBopTzmopz" resolve="UnificationPredicate" />
-                          <node concept="37vLTw" id="4sSe4$p0p1w" role="37wK5m">
-                            <ref role="3cqZAo" node="4sSe4$oZLtc" resolve="occArg" />
-                          </node>
-                          <node concept="37vLTw" id="4sSe4$p0x2p" role="37wK5m">
-                            <ref role="3cqZAo" node="4sSe4$oZLsv" resolve="logicalToBind" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="4sSe4$oZLsJ" role="3clFbw">
-                <node concept="10Nm6u" id="4sSe4$oZLsK" role="3uHU7w" />
-                <node concept="37vLTw" id="4sSe4$oZLsL" role="3uHU7B">
-                  <ref role="3cqZAo" node="4sSe4$oZLsv" resolve="logicalToBind" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4sSe4$oZLt9" role="3cqZAp">
-              <node concept="3uNrnE" id="4sSe4$oZLta" role="3clFbG">
-                <node concept="37vLTw" id="4sSe4$oZLtb" role="2$L3a6">
-                  <ref role="3cqZAo" node="4sSe4$oZLsm" resolve="idx" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="4sSe4$oZLtc" role="1Duv9x">
-            <property role="TrG5h" value="occArg" />
-            <node concept="3uibUv" id="4sSe4$oZLtd" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="6v0X_XJLSmc" role="1DdaDG">
-            <ref role="3cqZAo" node="6v0X_XJLN7q" resolve="occurrenceArgs" />
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4sSe4$p0aeq" role="3cqZAp">
-          <node concept="37vLTw" id="4sSe4$p042u" role="3cqZAk">
-            <ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4sSe4$oZHFX" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oZJf2" role="jymVt" />
-    <node concept="3clFb_" id="4sSe4$oTo$P" role="jymVt">
-      <property role="TrG5h" value="logicalToBind" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="37vLTG" id="4sSe4$oTo$Q" role="3clF46">
-        <property role="TrG5h" value="argIdx" />
-        <node concept="10Oyi0" id="4sSe4$oTo$R" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4sSe4$oTo$S" role="3clF45">
-        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-        <node concept="3qTvmN" id="4sSe4$oTo$T" role="11_B2D" />
-      </node>
-      <node concept="3Tmbuc" id="4sSe4$oTo$U" role="1B3o_S" />
-      <node concept="3clFbS" id="4sSe4$oTo_3" role="3clF47">
-        <node concept="3clFbJ" id="4sSe4$oTr8F" role="3cqZAp">
-          <node concept="3eOSWO" id="4sSe4$oTsE_" role="3clFbw">
-            <node concept="3cmrfG" id="4sSe4$oTsFp" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
-            </node>
-            <node concept="2OqwBi" id="4sSe4$oTrOW" role="3uHU7B">
-              <node concept="37vLTw" id="4sSe4$oTruO" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sSe4$oSRPL" resolve="logicals" />
-              </node>
-              <node concept="1Rwk04" id="4sSe4$oTsdD" role="2OqNvi" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="4sSe4$oTr8H" role="3clFbx">
-            <node concept="3cpWs6" id="4sSe4$oTve6" role="3cqZAp">
-              <node concept="AH0OO" id="4sSe4$oTv_t" role="3cqZAk">
-                <node concept="37vLTw" id="4sSe4$oTv_u" role="AHEQo">
-                  <ref role="3cqZAo" node="4sSe4$oTo$Q" resolve="argIdx" />
-                </node>
-                <node concept="37vLTw" id="4sSe4$oTv_v" role="AHHXb">
-                  <ref role="3cqZAo" node="4sSe4$oSRPL" resolve="logicals" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="4sSe4$oTwjh" role="3cqZAp" />
-          </node>
-          <node concept="9aQIb" id="4sSe4$oTu85" role="9aQIa">
-            <node concept="3clFbS" id="4sSe4$oTu86" role="9aQI4">
-              <node concept="3cpWs6" id="4sSe4$oTx1H" role="3cqZAp">
-                <node concept="10Nm6u" id="4sSe4$oTxvr" role="3cqZAk" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oToXD" role="jymVt" />
-    <node concept="3Tm1VV" id="5uFPQ7BZsAY" role="1B3o_S" />
-    <node concept="3uibUv" id="5uFPQ7BZsBQ" role="EKbjA">
-      <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-    </node>
-    <node concept="312cEg" id="5uFPQ7BZu60" role="jymVt">
-      <property role="TrG5h" value="symbol" />
-      <node concept="3Tm6S6" id="5uFPQ7BZu61" role="1B3o_S" />
-      <node concept="3uibUv" id="5uFPQ7BZu63" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oTpGf" role="jymVt" />
-    <node concept="312cEg" id="5uFPQ7BZuef" role="jymVt">
-      <property role="TrG5h" value="arguments" />
-      <node concept="3Tm6S6" id="5uFPQ7BZueg" role="1B3o_S" />
-      <node concept="10Q1$e" id="5uFPQ7BZzdN" role="1tU5fm">
-        <node concept="3uibUv" id="5uFPQ7BZzdK" role="10Q1$1">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oTq3z" role="jymVt" />
-    <node concept="312cEg" id="4sSe4$oSRPL" role="jymVt">
-      <property role="TrG5h" value="logicals" />
-      <node concept="3Tm6S6" id="4sSe4$oSRPM" role="1B3o_S" />
-      <node concept="10Q1$e" id="4sSe4$oSRPO" role="1tU5fm">
-        <node concept="3uibUv" id="4sSe4$oSRPP" role="10Q1$1">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oTqqS" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="7nPD14NHRdy">
-    <property role="TrG5h" value="WildcardMetaLogical" />
-    <node concept="3Tm1VV" id="7nPD14NHRdz" role="1B3o_S" />
-    <node concept="2tJIrI" id="7nPD14NHROF" role="jymVt" />
-    <node concept="Wx3nA" id="7nPD14NHSoH" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="WILDCARD" />
-      <node concept="3Tm6S6" id="7nPD14NHSoI" role="1B3o_S" />
-      <node concept="17QB3L" id="7nPD14NHSoJ" role="1tU5fm" />
-      <node concept="Xl_RD" id="7nPD14NHSoK" role="33vP2m">
-        <property role="Xl_RC" value="_" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NHSk6" role="jymVt" />
-    <node concept="3clFbW" id="7nPD14NHRLE" role="jymVt">
-      <node concept="3cqZAl" id="7nPD14NHRLG" role="3clF45" />
-      <node concept="3Tm1VV" id="7nPD14NHRLH" role="1B3o_S" />
-      <node concept="3clFbS" id="7nPD14NHRLI" role="3clF47">
-        <node concept="XkiVB" id="7nPD14NXX3u" role="3cqZAp">
-          <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
-          <node concept="37vLTw" id="7nPD14NXX8t" role="37wK5m">
-            <ref role="3cqZAo" node="7nPD14NHRSd" resolve="type" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7nPD14NHRSd" role="3clF46">
-        <property role="TrG5h" value="type" />
-        <node concept="3uibUv" id="7nPD14NHRSc" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NHRVY" role="11_B2D">
-            <ref role="16sUi3" node="7nPD14NHRwV" resolve="V" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7nPD14NXXeh" role="jymVt" />
-    <node concept="16euLQ" id="7nPD14NHRwV" role="16eVyc">
-      <property role="TrG5h" value="V" />
-    </node>
-    <node concept="3uibUv" id="7nPD14NXWzX" role="1zkMxy">
-      <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-      <node concept="16syzq" id="7nPD14NXWFt" role="11_B2D">
-        <ref role="16sUi3" node="7nPD14NHRwV" resolve="V" />
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="5WBVN_M1BKE">
-    <property role="TrG5h" value="LateExpression" />
-    <node concept="2tJIrI" id="5WBVN_M1BL8" role="jymVt" />
-    <node concept="3clFb_" id="5WBVN_M1BSf" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="metaArgs" />
-      <node concept="10Q1$e" id="5WBVN_MlESz" role="3clF45">
-        <node concept="3uibUv" id="5WBVN_MlERY" role="10Q1$1">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5WBVN_M1BSi" role="1B3o_S" />
-      <node concept="3clFbS" id="5WBVN_M1BSj" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5WBVN_M1BRL" role="jymVt" />
-    <node concept="3clFb_" id="5WBVN_M1BLN" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="eval" />
-      <node concept="37vLTG" id="6yUEjXvTuvu" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="6yUEjXvTu_d" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5WBVN_M1BNS" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="5WBVN_M1BOF" role="1tU5fm">
-          <node concept="3uibUv" id="5WBVN_M1BOh" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="5WBVN_M1BQX" role="3clF45">
-        <ref role="16sUi3" node="5WBVN_M1BQ$" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="5WBVN_M1BLQ" role="1B3o_S" />
-      <node concept="3clFbS" id="5WBVN_M1BLR" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5WBVN_M1BLq" role="jymVt" />
-    <node concept="3Tm1VV" id="5WBVN_M1BKF" role="1B3o_S" />
-    <node concept="16euLQ" id="5WBVN_M1BQ$" role="16eVyc">
-      <property role="TrG5h" value="T" />
-    </node>
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index 2e8e079c..d4e5bd61 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -61,7 +61,6 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 687622ff..8dcafd71 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -4,10 +4,10 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -107,29 +107,6 @@
         <child id="5455284157993911099" name="values" index="2pJxcM" />
       </concept>
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434294982" name="jetbrains.mps.dataform.structure.ValueFeature" flags="ng" index="nssqF" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="3063948360254832884" name="declaration" index="3XD1gS" />
@@ -141,10 +118,31 @@
         <child id="8829335963591530990" name="expression" index="aZ4eD" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfLogicalExpression" flags="ng" index="1TmgYN">
+      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
         <child id="2455719244613924416" name="logical" index="1Tms7$" />
       </concept>
     </language>
@@ -453,21 +451,6 @@
       </node>
     </node>
   </node>
-  <node concept="ns1xd" id="JOGAOsVt6x">
-    <property role="TrG5h" value="Types" />
-    <node concept="ns1x$" id="JOGAOsVt6y" role="ns1xc">
-      <property role="TrG5h" value="Type" />
-      <node concept="nspSf" id="JOGAOsVt6z" role="ns1xx">
-        <node concept="nssqF" id="7mB3viLdDa5" role="nspSe">
-          <property role="TrG5h" value="name" />
-        </node>
-        <node concept="nssqF" id="JOGAOsVt6$" role="nspSe">
-          <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="3IIf9OArhmM">
     <property role="TrG5h" value="Convert" />
     <node concept="1nLNMY" id="7mB3viLi4pn" role="1nK1Vg">
@@ -1103,5 +1086,20 @@
       <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
     </node>
   </node>
+  <node concept="ns1xd" id="JOGAOsVt6x">
+    <property role="TrG5h" value="Types" />
+    <node concept="ns1x$" id="JOGAOsVt6y" role="ns1xc">
+      <property role="TrG5h" value="Type" />
+      <node concept="nspSf" id="JOGAOsVt6z" role="ns1xx">
+        <node concept="nssqF" id="7mB3viLdDa5" role="nspSe">
+          <property role="TrG5h" value="name" />
+        </node>
+        <node concept="nssqF" id="JOGAOsVt6$" role="nspSe">
+          <property role="TrG5h" value="val" />
+          <property role="nspS5" value="false" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 70bc5d52..e21862c0 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -39,7 +39,6 @@
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="rgfa" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.tree(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="u30n" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.treeStructure.treetable(MPS.IDEA/)" />
@@ -52,7 +51,7 @@
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6rp1" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:com.github.andrewoma.dexx.collection(jetbrains.mps.logic.reactor/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
@@ -84,6 +83,7 @@
     <import index="iljd" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.plugins(jetbrains.mps.coderules/)" />
     <import index="5tvg" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.disposables(jetbrains.mps.coderules/)" />
     <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -3215,7 +3215,7 @@
     </node>
     <node concept="3Tm1VV" id="6IQb_Rx3pZ9" role="1B3o_S" />
     <node concept="3uibUv" id="6IQb_Rx3qQh" role="1zkMxy">
-      <ref role="3uigEE" to="yg8f:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
+      <ref role="3uigEE" to="7n8k:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
     </node>
   </node>
   <node concept="312cEu" id="4vBwiiVrUlG">
@@ -6171,7 +6171,7 @@
     </node>
     <node concept="3Tm1VV" id="YGS68MDHIa" role="1B3o_S" />
     <node concept="3uibUv" id="YGS68MEieQ" role="EKbjA">
-      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+      <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
     </node>
   </node>
   <node concept="312cEu" id="6QkkSolfqrm">
@@ -7870,7 +7870,7 @@
                         <node concept="3cpWs6" id="19wqdqOqxsQ" role="3cqZAp">
                           <node concept="2ShNRf" id="19wqdqOqxsR" role="3cqZAk">
                             <node concept="1pGfFk" id="19wqdqOqxsS" role="2ShVmc">
-                              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
+                              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                               <node concept="1rXfSq" id="19wqdqOqxsT" role="37wK5m">
                                 <ref role="37wK5l" node="19wqdqOpSqM" resolve="logicalSnapshot" />
                                 <node concept="37vLTw" id="19wqdqOqxsU" role="37wK5m">
@@ -11915,7 +11915,7 @@
       <ref role="3uigEE" node="YGS68MDHI9" resolve="Sink" />
     </node>
     <node concept="3uibUv" id="YGS68ME8xi" role="EKbjA">
-      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+      <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
     </node>
     <node concept="2tJIrI" id="5cnt3vhg7bh" role="jymVt" />
     <node concept="3clFb_" id="5cnt3vhgbAS" role="jymVt">
@@ -17036,7 +17036,7 @@
       <node concept="37vLTG" id="6YPNC4PsId0" role="3clF46">
         <property role="TrG5h" value="termNode" />
         <node concept="3uibUv" id="6YPNC4PsId1" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="2AHcQZ" id="6YPNC4PsId6" role="2AJF6D">
@@ -18438,7 +18438,7 @@
     <node concept="3clFb_" id="YGS68MEx_L" role="jymVt">
       <property role="TrG5h" value="trace" />
       <node concept="3uibUv" id="YGS68MEAd1" role="3clF45">
-        <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+        <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
       </node>
       <node concept="3Tm1VV" id="YGS68MEx_O" role="1B3o_S" />
       <node concept="3clFbS" id="YGS68MEx_P" role="3clF47">
@@ -29352,7 +29352,7 @@
     </node>
     <node concept="3Tm1VV" id="YGS68MDzNV" role="1B3o_S" />
     <node concept="3uibUv" id="YGS68MDF0A" role="EKbjA">
-      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+      <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
     </node>
     <node concept="3uibUv" id="YGS68MDJ0J" role="1zkMxy">
       <ref role="3uigEE" node="YGS68MDHI9" resolve="Sink" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index c4e4240b..f24e3383 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -23,7 +23,6 @@
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
@@ -33,6 +32,7 @@
     <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
     <import index="e0w6" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.observers(jetbrains.mps.coderules/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -1605,9 +1605,9 @@
                         <node concept="37vLTw" id="55Q$YFtJUbX" role="1Lso8e">
                           <ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
                         </node>
-                        <node concept="10M0yZ" id="6tPOoeTcfZY" role="1Lso8e">
-                          <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                          <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
+                        <node concept="10M0yZ" id="74q$MmRB2bc" role="1Lso8e">
+                          <ref role="3cqZAo" to="7n8k:24Vro6cS5rK" resolve="NULL" />
+                          <ref role="1PxDUh" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                         </node>
                       </node>
                     </node>
@@ -1639,7 +1639,7 @@
               <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="3uibUv" id="6tPOoeTcgU8" role="1Lm7xW">
-              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+              <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
             </node>
           </node>
         </node>
@@ -1704,7 +1704,7 @@
                         </node>
                       </node>
                       <node concept="3uibUv" id="6tPOoeTciTG" role="1tU5fm">
-                        <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                        <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                       </node>
                     </node>
                   </node>
@@ -2295,7 +2295,7 @@
                       <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                     </node>
                     <node concept="3uibUv" id="4BHjwwGA78e" role="1Lm7xW">
-                      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                      <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                     </node>
                   </node>
                 </node>
@@ -2310,7 +2310,7 @@
       <property role="TrG5h" value="timeout" />
       <node concept="3Tm6S6" id="6kREIVky9Ky" role="1B3o_S" />
       <node concept="3uibUv" id="6kREIVkyByx" role="3clF45">
-        <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+        <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
       </node>
       <node concept="3clFbS" id="6kREIVky9Jy" role="3clF47">
         <node concept="3cpWs8" id="6kREIVky9Jz" role="3cqZAp">
@@ -2386,7 +2386,7 @@
           <node concept="3K4zz7" id="6kREIVkyFHp" role="3cqZAk">
             <node concept="2ShNRf" id="6kREIVkyFHq" role="3K4GZi">
               <node concept="HV5vD" id="6kREIVkyFHr" role="2ShVmc">
-                <ref role="HV5vE" to="yg8f:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
+                <ref role="HV5vE" to="7n8k:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
               </node>
             </node>
             <node concept="3eOSWO" id="6kREIVkyFHs" role="3K4Cdx">
@@ -2401,8 +2401,8 @@
               <node concept="YeOm9" id="6kREIVkyFHw" role="2ShVmc">
                 <node concept="1Y3b0j" id="6kREIVkyFHx" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="yg8f:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="7n8k:15BaR5AeJIv" resolve="EvaluationTraceExt.Stub" />
                   <node concept="3Tm1VV" id="6kREIVkyFHy" role="1B3o_S" />
                   <node concept="3clFb_" id="6kREIVkyFHz" role="jymVt">
                     <property role="1EzhhJ" value="false" />
@@ -2574,7 +2574,7 @@
       <node concept="3Tm6S6" id="7nPD14NbJdu" role="1B3o_S" />
       <node concept="10Q1$e" id="5mg4ZgLcBSs" role="1tU5fm">
         <node concept="3uibUv" id="5mg4ZgLc_Nn" role="10Q1$1">
-          <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+          <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
         </node>
       </node>
     </node>
@@ -2601,7 +2601,7 @@
         <property role="TrG5h" value="trace" />
         <node concept="8X2XB" id="7nPD14NbIWm" role="1tU5fm">
           <node concept="3uibUv" id="7nPD14NbINX" role="8Xvag">
-            <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+            <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
           </node>
         </node>
       </node>
@@ -3404,7 +3404,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLduUd" role="2OqNvi">
-                  <ref role="37wK5l" to="yg8f:5cnt3vhfW9c" resolve="restored" />
+                  <ref role="37wK5l" to="7n8k:5cnt3vhfW9c" resolve="restored" />
                   <node concept="37vLTw" id="5mg4ZgLdwK7" role="37wK5m">
                     <ref role="3cqZAo" node="5cnt3vhiq53" resolve="occurrence" />
                   </node>
@@ -3463,7 +3463,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLdxZx" role="2OqNvi">
-                  <ref role="37wK5l" to="yg8f:7nkyKX7gU0T" resolve="result" />
+                  <ref role="37wK5l" to="7n8k:7nkyKX7gU0T" resolve="result" />
                   <node concept="37vLTw" id="5mg4ZgLdzLT" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLup" resolve="constraint" />
                   </node>
@@ -3522,7 +3522,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd_1d" role="2OqNvi">
-                  <ref role="37wK5l" to="yg8f:7nkyKX7gU3L" resolve="garbage" />
+                  <ref role="37wK5l" to="7n8k:7nkyKX7gU3L" resolve="garbage" />
                   <node concept="37vLTw" id="5mg4ZgLd_1e" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLuw" resolve="constraint" />
                   </node>
@@ -3579,7 +3579,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLdBaP" role="2OqNvi">
-                  <ref role="37wK5l" to="yg8f:18cJbc1jRnT" resolve="info" />
+                  <ref role="37wK5l" to="7n8k:18cJbc1jRnT" resolve="info" />
                   <node concept="37vLTw" id="5mg4ZgLdCYf" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLuB" resolve="message" />
                   </node>
@@ -3615,7 +3615,7 @@
     </node>
     <node concept="3Tm1VV" id="7nPD14NbIig" role="1B3o_S" />
     <node concept="3uibUv" id="7nPD14NbIiQ" role="EKbjA">
-      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+      <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
     </node>
   </node>
   <node concept="312cEu" id="3KwBCAA_ela">
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 767a8b8e..d07040ae 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -31,7 +31,7 @@
     <import index="o35r" ref="r:76281d8a-46ce-405f-8cfc-287ee8597b54(jetbrains.mps.coderules.ui.plugin)" />
     <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -1475,7 +1475,7 @@
                   <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                 </node>
                 <node concept="3uibUv" id="6Yb9hAqUIFI" role="1Lm7xW">
-                  <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                  <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                 </node>
               </node>
             </node>
@@ -1629,7 +1629,7 @@
                         <node concept="1eOMI4" id="6Yb9hAqUIH4" role="1Lso8e">
                           <node concept="10QFUN" id="6Yb9hAqUIH5" role="1eOMHV">
                             <node concept="3uibUv" id="6Yb9hAqUIH6" role="10QFUM">
-                              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                              <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                             </node>
                             <node concept="2ShNRf" id="6Yb9hAqUIH7" role="10QFUP">
                               <node concept="1pGfFk" id="6Yb9hAqUIH8" role="2ShVmc">
diff --git a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
index f833a91e..8f6b4ca1 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
+++ b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
@@ -15,6 +15,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 7a552a17..0645179f 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -8,11 +8,12 @@
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
     <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="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -20,8 +21,8 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
-    <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" implicit="true" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" implicit="true" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
+    <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -481,7 +482,7 @@
               <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="3uibUv" id="6Yb9hAqJSaR" role="1Lm7xW">
-              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+              <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
             </node>
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
index 99a91f63..e2ffc8c0 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
@@ -14,12 +14,12 @@
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <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/)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -2203,7 +2203,7 @@
         <node concept="3clFbF" id="429xoypVGks" role="3cqZAp">
           <node concept="2ShNRf" id="429xoypVGkq" role="3clFbG">
             <node concept="1pGfFk" id="429xoypVIuq" role="2ShVmc">
-              <ref role="37wK5l" to="yg8f:5uFPQ7BZtsU" resolve="AbstractConstraint" />
+              <ref role="37wK5l" to="i348:5uFPQ7BZtsU" resolve="AbstractConstraint" />
               <node concept="37vLTw" id="429xoypVIwj" role="37wK5m">
                 <ref role="3cqZAo" node="4sSe4$oM5Ps" resolve="symbol" />
               </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index d18e68dc..e3543624 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -18,9 +18,13 @@
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
       </concept>
@@ -33,10 +37,17 @@
       </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
       <concept id="1188206331916" name="jetbrains.mps.baseLanguage.structure.Annotation" flags="ig" index="2ABs$o" />
       <concept id="1188206574119" name="jetbrains.mps.baseLanguage.structure.AnnotationMethodDeclaration" flags="ig" index="2ACnGN">
         <child id="5790076564176875336" name="defaultValue" index="1IitiX" />
       </concept>
+      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
+        <child id="1173175577737" name="index" index="AHEQo" />
+        <child id="1173175590490" name="array" index="AHHXb" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
@@ -51,6 +62,9 @@
       <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
         <property id="1224848525476" name="isDeprecated" index="IEkAT" />
       </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" />
@@ -66,6 +80,9 @@
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
@@ -73,8 +90,20 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
+      </concept>
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
@@ -111,6 +140,7 @@
       <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
         <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -119,6 +149,7 @@
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
+        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
@@ -127,6 +158,9 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
@@ -136,16 +170,33 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
+        <child id="1206060619838" name="condition" index="3eO9$A" />
+        <child id="1206060644605" name="statementList" index="3eOfB_" />
+      </concept>
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
+        <child id="1160998896846" name="condition" index="1gVkn0" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
         <child id="1107880067339" name="method" index="3MN40a" />
       </concept>
       <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
+      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
+        <child id="1171903916107" name="bound" index="3qUE_r" />
+      </concept>
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
         <property id="8355037393041754995" name="isNative" index="2aFKle" />
       </concept>
@@ -158,16 +209,34 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
+      <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>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
         <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
       </concept>
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="2580416627845338977" name="jetbrains.mps.baseLanguage.structure.ImplicitAnnotationInstanceValue" flags="ng" index="1SXeKx" />
       <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="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
@@ -1182,5 +1251,512 @@
     <property role="TrG5h" value="QueryKind" />
     <node concept="3Tm1VV" id="4t7Xo7inshO" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="5uFPQ7BZsAX">
+    <property role="TrG5h" value="AbstractConstraint" />
+    <node concept="2tJIrI" id="5uFPQ7BZsC9" role="jymVt" />
+    <node concept="3clFbW" id="5uFPQ7BZtsU" role="jymVt">
+      <node concept="37vLTG" id="5uFPQ7BZtxe" role="3clF46">
+        <property role="TrG5h" value="constraintSymbol" />
+        <node concept="3uibUv" id="5uFPQ7BZtBR" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5uFPQ7BZtIF" role="3clF46">
+        <property role="TrG5h" value="arguments" />
+        <node concept="10Q1$e" id="4sSe4$oSOBc" role="1tU5fm">
+          <node concept="3uibUv" id="5uFPQ7BZzov" role="10Q1$1">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4sSe4$oSOVM" role="3clF46">
+        <property role="TrG5h" value="logicals" />
+        <node concept="10Q1$e" id="4sSe4$oSP_q" role="1tU5fm">
+          <node concept="3uibUv" id="4sSe4$oSPgO" role="10Q1$1">
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5uFPQ7BZtsW" role="3clF45" />
+      <node concept="3Tm1VV" id="5uFPQ7BZtsX" role="1B3o_S" />
+      <node concept="3clFbS" id="5uFPQ7BZtsY" role="3clF47">
+        <node concept="3clFbF" id="5uFPQ7BZu64" role="3cqZAp">
+          <node concept="37vLTI" id="5uFPQ7BZu66" role="3clFbG">
+            <node concept="2OqwBi" id="5uFPQ7BZu6a" role="37vLTJ">
+              <node concept="Xjq3P" id="5uFPQ7BZu6d" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5uFPQ7BZu69" role="2OqNvi">
+                <ref role="2Oxat5" node="5uFPQ7BZu60" resolve="symbol" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5uFPQ7BZu6e" role="37vLTx">
+              <ref role="3cqZAo" node="5uFPQ7BZtxe" resolve="constraintSymbol" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5uFPQ7BZuek" role="3cqZAp">
+          <node concept="37vLTI" id="5uFPQ7BZuem" role="3clFbG">
+            <node concept="2OqwBi" id="5uFPQ7BZueq" role="37vLTJ">
+              <node concept="Xjq3P" id="5uFPQ7BZuet" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5uFPQ7BZuep" role="2OqNvi">
+                <ref role="2Oxat5" node="5uFPQ7BZuef" resolve="arguments" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5uFPQ7BZueu" role="37vLTx">
+              <ref role="3cqZAo" node="5uFPQ7BZtIF" resolve="arguments" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sSe4$oSRPQ" role="3cqZAp">
+          <node concept="37vLTI" id="4sSe4$oSRPS" role="3clFbG">
+            <node concept="2OqwBi" id="4sSe4$oSRPW" role="37vLTJ">
+              <node concept="Xjq3P" id="4sSe4$oSRPZ" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4sSe4$oSRPV" role="2OqNvi">
+                <ref role="2Oxat5" node="4sSe4$oSRPL" resolve="logicals" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4sSe4$oSRQ0" role="37vLTx">
+              <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="4sSe4$oYGyc" role="3cqZAp">
+          <node concept="3SKdUq" id="4sSe4$oYGye" role="3SKWNk">
+            <property role="3SKdUp" value="invariant: if the logicals array is not empty, it must be the same size as the arguments array" />
+          </node>
+        </node>
+        <node concept="1gVbGN" id="4sSe4$oYAeU" role="3cqZAp">
+          <node concept="22lmx$" id="4sSe4$oYCHi" role="1gVkn0">
+            <node concept="3clFbC" id="4sSe4$oYEu3" role="3uHU7w">
+              <node concept="2OqwBi" id="4sSe4$oYFjm" role="3uHU7w">
+                <node concept="37vLTw" id="4sSe4$oYESh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5uFPQ7BZtIF" resolve="arguments" />
+                </node>
+                <node concept="1Rwk04" id="4sSe4$oYFIW" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="4sSe4$oYDx8" role="3uHU7B">
+                <node concept="37vLTw" id="4sSe4$oYD7p" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
+                </node>
+                <node concept="1Rwk04" id="4sSe4$oYDXu" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3clFbC" id="4sSe4$oYBY7" role="3uHU7B">
+              <node concept="2OqwBi" id="4sSe4$oYB22" role="3uHU7B">
+                <node concept="37vLTw" id="4sSe4$oYACI" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sSe4$oSOVM" resolve="logicals" />
+                </node>
+                <node concept="1Rwk04" id="4sSe4$oYBtX" role="2OqNvi" />
+              </node>
+              <node concept="3cmrfG" id="4sSe4$oYCn9" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5uFPQ7BZto4" role="jymVt" />
+    <node concept="3clFb_" id="5uFPQ7BZsCD" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="symbol" />
+      <node concept="3uibUv" id="5uFPQ7BZsCE" role="3clF45">
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+      </node>
+      <node concept="3Tm1VV" id="5uFPQ7BZsCF" role="1B3o_S" />
+      <node concept="3clFbS" id="5uFPQ7BZsCH" role="3clF47">
+        <node concept="3clFbF" id="5uFPQ7BZvwz" role="3cqZAp">
+          <node concept="37vLTw" id="5uFPQ7BZvwy" role="3clFbG">
+            <ref role="3cqZAo" node="5uFPQ7BZu60" resolve="symbol" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5uFPQ7BZvzp" role="jymVt" />
+    <node concept="3clFb_" id="5uFPQ7BZsCK" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="arguments" />
+      <node concept="3Tm1VV" id="5uFPQ7BZsCO" role="1B3o_S" />
+      <node concept="3clFbS" id="5uFPQ7BZsCS" role="3clF47">
+        <node concept="3clFbF" id="5uFPQ7BZvJl" role="3cqZAp">
+          <node concept="2YIFZM" id="5uFPQ7BZvJm" role="3clFbG">
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <node concept="2YIFZM" id="5uFPQ7BZvJn" role="37wK5m">
+              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+              <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
+              <node concept="37vLTw" id="5uFPQ7BZvJo" role="37wK5m">
+                <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7HUwyZaBHhW" role="3clF45">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3qTvmN" id="7HUwyZaBHwS" role="11_B2D" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="78CwJJcOxO4" role="jymVt" />
+    <node concept="3clFb_" id="78CwJJcOxDH" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="argumentTypes" />
+      <node concept="3uibUv" id="78CwJJcOxDI" role="3clF45">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3uibUv" id="78CwJJcOxDJ" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qTvmN" id="78CwJJcOxDK" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="78CwJJcOxDL" role="1B3o_S" />
+      <node concept="3clFbS" id="78CwJJcOxDN" role="3clF47">
+        <node concept="3cpWs8" id="78CwJJcO$LY" role="3cqZAp">
+          <node concept="3cpWsn" id="78CwJJcO$LZ" role="3cpWs9">
+            <property role="TrG5h" value="types" />
+            <node concept="3uibUv" id="78CwJJcO$LM" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
+              <node concept="3uibUv" id="78CwJJcO$LS" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                <node concept="3qTvmN" id="78CwJJcO$LT" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="78CwJJcO$M0" role="33vP2m">
+              <node concept="1pGfFk" id="78CwJJcO$M1" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+                <node concept="2OqwBi" id="78CwJJcO$M2" role="37wK5m">
+                  <node concept="37vLTw" id="78CwJJcO$M3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
+                  </node>
+                  <node concept="1Rwk04" id="78CwJJcO$M4" role="2OqNvi" />
+                </node>
+                <node concept="3uibUv" id="78CwJJcO$M5" role="1pMfVU">
+                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                  <node concept="3qTvmN" id="78CwJJcO$M6" role="11_B2D" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="78CwJJcO_52" role="3cqZAp">
+          <node concept="3clFbS" id="78CwJJcO_54" role="2LFqv$">
+            <node concept="3clFbJ" id="7HUwyZbi3jO" role="3cqZAp">
+              <node concept="3clFbS" id="7HUwyZbi3jQ" role="3clFbx">
+                <node concept="3clFbF" id="7HUwyZbi3VL" role="3cqZAp">
+                  <node concept="2OqwBi" id="7HUwyZbi418" role="3clFbG">
+                    <node concept="37vLTw" id="7HUwyZbi3VJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
+                    </node>
+                    <node concept="liA8E" id="7HUwyZbi4hh" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                      <node concept="2OqwBi" id="7HUwyZbi4Af" role="37wK5m">
+                        <node concept="1eOMI4" id="7HUwyZbi4o9" role="2Oq$k0">
+                          <node concept="10QFUN" id="7HUwyZbi4o6" role="1eOMHV">
+                            <node concept="37vLTw" id="7HUwyZbi4yM" role="10QFUP">
+                              <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
+                            </node>
+                            <node concept="3uibUv" id="7HUwyZbi4uN" role="10QFUM">
+                              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="7HUwyZbi4HE" role="2OqNvi">
+                          <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="4TCblo5YN91" role="3cqZAp" />
+              </node>
+              <node concept="2ZW3vV" id="7HUwyZbi3ty" role="3clFbw">
+                <node concept="3uibUv" id="7HUwyZbi3vq" role="2ZW6by">
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                </node>
+                <node concept="37vLTw" id="7HUwyZbi3rn" role="2ZW6bz">
+                  <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
+                </node>
+              </node>
+              <node concept="3eNFk2" id="4sSe4$prurd" role="3eNLev">
+                <node concept="2ZW3vV" id="4sSe4$prvtz" role="3eO9$A">
+                  <node concept="3uibUv" id="4sSe4$ps1yr" role="2ZW6by">
+                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                  </node>
+                  <node concept="37vLTw" id="4sSe4$prv0k" role="2ZW6bz">
+                    <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="4sSe4$prurf" role="3eOfB_">
+                  <node concept="3SKdUt" id="4sSe4$prxfA" role="3cqZAp">
+                    <node concept="3SKdUq" id="4sSe4$prxfC" role="3SKWNk">
+                      <property role="3SKdUp" value="FIXME: need a way to find the interface class of the argument " />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="4sSe4$prGBU" role="3cqZAp">
+                    <node concept="2OqwBi" id="4sSe4$prHi8" role="3clFbG">
+                      <node concept="37vLTw" id="4sSe4$prGBS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
+                      </node>
+                      <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                        <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
+                          <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="4sSe4$prwMh" role="3cqZAp" />
+                </node>
+              </node>
+              <node concept="9aQIb" id="7HUwyZbi4Sk" role="9aQIa">
+                <node concept="3clFbS" id="7HUwyZbi4Sl" role="9aQI4">
+                  <node concept="3clFbF" id="78CwJJcO_ku" role="3cqZAp">
+                    <node concept="2OqwBi" id="78CwJJcO_ok" role="3clFbG">
+                      <node concept="37vLTw" id="78CwJJcO_ks" role="2Oq$k0">
+                        <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
+                      </node>
+                      <node concept="liA8E" id="78CwJJcO_AW" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                        <node concept="2OqwBi" id="78CwJJcO_HO" role="37wK5m">
+                          <node concept="37vLTw" id="78CwJJcO_G3" role="2Oq$k0">
+                            <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
+                          </node>
+                          <node concept="liA8E" id="78CwJJcO_ND" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="78CwJJcO_55" role="1Duv9x">
+            <property role="TrG5h" value="arg" />
+            <node concept="3uibUv" id="78CwJJcO_9N" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="78CwJJcO_hl" role="1DdaDG">
+            <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="78CwJJcOAQH" role="3cqZAp">
+          <node concept="37vLTw" id="78CwJJcOAQF" role="3clFbG">
+            <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4TCblo5M5Qi" role="jymVt" />
+    <node concept="3clFb_" id="4sSe4$oZGZ9" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="patternPredicates" />
+      <node concept="37vLTG" id="6v0X_XJLN7q" role="3clF46">
+        <property role="TrG5h" value="occurrenceArgs" />
+        <node concept="3uibUv" id="6v0X_XJLNp1" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+          <node concept="3qTvmN" id="6v0X_XJLNPD" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="4sSe4$oZGZa" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+        <node concept="3qUE_q" id="4sSe4$oZGZb" role="11_B2D">
+          <node concept="3uibUv" id="4sSe4$oZGZc" role="3qUE_r">
+            <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4sSe4$oZGZd" role="1B3o_S" />
+      <node concept="3clFbS" id="4sSe4$oZGZo" role="3clF47">
+        <node concept="3cpWs8" id="4sSe4$p01mP" role="3cqZAp">
+          <node concept="3cpWsn" id="4sSe4$p01mQ" role="3cpWs9">
+            <property role="TrG5h" value="res" />
+            <node concept="3uibUv" id="4sSe4$p01mH" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
+              <node concept="3uibUv" id="4sSe4$p01mK" role="11_B2D">
+                <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="4sSe4$p01mR" role="33vP2m">
+              <node concept="1pGfFk" id="4sSe4$p01mS" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+                <node concept="3uibUv" id="4sSe4$p01mT" role="1pMfVU">
+                  <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
+                </node>
+                <node concept="3cmrfG" id="6v0X_XJM1xt" role="37wK5m">
+                  <property role="3cmrfH" value="4" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4sSe4$oZLsl" role="3cqZAp">
+          <node concept="3cpWsn" id="4sSe4$oZLsm" role="3cpWs9">
+            <property role="TrG5h" value="idx" />
+            <node concept="10Oyi0" id="4sSe4$oZLsn" role="1tU5fm" />
+            <node concept="3cmrfG" id="4sSe4$oZLso" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="4sSe4$oZLsp" role="3cqZAp">
+          <node concept="3clFbS" id="4sSe4$oZLsq" role="2LFqv$">
+            <node concept="3cpWs8" id="4sSe4$oZLsu" role="3cqZAp">
+              <node concept="3cpWsn" id="4sSe4$oZLsv" role="3cpWs9">
+                <property role="TrG5h" value="logicalToBind" />
+                <node concept="3uibUv" id="4sSe4$oZLsw" role="1tU5fm">
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                  <node concept="3qTvmN" id="4sSe4$oZLsx" role="11_B2D" />
+                </node>
+                <node concept="1rXfSq" id="6v0X_XJLW3d" role="33vP2m">
+                  <ref role="37wK5l" node="4sSe4$oTo$P" resolve="logicalToBind" />
+                  <node concept="37vLTw" id="6v0X_XJLWFm" role="37wK5m">
+                    <ref role="3cqZAo" node="4sSe4$oZLsm" resolve="idx" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4sSe4$oZLs$" role="3cqZAp">
+              <node concept="3clFbS" id="4sSe4$oZLs_" role="3clFbx">
+                <node concept="3clFbF" id="4sSe4$p0gUm" role="3cqZAp">
+                  <node concept="2OqwBi" id="4sSe4$p0h_D" role="3clFbG">
+                    <node concept="37vLTw" id="4sSe4$p0gUk" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
+                    </node>
+                    <node concept="liA8E" id="4sSe4$p0iRE" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                      <node concept="2ShNRf" id="4sSe4$p0jEu" role="37wK5m">
+                        <node concept="1pGfFk" id="4sSe4$p0lnr" role="2ShVmc">
+                          <ref role="37wK5l" to="cxk7:4xBopTzmopz" resolve="UnificationPredicate" />
+                          <node concept="37vLTw" id="4sSe4$p0p1w" role="37wK5m">
+                            <ref role="3cqZAo" node="4sSe4$oZLtc" resolve="occArg" />
+                          </node>
+                          <node concept="37vLTw" id="4sSe4$p0x2p" role="37wK5m">
+                            <ref role="3cqZAo" node="4sSe4$oZLsv" resolve="logicalToBind" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="4sSe4$oZLsJ" role="3clFbw">
+                <node concept="10Nm6u" id="4sSe4$oZLsK" role="3uHU7w" />
+                <node concept="37vLTw" id="4sSe4$oZLsL" role="3uHU7B">
+                  <ref role="3cqZAo" node="4sSe4$oZLsv" resolve="logicalToBind" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4sSe4$oZLt9" role="3cqZAp">
+              <node concept="3uNrnE" id="4sSe4$oZLta" role="3clFbG">
+                <node concept="37vLTw" id="4sSe4$oZLtb" role="2$L3a6">
+                  <ref role="3cqZAo" node="4sSe4$oZLsm" resolve="idx" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="4sSe4$oZLtc" role="1Duv9x">
+            <property role="TrG5h" value="occArg" />
+            <node concept="3uibUv" id="4sSe4$oZLtd" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="6v0X_XJLSmc" role="1DdaDG">
+            <ref role="3cqZAo" node="6v0X_XJLN7q" resolve="occurrenceArgs" />
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4sSe4$p0aeq" role="3cqZAp">
+          <node concept="37vLTw" id="4sSe4$p042u" role="3cqZAk">
+            <ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sSe4$oZHFX" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sSe4$oZJf2" role="jymVt" />
+    <node concept="3clFb_" id="4sSe4$oTo$P" role="jymVt">
+      <property role="TrG5h" value="logicalToBind" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="4sSe4$oTo$Q" role="3clF46">
+        <property role="TrG5h" value="argIdx" />
+        <node concept="10Oyi0" id="4sSe4$oTo$R" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4sSe4$oTo$S" role="3clF45">
+        <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+        <node concept="3qTvmN" id="4sSe4$oTo$T" role="11_B2D" />
+      </node>
+      <node concept="3Tmbuc" id="4sSe4$oTo$U" role="1B3o_S" />
+      <node concept="3clFbS" id="4sSe4$oTo_3" role="3clF47">
+        <node concept="3clFbJ" id="4sSe4$oTr8F" role="3cqZAp">
+          <node concept="3eOSWO" id="4sSe4$oTsE_" role="3clFbw">
+            <node concept="3cmrfG" id="4sSe4$oTsFp" role="3uHU7w">
+              <property role="3cmrfH" value="0" />
+            </node>
+            <node concept="2OqwBi" id="4sSe4$oTrOW" role="3uHU7B">
+              <node concept="37vLTw" id="4sSe4$oTruO" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sSe4$oSRPL" resolve="logicals" />
+              </node>
+              <node concept="1Rwk04" id="4sSe4$oTsdD" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="4sSe4$oTr8H" role="3clFbx">
+            <node concept="3cpWs6" id="4sSe4$oTve6" role="3cqZAp">
+              <node concept="AH0OO" id="4sSe4$oTv_t" role="3cqZAk">
+                <node concept="37vLTw" id="4sSe4$oTv_u" role="AHEQo">
+                  <ref role="3cqZAo" node="4sSe4$oTo$Q" resolve="argIdx" />
+                </node>
+                <node concept="37vLTw" id="4sSe4$oTv_v" role="AHHXb">
+                  <ref role="3cqZAo" node="4sSe4$oSRPL" resolve="logicals" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="4sSe4$oTwjh" role="3cqZAp" />
+          </node>
+          <node concept="9aQIb" id="4sSe4$oTu85" role="9aQIa">
+            <node concept="3clFbS" id="4sSe4$oTu86" role="9aQI4">
+              <node concept="3cpWs6" id="4sSe4$oTx1H" role="3cqZAp">
+                <node concept="10Nm6u" id="4sSe4$oTxvr" role="3cqZAk" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sSe4$oToXD" role="jymVt" />
+    <node concept="3Tm1VV" id="5uFPQ7BZsAY" role="1B3o_S" />
+    <node concept="3uibUv" id="5uFPQ7BZsBQ" role="EKbjA">
+      <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
+    </node>
+    <node concept="312cEg" id="5uFPQ7BZu60" role="jymVt">
+      <property role="TrG5h" value="symbol" />
+      <node concept="3Tm6S6" id="5uFPQ7BZu61" role="1B3o_S" />
+      <node concept="3uibUv" id="5uFPQ7BZu63" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sSe4$oTpGf" role="jymVt" />
+    <node concept="312cEg" id="5uFPQ7BZuef" role="jymVt">
+      <property role="TrG5h" value="arguments" />
+      <node concept="3Tm6S6" id="5uFPQ7BZueg" role="1B3o_S" />
+      <node concept="10Q1$e" id="5uFPQ7BZzdN" role="1tU5fm">
+        <node concept="3uibUv" id="5uFPQ7BZzdK" role="10Q1$1">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sSe4$oTq3z" role="jymVt" />
+    <node concept="312cEg" id="4sSe4$oSRPL" role="jymVt">
+      <property role="TrG5h" value="logicals" />
+      <node concept="3Tm6S6" id="4sSe4$oSRPM" role="1B3o_S" />
+      <node concept="10Q1$e" id="4sSe4$oSRPO" role="1tU5fm">
+        <node concept="3uibUv" id="4sSe4$oSRPP" role="10Q1$1">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sSe4$oTqqS" role="jymVt" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 21240b59..8471ca13 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -161,13 +161,13 @@
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
       </concept>
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
       <concept id="6694277639409954681" name="jetbrains.mps.logic.structure.ListRole" flags="ng" index="38e3lM">
         <child id="6694277639409954746" name="list" index="38e3mL" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137263" name="jetbrains.mps.logic.structure.ChildRole" flags="ng" index="1oi5ST">
@@ -275,14 +275,14 @@
     <node concept="3clFb_" id="2ev$9JFEEfC" role="jymVt">
       <property role="TrG5h" value="anyTerms" />
       <node concept="3uibUv" id="2ev$9JFEFFy" role="3clF45">
-        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="2ev$9JFEEfF" role="1B3o_S" />
       <node concept="3clFbS" id="2ev$9JFEEfG" role="3clF47">
         <node concept="3clFbF" id="2ev$9JFEGHn" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEGHp" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEGHq" role="10QFUM">
-              <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+              <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
@@ -634,7 +634,7 @@
                 <ref role="37wK5l" to="6exd:104EUzFOARE" resolve="visitTermNode" />
                 <node concept="10QFUN" id="2ev$9JFDJDT" role="37wK5m">
                   <node concept="3uibUv" id="5cGCTtqzhLw" role="10QFUM">
-                    <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                    <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                   </node>
                   <node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
                     <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
@@ -698,11 +698,11 @@
             <node concept="3cpWsn" id="2ev$9JFDTTZ" role="3cpWs9">
               <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshWa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshYq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshYj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshYk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshYl" role="1oi0x0">
@@ -917,11 +917,11 @@
             <node concept="3cpWsn" id="2ev$9JFFqmp" role="3cpWs9">
               <property role="TrG5h" value="child" />
               <node concept="3uibUv" id="6MYr6JxshSY" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshUH" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshUA" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshUB" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshUC" role="1oi0x0">
@@ -970,11 +970,11 @@
             <node concept="3cpWsn" id="2ev$9JFFqmv" role="3cpWs9">
               <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshwM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshIN" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshIG" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshIH" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshII" role="1oi0x0">
@@ -1428,11 +1428,11 @@
             <node concept="3cpWsn" id="5YVX0wIjZEX" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6Jxsln8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsloV" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsloO" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsloP" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsloQ" role="1oi0x0">
@@ -1457,11 +1457,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0aR" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6Jxslqr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsluC" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxslux" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsluy" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsluz" role="1oi0x0">
@@ -1486,11 +1486,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0rD" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6Jxslwq" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jxslyd" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxsly6" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsly7" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsly8" role="1oi0x0">
@@ -1907,11 +1907,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sP" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6JxsnM$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnOq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnOj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnOk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnOl" role="1oi0x0">
@@ -1936,11 +1936,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sY" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6JxsnQ0" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnRQ" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnRJ" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnRK" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnRL" role="1oi0x0">
@@ -1965,11 +1965,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0t7" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6JxsnTt" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnVj" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnVc" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnVd" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnVe" role="1oi0x0">
@@ -4541,11 +4541,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qgq" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="6MYr6Jy86h5" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86gm" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86hI" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86gg" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86gh" role="1oi0x0">
@@ -4571,11 +4571,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qg$" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="6MYr6Jy86in" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86js" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86jj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86jk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86jl" role="1oi0x0">
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 56485cff..0bc27c40 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -13,8 +13,8 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 2565dad7..4e9c36de 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -11,15 +11,15 @@
   <imports>
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -202,13 +202,13 @@
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
       </concept>
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
       <concept id="6694277639409954681" name="jetbrains.mps.logic.structure.ListRole" flags="ng" index="38e3lM">
         <child id="6694277639409954746" name="list" index="38e3mL" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137263" name="jetbrains.mps.logic.structure.ChildRole" flags="ng" index="1oi5ST">
@@ -261,9 +261,9 @@
       <node concept="3clFbS" id="21Zu7ABuubZ" role="3clF47">
         <node concept="3clFbF" id="21Zu7ABuuuo" role="3cqZAp">
           <node concept="10QFUN" id="1OShD0I14HQ" role="3clFbG">
-            <node concept="2YIFZM" id="3mz2_dYuDAz" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bj" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm5rGN" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5sqz" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -274,7 +274,7 @@
                         <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm5tU_" role="37wK5m">
-                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                       </node>
                     </node>
                   </node>
@@ -302,9 +302,9 @@
       <node concept="3clFbS" id="3mz2_dYxTYI" role="3clF47">
         <node concept="3clFbF" id="3mz2_dYxTYJ" role="3cqZAp">
           <node concept="10QFUN" id="3mz2_dYxTYK" role="3clFbG">
-            <node concept="2YIFZM" id="3mz2_dYxTYL" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bk" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm5vBK" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5vBL" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -342,9 +342,9 @@
             <node concept="3uibUv" id="5cGCTtqzoJY" role="10QFUM">
               <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
-            <node concept="2YIFZM" id="3mz2_dYuDM0" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2br" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="5cGCTtqzoJT" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5xLL" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -1756,9 +1756,9 @@
       <node concept="3clFbS" id="6yEjedm71gV" role="3clF47">
         <node concept="3clFbF" id="6yEjedm71gW" role="3cqZAp">
           <node concept="10QFUN" id="6yEjedm71gX" role="3clFbG">
-            <node concept="2YIFZM" id="6yEjedm71gY" role="10QFUP">
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
+            <node concept="2YIFZM" id="74q$MmRB2bn" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm71gZ" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71h0" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -1769,7 +1769,7 @@
                         <ref role="3cqZAo" node="6yEjedm71gR" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm71h4" role="37wK5m">
-                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                       </node>
                     </node>
                   </node>
@@ -1797,9 +1797,9 @@
       <node concept="3clFbS" id="6yEjedm71hc" role="3clF47">
         <node concept="3clFbF" id="6yEjedm71hd" role="3cqZAp">
           <node concept="10QFUN" id="6yEjedm71he" role="3clFbG">
-            <node concept="2YIFZM" id="6yEjedm71hf" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bp" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm71hg" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71hh" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -1837,9 +1837,9 @@
             <node concept="3uibUv" id="6yEjedm71hu" role="10QFUM">
               <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
-            <node concept="2YIFZM" id="6yEjedm71hv" role="10QFUP">
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
+            <node concept="2YIFZM" id="74q$MmRB2bo" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm71hw" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71hx" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -1874,9 +1874,9 @@
             <node concept="3uibUv" id="7nuzzkr25aB" role="10QFUM">
               <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
-            <node concept="2YIFZM" id="3mz2_dYuEZO" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bq" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nuzzkr25az" role="37wK5m">
                 <node concept="1pGfFk" id="7nuzzkr25a$" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="LogicalImpl" />
@@ -5162,9 +5162,9 @@
             <node concept="3uibUv" id="3K_0akS$LQx" role="10QFUM">
               <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
-            <node concept="2YIFZM" id="3mz2_dYuFY1" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asVariable" />
-              <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
+            <node concept="2YIFZM" id="74q$MmRB2bl" role="10QFUP">
+              <ref role="37wK5l" to="7n8k:4TCblo5YI1H" resolve="asVariable" />
+              <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="3K_0akS$LQt" role="37wK5m">
                 <node concept="1pGfFk" id="3K_0akS$LQu" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
@@ -5361,7 +5361,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8P1G" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
@@ -5693,7 +5693,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8Oi0" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="BranchNode" />
+                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 5fe52f22..347de08d 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -97,6 +97,9 @@
       </concept>
     </language>
     <language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
+      <concept id="6503355885715333289" name="jetbrains.mps.build.mps.structure.BuildMpsAspect" flags="ng" index="2igEWh">
+        <property id="6503355885715353788" name="bootstrap" index="2igJW4" />
+      </concept>
       <concept id="7832771629084799699" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPluginVendor" flags="ng" index="2iUeEo">
         <property id="7832771629084799702" name="name" index="2iUeEt" />
         <property id="7832771629084799701" name="url" index="2iUeEu" />
@@ -168,6 +171,9 @@
   <node concept="1l3spW" id="1BDNG5xBZgg">
     <property role="2DA0ip" value="../../../" />
     <property role="TrG5h" value="coderules" />
+    <node concept="2igEWh" id="4PFyrnOi2Za" role="1hWBAP">
+      <property role="2igJW4" value="true" />
+    </node>
     <node concept="22LTRH" id="7Ant4WkHLti" role="1hWBAP">
       <property role="TrG5h" value="testconfig" />
       <node concept="22LTRF" id="46o4wsHrLsQ" role="22LTRK">
@@ -434,77 +440,6 @@
           </node>
         </node>
       </node>
-      <node concept="1E1JtD" id="JOGAOsFCCM" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.dataform" />
-        <property role="3LESm3" value="942985d5-7bcf-46ee-8b79-7b662eaebb4e" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="JOGAOsFCCP" role="3LF7KH">
-          <node concept="2Ry0Ak" id="JOGAOsFCUu" role="iGT6I">
-            <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="JOGAOsFDa7" role="2Ry0An">
-              <property role="2Ry0Am" value="languages" />
-              <node concept="2Ry0Ak" id="JOGAOsFDk$" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.dataform" />
-                <node concept="2Ry0Ak" id="JOGAOsFDv1" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.dataform.mpl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="JOGAOsFD$_" role="3bR37C">
-          <node concept="3bR9La" id="JOGAOsFD$A" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="JOGAOsFD$B" role="3bR37C">
-          <node concept="3bR9La" id="JOGAOsFD$C" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="JOGAOsFD$F" role="3bR37C">
-          <node concept="1Busua" id="JOGAOsFD$G" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="JOGAOsFD$H" role="3bR37C">
-          <node concept="1Busua" id="JOGAOsFD$I" role="1SiIV1">
-            <ref role="1Busuk" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
-          </node>
-        </node>
-        <node concept="1yeLz9" id="JOGAOsFD$J" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.dataform#01" />
-          <property role="3LESm3" value="f4b71823-159e-4008-bbeb-35dd1c907ab2" />
-          <property role="2GAjPV" value="false" />
-          <node concept="1SiIV0" id="JOGAOsNEdZ" role="3bR37C">
-            <node concept="3bR9La" id="JOGAOsNEe0" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="JOGAOsNEe1" role="3bR37C">
-            <node concept="3bR9La" id="JOGAOsNEe2" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="JOGAOsNEe3" role="3bR37C">
-            <node concept="3bR9La" id="JOGAOsNEe4" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="JOGAOsNEe5" role="3bR37C">
-            <node concept="3bR9La" id="JOGAOsNEe6" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="1E1JtA" id="7BVjoXzUx$V" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="3LESm3" value="a5478664-6b44-4c62-a9f7-434f8aa57eee" />
@@ -658,6 +593,12 @@
               <ref role="3bR37D" to="ffeo:7YI57w6K09t" resolve="jetbrains.mps.baseLanguage.collections#1151699677197" />
             </node>
           </node>
+          <node concept="1SiIV0" id="5yqFHXoyP4J" role="3bR37C">
+            <node concept="3bR9La" id="5yqFHXoyP4K" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
+            </node>
+          </node>
         </node>
         <node concept="3rtmxn" id="3Z6zOnxMpzt" role="3bR31x">
           <node concept="3LXTmp" id="3Z6zOnxMpzu" role="3rtmxm">
@@ -1803,12 +1744,6 @@
         <node concept="1E0d5M" id="oI9YrNsk8" role="1E1XAP">
           <ref role="1E0d5P" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
         </node>
-        <node concept="1SiIV0" id="JOGAOsNEgj" role="3bR37C">
-          <node concept="3bR9La" id="JOGAOsNEgk" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="JOGAOsFCCM" resolve="jetbrains.mps.dataform" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4uSBgQVvlaV" role="3bR37C">
           <node concept="3bR9La" id="4uSBgQVvlaW" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -2209,9 +2144,6 @@
         <node concept="L2wRC" id="3PhVAH_Wg7Z" role="39821P">
           <ref role="L2wRA" node="3PhVAH_WgTu" resolve="jetbrains.mps.typechecking.build" />
         </node>
-        <node concept="L2wRC" id="JOGAOsFE1x" role="39821P">
-          <ref role="L2wRA" node="JOGAOsFCCM" resolve="jetbrains.mps.dataform" />
-        </node>
         <node concept="L2wRC" id="7Ant4WkHLmo" role="39821P">
           <ref role="L2wRA" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
         </node>
@@ -2362,9 +2294,6 @@
             <node concept="L2wRC" id="3PhVAH_Wi_w" role="39821P">
               <ref role="L2wRA" node="3PhVAH_WgTu" resolve="jetbrains.mps.typechecking.build" />
             </node>
-            <node concept="L2wRC" id="JOGAOsFEjP" role="39821P">
-              <ref role="L2wRA" node="JOGAOsFCCM" resolve="jetbrains.mps.dataform" />
-            </node>
             <node concept="L2wRC" id="65DJywFk8Gh" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
             </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 55b174b1..6ea972a3 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -26,8 +26,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="pa15" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.persistence(MPS.Core/)" />
@@ -50,6 +49,7 @@
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.typechecking.testlang.sandbox.test)" />
     <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -1112,9 +1112,9 @@
                               <node concept="37vLTw" id="6tPOoeTc7DG" role="37wK5m">
                                 <ref role="3cqZAo" node="6tPOoeTbYYA" resolve="program" />
                               </node>
-                              <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
-                                <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                                <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
+                              <node concept="10M0yZ" id="74q$MmRB2bb" role="37wK5m">
+                                <ref role="3cqZAo" to="7n8k:24Vro6cS5rK" resolve="NULL" />
+                                <ref role="1PxDUh" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                               </node>
                             </node>
                           </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 4bd52448..0e82ec20 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -16,10 +16,9 @@
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
   </languages>
   <imports>
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
@@ -106,6 +105,7 @@
     <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="o35r" ref="r:76281d8a-46ce-405f-8cfc-287ee8597b54(jetbrains.mps.coderules.ui.plugin)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -1693,7 +1693,7 @@
                   <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                 </node>
                 <node concept="3uibUv" id="6tPOoeTcJfS" role="1Lm7xW">
-                  <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                  <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                 </node>
               </node>
             </node>
@@ -1853,7 +1853,7 @@
                         <node concept="1eOMI4" id="6tPOoeTcTIQ" role="1Lso8e">
                           <node concept="10QFUN" id="6tPOoeTcTIN" role="1eOMHV">
                             <node concept="3uibUv" id="6tPOoeTcV1_" role="10QFUM">
-                              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                              <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
                             </node>
                             <node concept="2ShNRf" id="6tPOoeTcTIS" role="10QFUP">
                               <node concept="1pGfFk" id="6tPOoeTcTIT" role="2ShVmc">
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
index 7691a4f3..b1f28f07 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -17,7 +17,7 @@
     <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
index 2cd4aee1..4449d3e8 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -17,16 +17,15 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
-    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
@@ -1496,7 +1495,7 @@
               <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="3uibUv" id="78H58of4zU5" role="1Lm7xW">
-              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+              <ref role="3uigEE" to="7n8k:qubcdtxBiR" resolve="EvaluationTraceExt" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index f3282882..00244eb1 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -47,7 +47,6 @@
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl b/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl
index 1bb93610..6202df7d 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl
+++ b/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl
@@ -47,6 +47,9 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
+    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -59,7 +62,6 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
@@ -100,6 +102,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps b/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps
index a19eed9d..44abe635 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps
+++ b/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps
@@ -8,9 +8,9 @@
   </languages>
   <imports>
     <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -380,61 +380,67 @@
       <ref role="1N5Vy1" to="jfgh:3JXBM6C3FuH" resolve="reasoning" />
       <node concept="3dgokm" id="5jVx7S230S6" role="1N6uqs">
         <node concept="3clFbS" id="5jVx7S230S7" role="2VODD2">
-          <node concept="3clFbF" id="5jVx7S230V1" role="3cqZAp">
-            <node concept="2ShNRf" id="5jVx7S23dbo" role="3clFbG">
-              <node concept="YeOm9" id="5jVx7S23dbp" role="2ShVmc">
-                <node concept="1Y3b0j" id="5jVx7S23dbq" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="35tq:~ListScope" resolve="ListScope" />
-                  <ref role="37wK5l" to="35tq:~ListScope.&lt;init&gt;(java.lang.Iterable)" resolve="ListScope" />
-                  <node concept="2OqwBi" id="5jVx7S23dbr" role="37wK5m">
-                    <node concept="2OqwBi" id="5jVx7S23dbs" role="2Oq$k0">
-                      <node concept="2rP1CM" id="5jVx7S23dbt" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="5jVx7S23dbu" role="2OqNvi">
-                        <node concept="1xMEDy" id="5jVx7S23dbv" role="1xVPHs">
-                          <node concept="chp4Y" id="5jVx7S23dbw" role="ri$Ld">
-                            <ref role="cht4Q" to="jfgh:3JXBM6C3UQB" resolve="Node" />
+          <node concept="3cpWs8" id="5p9vXslDHus" role="3cqZAp">
+            <node concept="3cpWsn" id="5p9vXslDHut" role="3cpWs9">
+              <property role="TrG5h" value="scope" />
+              <node concept="3uibUv" id="5p9vXslDLpO" role="1tU5fm">
+                <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+              </node>
+              <node concept="2ShNRf" id="5p9vXslDHuu" role="33vP2m">
+                <node concept="YeOm9" id="5p9vXslDHuv" role="2ShVmc">
+                  <node concept="1Y3b0j" id="5p9vXslDHuw" 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="5p9vXslDHux" role="37wK5m">
+                      <node concept="2OqwBi" id="5p9vXslDHuy" role="2Oq$k0">
+                        <node concept="2rP1CM" id="5p9vXslDHuz" role="2Oq$k0" />
+                        <node concept="2Xjw5R" id="5p9vXslDHu$" role="2OqNvi">
+                          <node concept="1xMEDy" id="5p9vXslDHu_" role="1xVPHs">
+                            <node concept="chp4Y" id="5p9vXslDHuA" role="ri$Ld">
+                              <ref role="cht4Q" to="jfgh:3JXBM6C3UQB" resolve="Node" />
+                            </node>
                           </node>
+                          <node concept="1xIGOp" id="5p9vXslDHuB" role="1xVPHs" />
                         </node>
-                        <node concept="1xIGOp" id="5jVx7S23dbx" role="1xVPHs" />
+                      </node>
+                      <node concept="2qgKlT" id="5p9vXslDHuC" role="2OqNvi">
+                        <ref role="37wK5l" to="qd7f:5jVx7S20nJ_" resolve="allInScope" />
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="5jVx7S23dby" role="2OqNvi">
-                      <ref role="37wK5l" to="qd7f:5jVx7S20nJ_" resolve="allInScope" />
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="5jVx7S23dbz" role="1B3o_S" />
-                  <node concept="3clFb_" id="5jVx7S23db$" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <property role="DiZV1" value="false" />
-                    <property role="od$2w" value="false" />
-                    <node concept="3Tm1VV" id="5jVx7S23db_" role="1B3o_S" />
-                    <node concept="3uibUv" id="5jVx7S23dbA" role="3clF45">
-                      <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                    </node>
-                    <node concept="37vLTG" id="5jVx7S23dbB" role="3clF46">
-                      <property role="TrG5h" value="n" />
-                      <node concept="3Tqbb2" id="5jVx7S23dbC" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="5jVx7S23dbD" role="3clF47">
-                      <node concept="3clFbF" id="5jVx7S23dbE" role="3cqZAp">
-                        <node concept="2YIFZM" id="5jVx7S23dbF" role="3clFbG">
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
-                          <node concept="2OqwBi" id="5jVx7S23dbG" role="37wK5m">
-                            <node concept="1PxgMI" id="5jVx7S23dbH" role="2Oq$k0">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="chp4Y" id="5jVx7S23dbI" role="3oSUPX">
-                                <ref role="cht4Q" to="jfgh:3JXBM6C3UQB" resolve="Node" />
+                    <node concept="3Tm1VV" id="5p9vXslDHuD" role="1B3o_S" />
+                    <node concept="3clFb_" id="5p9vXslDHuE" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="getName" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="3Tm1VV" id="5p9vXslDHuF" role="1B3o_S" />
+                      <node concept="3uibUv" id="5p9vXslDHuG" role="3clF45">
+                        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                      </node>
+                      <node concept="37vLTG" id="5p9vXslDHuH" role="3clF46">
+                        <property role="TrG5h" value="n" />
+                        <node concept="3Tqbb2" id="5p9vXslDHuI" role="1tU5fm" />
+                      </node>
+                      <node concept="3clFbS" id="5p9vXslDHuJ" role="3clF47">
+                        <node concept="3clFbF" id="5p9vXslDHuK" role="3cqZAp">
+                          <node concept="2YIFZM" id="5p9vXslDHuL" role="3clFbG">
+                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                            <node concept="2OqwBi" id="5p9vXslDHuM" role="37wK5m">
+                              <node concept="1PxgMI" id="5p9vXslDHuN" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="5p9vXslDHuO" role="3oSUPX">
+                                  <ref role="cht4Q" to="jfgh:3JXBM6C3UQB" resolve="Node" />
+                                </node>
+                                <node concept="37vLTw" id="5p9vXslDHuP" role="1m5AlR">
+                                  <ref role="3cqZAo" node="5p9vXslDHuH" resolve="n" />
+                                </node>
                               </node>
-                              <node concept="37vLTw" id="5jVx7S23dbJ" role="1m5AlR">
-                                <ref role="3cqZAo" node="5jVx7S23dbB" resolve="n" />
+                              <node concept="3TrcHB" id="5p9vXslDHuQ" role="2OqNvi">
+                                <ref role="3TsBF5" to="jfgh:3JXBM6C54BE" resolve="sequenceNum" />
                               </node>
                             </node>
-                            <node concept="3TrcHB" id="5jVx7S23dbK" role="2OqNvi">
-                              <ref role="3TsBF5" to="jfgh:3JXBM6C54BE" resolve="sequenceNum" />
-                            </node>
                           </node>
                         </node>
                       </node>
@@ -444,6 +450,11 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="5jVx7S230V1" role="3cqZAp">
+            <node concept="37vLTw" id="5p9vXslDHuR" role="3clFbG">
+              <ref role="3cqZAo" node="5p9vXslDHut" resolve="scope" />
+            </node>
+          </node>
         </node>
       </node>
     </node>
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps b/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
index b0a9a17f..df569ac6 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -42,21 +42,19 @@
         <reference id="5455284157993910961" name="concept" index="2pJxaS" />
       </concept>
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf" />
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="6399471711045617306" name="dataType" index="3vLBG7" />
         <child id="3063948360254832884" name="declaration" index="3XD1gS" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
@@ -466,13 +464,6 @@
       </node>
     </node>
   </node>
-  <node concept="ns1xd" id="7VBaGntKJ6x">
-    <property role="TrG5h" value="Types" />
-    <node concept="ns1x$" id="7VBaGntKJ6y" role="ns1xc">
-      <property role="TrG5h" value="Ok" />
-      <node concept="nspSf" id="7VBaGntKJ6z" role="ns1xx" />
-    </node>
-  </node>
   <node concept="92CTh" id="2rdxkKxrUlk">
     <property role="TrG5h" value="Typecheck" />
     <node concept="2bWyPT" id="2rdxkKxrXzd" role="92CTm">
@@ -498,5 +489,12 @@
       <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
     </node>
   </node>
+  <node concept="ns1xd" id="7VBaGntKJ6x">
+    <property role="TrG5h" value="Types" />
+    <node concept="ns1x$" id="7VBaGntKJ6y" role="ns1xc">
+      <property role="TrG5h" value="Ok" />
+      <node concept="nspSf" id="7VBaGntKJ6z" role="ns1xx" />
+    </node>
+  </node>
 </model>
 
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl b/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl
index 01ff2ba0..d52c3d78 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl
+++ b/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl
@@ -62,7 +62,6 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps b/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps
index 2cc31c10..07405f8c 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -101,29 +101,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434289827" name="jetbrains.mps.dataform.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="3063948360254832884" name="declaration" index="3XD1gS" />
@@ -135,7 +112,28 @@
         <child id="8829335963591530990" name="expression" index="aZ4eD" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
     </language>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps b/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps
index c64a37f8..6ad2c474 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps
@@ -5,6 +5,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -151,31 +152,6 @@
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434305888" name="jetbrains.mps.dataform.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434294982" name="jetbrains.mps.dataform.structure.ValueFeature" flags="ng" index="nssqF" />
-      <concept id="861509610434289827" name="jetbrains.mps.dataform.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9" />
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
@@ -192,7 +168,30 @@
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
+      <concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
     </language>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl b/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl
index d816f99b..34eb1ab5 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl
+++ b/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl
@@ -60,7 +60,6 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
index 778f0d31..371ebc50 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
@@ -7,7 +7,6 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -71,31 +70,6 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434305888" name="jetbrains.mps.dataform.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434294982" name="jetbrains.mps.dataform.structure.ValueFeature" flags="ng" index="nssqF" />
-      <concept id="861509610434289827" name="jetbrains.mps.dataform.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
@@ -113,14 +87,37 @@
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
+      <concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
       <concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN" />
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps b/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
index c4bd776e..07a333b1 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
+++ b/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
@@ -114,6 +114,24 @@
           <property role="3LESm3" value="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec" />
           <property role="2GAjPV" value="false" />
         </node>
+        <node concept="1SiIV0" id="5p9vXslHrSF" role="3bR37C">
+          <node concept="3bR9La" id="5p9vXslHrSG" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5p9vXslHrSH" role="3bR37C">
+          <node concept="3bR9La" id="5p9vXslHrSI" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5p9vXslHrSJ" role="3bR37C">
+          <node concept="3bR9La" id="5p9vXslHrSK" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="4$bYnYI$URy" resolve="jetbrains.mps.fitch" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$UVm" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index e8bb3aa0..683a3e7a 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -57,7 +57,6 @@
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index 389ec55c..56b4e1cd 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -9,7 +9,8 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
+    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -19,9 +20,9 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
@@ -180,29 +181,6 @@
       </concept>
       <concept id="1196866233735" name="jetbrains.mps.lang.quotation.structure.PropertyAntiquotation" flags="ng" index="2EMmih" />
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434289827" name="jetbrains.mps.dataform.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="6399471711045617306" name="dataType" index="3vLBG7" />
@@ -215,10 +193,31 @@
         <child id="8829335963591530990" name="expression" index="aZ4eD" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfLogicalExpression" flags="ng" index="1TmgYN">
+      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
         <child id="2455719244613924416" name="logical" index="1Tms7$" />
       </concept>
     </language>
@@ -322,7 +321,7 @@
         <reference id="6086839168131376658" name="declaration" index="17QRF" />
         <child id="5524459797186715209" name="logical" index="B_OMz" />
       </concept>
-      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.ExpressionItem" flags="ng" index="HKQnh">
+      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
       <concept id="7670825977262339471" name="jetbrains.mps.lang.coderules.structure.MacroInputDeclaration" flags="ng" index="3eYOCq">
@@ -2674,6 +2673,31 @@
       </node>
     </node>
   </node>
+  <node concept="92CTh" id="5Eb7bDWO4vA">
+    <property role="TrG5h" value="Typecheck" />
+    <node concept="2bWyPT" id="5Eb7bDWO9gE" role="92CTm">
+      <property role="TrG5h" value="recover" />
+      <node concept="3clFbS" id="5Eb7bDWO9gF" role="fHCRw">
+        <node concept="1nLNNL" id="5Eb7bDWO9jS" role="3cqZAp">
+          <node concept="1nLNMm" id="5Eb7bDWO9jT" role="1nLNNK">
+            <node concept="3Aq9E8" id="5Eb7bDWO9lC" role="1nLNMd">
+              <node concept="3I6sU6" id="5Eb7bDWO9lD" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5Eb7bDWO9lH" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5Eb7bDWO9lG" role="3I6s78">
+                    <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10M0yZ" id="5Eb7bDWO7EB" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
+  </node>
   <node concept="ns1xd" id="7VBaGntJSFZ">
     <property role="TrG5h" value="terms" />
     <node concept="ns1x$" id="7VBaGntJSG0" role="ns1xc">
@@ -2703,30 +2727,5 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="5Eb7bDWO4vA">
-    <property role="TrG5h" value="Typecheck" />
-    <node concept="2bWyPT" id="5Eb7bDWO9gE" role="92CTm">
-      <property role="TrG5h" value="recover" />
-      <node concept="3clFbS" id="5Eb7bDWO9gF" role="fHCRw">
-        <node concept="1nLNNL" id="5Eb7bDWO9jS" role="3cqZAp">
-          <node concept="1nLNMm" id="5Eb7bDWO9jT" role="1nLNNK">
-            <node concept="3Aq9E8" id="5Eb7bDWO9lC" role="1nLNMd">
-              <node concept="3I6sU6" id="5Eb7bDWO9lD" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5Eb7bDWO9lH" role="3I6sU7">
-                  <node concept="3Aqt3T" id="5Eb7bDWO9lG" role="3I6s78">
-                    <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="10M0yZ" id="5Eb7bDWO7EB" role="2_lZgo">
-      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
-      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-    </node>
-  </node>
 </model>
 
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index 43c06d4d..2cffc8ff 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -30,7 +30,6 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
@@ -52,6 +51,7 @@
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+    <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index ac9b87a3..0e999bb4 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -220,7 +220,6 @@
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
@@ -541,7 +540,6 @@
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
-      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 646fa3b9..adbd795b 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -26,7 +26,6 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="14" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 284eba70..def8dc3b 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -14,7 +14,7 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
   </imports>
@@ -131,10 +131,10 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfLogicalExpression" flags="ng" index="1TmgYN">
+      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
         <child id="2455719244613924416" name="logical" index="1Tms7$" />
       </concept>
     </language>
@@ -268,7 +268,7 @@
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
-      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.ExpressionItem" flags="ng" index="HKQnh">
+      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index e7d5d8f6..79d0a6b9 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -16,7 +16,6 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
   </languages>
@@ -30,8 +29,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
@@ -39,6 +37,7 @@
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
+    <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" implicit="true" />
   </imports>
   <registry>
@@ -360,37 +359,13 @@
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
     </language>
-    <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
-      <concept id="861509610434242029" name="jetbrains.mps.dataform.structure.DataForm" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="decl" index="ns1xF" />
-        <child id="861509610434243076" name="override" index="ns1xD" />
-      </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.dataform.structure.DataFormTable" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="contents" index="ns1xc" />
-      </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.dataform.structure.DataFormDeclaration" flags="ng" index="ns1x$">
-        <reference id="861509610434243089" name="prototype" index="ns1xW" />
-        <child id="861509610434243084" name="template" index="ns1xx" />
-      </concept>
-      <concept id="861509610434305888" name="jetbrains.mps.dataform.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.dataform.structure.DataFormFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-        <child id="861509610434291425" name="getter" index="nstic" />
-      </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.dataform.structure.DataFormTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434294982" name="jetbrains.mps.dataform.structure.ValueFeature" flags="ng" index="nssqF" />
-      <concept id="861509610434289827" name="jetbrains.mps.dataform.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.dataform.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="feature" index="nsMwP" />
-        <child id="861509610434435670" name="getter" index="nsMwV" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
       </concept>
+      <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
+        <child id="8456919074574710741" name="code" index="37jj2" />
+      </concept>
       <concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9" />
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="6399471711045617306" name="dataType" index="3vLBG7" />
@@ -406,20 +381,45 @@
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
-      <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.TreeFormLiteral" flags="ng" index="Hz6ka">
+      <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
+      </concept>
+      <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
+      </concept>
+      <concept id="861509610434243081" name="jetbrains.mps.logic.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+        <reference id="861509610434243089" name="prototype" index="ns1xW" />
+        <child id="861509610434243084" name="template" index="ns1xx" />
+      </concept>
+      <concept id="861509610434305888" name="jetbrains.mps.logic.structure.ListFeature" flags="ng" index="nsiOd" />
+      <concept id="861509610434276453" name="jetbrains.mps.logic.structure.DataFormFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
+        <child id="861509610434291425" name="getter" index="nstic" />
+      </concept>
+      <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
+      </concept>
+      <concept id="861509610434294982" name="jetbrains.mps.logic.structure.ValueFeature" flags="ng" index="nssqF" />
+      <concept id="861509610434289827" name="jetbrains.mps.logic.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.logic.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
+      </concept>
+      <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
         <child id="6856711987710888500" name="root" index="Hz6kd" />
       </concept>
       <concept id="6856711987711987746" name="jetbrains.mps.logic.structure.ListLiteral" flags="ng" index="HAVWr">
         <child id="6856711987711987774" name="contents" index="HAVW7" />
       </concept>
       <concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN">
@@ -431,7 +431,7 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfLogicalExpression" flags="ng" index="1TmgYN">
+      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
         <child id="2455719244613924416" name="logical" index="1Tms7$" />
       </concept>
       <concept id="4650129638230983415" name="jetbrains.mps.logic.structure.ListExpression" flags="ng" index="3YNDqN">
@@ -622,9 +622,6 @@
         <child id="8908809128802132746" name="parameter" index="3tC56T" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
-      <concept id="8456919074574710634" name="jetbrains.mps.lang.coderules.structure.ConstantExpressionItem" flags="ng" index="37jhX">
-        <child id="8456919074574710741" name="code" index="37jj2" />
-      </concept>
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000515988658" name="parameter" index="2_cLD1" />
@@ -662,7 +659,7 @@
         <child id="6086839168131714100" name="argument" index="150vd" />
         <child id="5524459797186715209" name="logical" index="B_OMz" />
       </concept>
-      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.ExpressionItem" flags="ng" index="HKQnh">
+      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
       <concept id="1204249894870288679" name="jetbrains.mps.lang.coderules.structure.RequireAllStatement" flags="ng" index="Oftf1">
@@ -17462,9 +17459,9 @@
         <node concept="3clFbJ" id="3KV3FXk1kIP" role="3cqZAp">
           <node concept="3clFbS" id="3KV3FXk1kIR" role="3clFbx">
             <node concept="3clFbF" id="5_6ImQZ8rNY" role="3cqZAp">
-              <node concept="2YIFZM" id="5_6ImQZ8rNZ" role="3clFbG">
-                <ref role="1Pybhc" to="yg8f:5_6ImQZ8j9D" resolve="SolverUtil" />
-                <ref role="37wK5l" to="yg8f:5_6ImQZ8ja0" resolve="fail" />
+              <node concept="2YIFZM" id="74q$MmRAZEV" role="3clFbG">
+                <ref role="37wK5l" node="5_6ImQZ8ja0" resolve="fail" />
+                <ref role="1Pybhc" node="5_6ImQZ8j9D" resolve="SolverUtil" />
                 <node concept="Xl_RD" id="5_6ImQZ8rO0" role="37wK5m">
                   <property role="Xl_RC" value="could not find subtyping path" />
                 </node>
@@ -18595,9 +18592,9 @@
           </node>
           <node concept="3clFbS" id="3KV3FXjZMUD" role="3clFbx">
             <node concept="3clFbF" id="5_6ImQZ8n1E" role="3cqZAp">
-              <node concept="2YIFZM" id="5_6ImQZ8n8A" role="3clFbG">
-                <ref role="37wK5l" to="yg8f:5_6ImQZ8ja0" resolve="fail" />
-                <ref role="1Pybhc" to="yg8f:5_6ImQZ8j9D" resolve="SolverUtil" />
+              <node concept="2YIFZM" id="74q$MmRAZEU" role="3clFbG">
+                <ref role="37wK5l" node="5_6ImQZ8ja0" resolve="fail" />
+                <ref role="1Pybhc" node="5_6ImQZ8j9D" resolve="SolverUtil" />
                 <node concept="Xl_RD" id="5_6ImQZ8nfH" role="37wK5m">
                   <property role="Xl_RC" value="could not find LUB" />
                 </node>
@@ -19823,9 +19820,9 @@
                                       </node>
                                     </node>
                                     <node concept="3clFbF" id="6X1kwjBC30$" role="3cqZAp">
-                                      <node concept="2YIFZM" id="6X1kwjBC3cJ" role="3clFbG">
-                                        <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-                                        <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asVariable" />
+                                      <node concept="2YIFZM" id="74q$MmRB2be" role="3clFbG">
+                                        <ref role="37wK5l" to="7n8k:7HUwyZb7chj" resolve="asVariable" />
+                                        <ref role="1Pybhc" to="7n8k:677NV565N1x" resolve="LogicalUtil" />
                                         <node concept="1nq8_$" id="49obaclfij4" role="37wK5m">
                                           <node concept="a7P8L" id="6X1kwjBC3Gn" role="1nq8_t">
                                             <ref role="a7OzE" node="6X1kwjB_6wO" resolve="Type" />
@@ -21486,6 +21483,118 @@
       </node>
     </node>
   </node>
+  <node concept="AVZre" id="34$A1Mf51rY">
+    <property role="TrG5h" value="TypeOf" />
+    <node concept="3AqmO8" id="34$A1MfhdDv" role="8PkJo">
+      <property role="TrG5h" value="typeOf" />
+      <node concept="1zAUYm" id="34$A1MfhdDx" role="1zAUyy">
+        <property role="TrG5h" value="node" />
+      </node>
+      <node concept="1zAUYm" id="34$A1MfhdDz" role="1zAUyy">
+        <property role="TrG5h" value="type" />
+      </node>
+    </node>
+  </node>
+  <node concept="92CTh" id="6OXbTD$fto2">
+    <property role="TrG5h" value="Typecheck" />
+    <node concept="2bWyPT" id="6OXbTD$ftqj" role="92CTm">
+      <property role="TrG5h" value="check" />
+      <node concept="3clFbS" id="6OXbTD$ftqk" role="fHCRw">
+        <node concept="1nLNNL" id="6OXbTD$ftql" role="3cqZAp">
+          <node concept="1nLNMm" id="6OXbTD$ftqm" role="1nLNNK">
+            <node concept="3Aq9E8" id="6OXbTD$ftqn" role="1nLNMd">
+              <node concept="3I6sU6" id="6OXbTD$ftqo" role="3Ip0Jz">
+                <node concept="3I6s7M" id="6OXbTD_c30h" role="3I6sU7">
+                  <node concept="3Aqt3T" id="6OXbTD_c30g" role="3I6s78">
+                    <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="12QmIoyIWn9" role="3I6sU7">
+                  <node concept="3Aqt3T" id="12QmIoyIWn7" role="3I6s78">
+                    <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OXbTD$ftqD" role="3cqZAp" />
+      </node>
+    </node>
+    <node concept="10M0yZ" id="2BZXJecEQOM" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
+  </node>
+  <node concept="92CTh" id="6OXbTD$ftrf">
+    <property role="TrG5h" value="ConvertsTo" />
+    <node concept="2_cOLj" id="2BZXJecOMap" role="2_cLD1">
+      <property role="TrG5h" value="from" />
+      <node concept="3Tqbb2" id="2BZXJecRAg9" role="2_9F96" />
+    </node>
+    <node concept="2_cOLj" id="2BZXJecOMba" role="2_cLD1">
+      <property role="TrG5h" value="to" />
+      <node concept="3Tqbb2" id="2BZXJecRAgb" role="2_9F96" />
+    </node>
+    <node concept="2bWyPT" id="6OXbTD$fttw" role="92CTm">
+      <property role="TrG5h" value="subtypeOf" />
+      <node concept="3clFbS" id="6OXbTD$fttx" role="fHCRw">
+        <node concept="1nLNNL" id="6OXbTD$fttF" role="3cqZAp">
+          <node concept="1nLNMm" id="6OXbTD$fttG" role="1nLNNK">
+            <node concept="3Aq9E8" id="6OXbTD$fttH" role="1nLNMd">
+              <node concept="3I6sU6" id="6OXbTD$fttI" role="3Ip0Jz">
+                <node concept="3I6s7M" id="6OXbTD$fttJ" role="3I6sU7">
+                  <node concept="1imXTs" id="6OXbTD$fttK" role="3I6s78">
+                    <node concept="a7P8L" id="6OXbTD$fttL" role="1imXu6">
+                      <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
+                    </node>
+                    <node concept="2_cIyK" id="2BZXJecXiSC" role="1imXSf">
+                      <ref role="2_cIwb" node="2BZXJecOMap" resolve="from" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="6OXbTD$fttN" role="3I6sU7">
+                  <node concept="1imXTs" id="6OXbTD$fttO" role="3I6s78">
+                    <node concept="a7P8L" id="6OXbTD$fttP" role="1imXu6">
+                      <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
+                    </node>
+                    <node concept="2_cIyK" id="2BZXJecXiT4" role="1imXSf">
+                      <ref role="2_cIwb" node="2BZXJecOMba" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="6OXbTD$fttR" role="3I6sU7">
+                  <node concept="3Aqt3T" id="6OXbTD$fttS" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="6OXbTD$fttT" role="3AunhB">
+                      <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
+                    </node>
+                    <node concept="a7P8L" id="6OXbTD$fttU" role="3AunhB">
+                      <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="6OXbTD$fttV" role="0UC6o">
+              <node concept="3NuqgR" id="6OXbTD$fttW" role="0eVf_">
+                <node concept="aZer4" id="6OXbTD$fttX" role="3XD1gS">
+                  <property role="TrG5h" value="A" />
+                </node>
+                <node concept="aZer4" id="6OXbTD$fttY" role="3XD1gS">
+                  <property role="TrG5h" value="B" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10M0yZ" id="2BZXJecEQQ5" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inO_s" resolve="CONVERT" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
+  </node>
   <node concept="ns1xd" id="JOGAOsVt29">
     <property role="TrG5h" value="Terms" />
     <node concept="ns1x$" id="JOGAOsVt2a" role="ns1xc">
@@ -21757,117 +21866,31 @@
       <node concept="nspSf" id="JOGAOsVt3d" role="ns1xx" />
     </node>
   </node>
-  <node concept="AVZre" id="34$A1Mf51rY">
-    <property role="TrG5h" value="TypeOf" />
-    <node concept="3AqmO8" id="34$A1MfhdDv" role="8PkJo">
-      <property role="TrG5h" value="typeOf" />
-      <node concept="1zAUYm" id="34$A1MfhdDx" role="1zAUyy">
-        <property role="TrG5h" value="node" />
-      </node>
-      <node concept="1zAUYm" id="34$A1MfhdDz" role="1zAUyy">
-        <property role="TrG5h" value="type" />
-      </node>
-    </node>
-  </node>
-  <node concept="92CTh" id="6OXbTD$fto2">
-    <property role="TrG5h" value="Typecheck" />
-    <node concept="2bWyPT" id="6OXbTD$ftqj" role="92CTm">
-      <property role="TrG5h" value="check" />
-      <node concept="3clFbS" id="6OXbTD$ftqk" role="fHCRw">
-        <node concept="1nLNNL" id="6OXbTD$ftql" role="3cqZAp">
-          <node concept="1nLNMm" id="6OXbTD$ftqm" role="1nLNNK">
-            <node concept="3Aq9E8" id="6OXbTD$ftqn" role="1nLNMd">
-              <node concept="3I6sU6" id="6OXbTD$ftqo" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6OXbTD_c30h" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6OXbTD_c30g" role="3I6s78">
-                    <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="12QmIoyIWn9" role="3I6sU7">
-                  <node concept="3Aqt3T" id="12QmIoyIWn7" role="3I6s78">
-                    <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OXbTD$ftqD" role="3cqZAp" />
-      </node>
-    </node>
-    <node concept="10M0yZ" id="2BZXJecEQOM" role="2_lZgo">
-      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
-      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-    </node>
-  </node>
-  <node concept="92CTh" id="6OXbTD$ftrf">
-    <property role="TrG5h" value="ConvertsTo" />
-    <node concept="2_cOLj" id="2BZXJecOMap" role="2_cLD1">
-      <property role="TrG5h" value="from" />
-      <node concept="3Tqbb2" id="2BZXJecRAg9" role="2_9F96" />
-    </node>
-    <node concept="2_cOLj" id="2BZXJecOMba" role="2_cLD1">
-      <property role="TrG5h" value="to" />
-      <node concept="3Tqbb2" id="2BZXJecRAgb" role="2_9F96" />
-    </node>
-    <node concept="2bWyPT" id="6OXbTD$fttw" role="92CTm">
-      <property role="TrG5h" value="subtypeOf" />
-      <node concept="3clFbS" id="6OXbTD$fttx" role="fHCRw">
-        <node concept="1nLNNL" id="6OXbTD$fttF" role="3cqZAp">
-          <node concept="1nLNMm" id="6OXbTD$fttG" role="1nLNNK">
-            <node concept="3Aq9E8" id="6OXbTD$fttH" role="1nLNMd">
-              <node concept="3I6sU6" id="6OXbTD$fttI" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6OXbTD$fttJ" role="3I6sU7">
-                  <node concept="1imXTs" id="6OXbTD$fttK" role="3I6s78">
-                    <node concept="a7P8L" id="6OXbTD$fttL" role="1imXu6">
-                      <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
-                    </node>
-                    <node concept="2_cIyK" id="2BZXJecXiSC" role="1imXSf">
-                      <ref role="2_cIwb" node="2BZXJecOMap" resolve="from" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="6OXbTD$fttN" role="3I6sU7">
-                  <node concept="1imXTs" id="6OXbTD$fttO" role="3I6s78">
-                    <node concept="a7P8L" id="6OXbTD$fttP" role="1imXu6">
-                      <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
-                    </node>
-                    <node concept="2_cIyK" id="2BZXJecXiT4" role="1imXSf">
-                      <ref role="2_cIwb" node="2BZXJecOMba" resolve="to" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="6OXbTD$fttR" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6OXbTD$fttS" role="3I6s78">
-                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="6OXbTD$fttT" role="3AunhB">
-                      <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
-                    </node>
-                    <node concept="a7P8L" id="6OXbTD$fttU" role="3AunhB">
-                      <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="6OXbTD$fttV" role="0UC6o">
-              <node concept="3NuqgR" id="6OXbTD$fttW" role="0eVf_">
-                <node concept="aZer4" id="6OXbTD$fttX" role="3XD1gS">
-                  <property role="TrG5h" value="A" />
-                </node>
-                <node concept="aZer4" id="6OXbTD$fttY" role="3XD1gS">
-                  <property role="TrG5h" value="B" />
-                </node>
+  <node concept="312cEu" id="5_6ImQZ8j9D">
+    <property role="TrG5h" value="SolverUtil" />
+    <node concept="2tJIrI" id="5_6ImQZ8j9N" role="jymVt" />
+    <node concept="2YIFZL" id="5_6ImQZ8ja0" role="jymVt">
+      <property role="TrG5h" value="fail" />
+      <node concept="3cqZAl" id="5_6ImQZ8ja2" role="3clF45" />
+      <node concept="3Tm1VV" id="5_6ImQZ8ja3" role="1B3o_S" />
+      <node concept="3clFbS" id="5_6ImQZ8ja4" role="3clF47">
+        <node concept="YS8fn" id="5_6ImQZ8jaz" role="3cqZAp">
+          <node concept="2ShNRf" id="5_6ImQZ8jaX" role="YScLw">
+            <node concept="1pGfFk" id="5_6ImQZ8l0Z" role="2ShVmc">
+              <ref role="37wK5l" to="w7la:~EvaluationFailureException.&lt;init&gt;(java.lang.String)" resolve="EvaluationFailureException" />
+              <node concept="37vLTw" id="5_6ImQZ8l2j" role="37wK5m">
+                <ref role="3cqZAo" node="5_6ImQZ8l1u" resolve="message" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="5_6ImQZ8l1u" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="5_6ImQZ8l1t" role="1tU5fm" />
+      </node>
     </node>
-    <node concept="10M0yZ" id="2BZXJecEQQ5" role="2_lZgo">
-      <ref role="3cqZAo" to="1g4i:4t7Xo7inO_s" resolve="CONVERT" />
-      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-    </node>
+    <node concept="3Tm1VV" id="5_6ImQZ8j9E" role="1B3o_S" />
   </node>
 </model>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 3fa838ac..8bd0f7eb 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -24,7 +24,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
   </imports>
   <registry>
@@ -233,13 +233,13 @@
       <concept id="8243879142738613213" name="jetbrains.mps.baseLanguage.unitTest.structure.AfterTest" flags="in" index="1KhZuU" />
     </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.List" flags="ng" index="KCUsM">
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
       <concept id="6694277639409954681" name="jetbrains.mps.logic.structure.ListRole" flags="ng" index="38e3lM">
         <child id="6694277639409954746" name="list" index="38e3mL" />
       </concept>
-      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.TreeFormExpression" flags="ng" index="1oi1Uc">
+      <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
       <concept id="7571593955706137125" name="jetbrains.mps.logic.structure.TermNode" flags="ng" index="1oi5UN">
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
index 6aa5854c..267e37c9 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
@@ -8,6 +8,8 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
   <imports>
     <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />