diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 737381ae..d491e297 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -235,7 +235,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="7MlQDeOyT3P">
-    <property role="3GE5qa" value="dataform.expression" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <ref role="13h7C2" to="5j4j:dfChU1zo4B" resolve="Splice" />
     <node concept="13i0hz" id="7MlQDeOyT3S" role="13h7CS">
       <property role="TrG5h" value="prototype" />
@@ -488,7 +488,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="JOGAOsxFgi">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
     <node concept="13i0hz" id="4lCLOtww4qi" role="13h7CS">
       <property role="TrG5h" value="prototypesStack" />
@@ -696,7 +696,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="JOGAOsxidP">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
     <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
       <property role="TrG5h" value="runtimeClassName" />
@@ -752,7 +752,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="JOGAOsxlgX">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="5j4j:JOGAOsxiLy" resolve="DataFormTemplate" />
     <node concept="13i0hz" id="5UYwY$H7MGm" role="13h7CS">
       <property role="TrG5h" value="valueFeatures" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 02098914..ecc912b2 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -855,7 +855,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="JOGAOsxTE1">
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1M2myG" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
     <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
       <ref role="1N5Vy1" to="5j4j:JOGAOsxTDo" resolve="feature" />
@@ -1006,7 +1006,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="4vr5SAprtjH">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1M2myG" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
     <node concept="1N5Pfh" id="4vr5SAprtjI" role="1Mr941">
       <ref role="1N5Vy1" to="5j4j:JOGAOsxaCh" resolve="prototype" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 6f7c94a4..17b73b31 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -1191,7 +1191,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="dfChU1zo92">
-    <property role="3GE5qa" value="dataform.expression" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <ref role="1XX52x" to="5j4j:dfChU1zo4B" resolve="Splice" />
     <node concept="3EZMnI" id="dfChU1zop0" role="2wV5jI">
       <ref role="1k5W1q" node="7ksQUDZuyMD" resolve="Backquote" />
@@ -2946,7 +2946,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxiLE">
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
     <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
       <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
@@ -3008,7 +3008,7 @@
   </node>
   <node concept="1h_SRR" id="JOGAOsxj5_">
     <property role="TrG5h" value="DataFormFeature_final" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1h_SK9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
     <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
       <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
@@ -3046,7 +3046,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="JOGAOsxkwf">
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="aqKnT" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
     <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
       <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
@@ -3134,7 +3134,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxTDr">
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="5j4j:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
     <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
       <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
@@ -3160,7 +3160,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxX6Q">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
     <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
       <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
@@ -3208,7 +3208,7 @@
     </node>
   </node>
   <node concept="3p36aQ" id="JOGAOsxYtS">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="aqKnT" to="5j4j:JOGAOsxanH" resolve="DataFormConstructor" />
     <node concept="2F$Pav" id="7XmdqtdOhCF" role="3ft7WO">
       <node concept="3eGOop" id="7XmdqtdOhD8" role="2$S_pN">
@@ -3275,7 +3275,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="JOGAOsxCR1">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="aqKnT" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
     <node concept="1Qtc8_" id="4vr5SApqcy2" role="IW6Ez">
       <node concept="3cWJ9i" id="4vr5SApqcOk" role="1Qtc8$">
@@ -3429,7 +3429,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxEW6">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
     <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
       <node concept="3F0ifn" id="4vr5SApqlad" role="3EZMnx">
@@ -3496,7 +3496,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxaCz">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="5j4j:JOGAOsxaCw" resolve="DataFormTable" />
     <node concept="3EZMnI" id="5hSMZ_lNwqE" role="2wV5jI">
       <node concept="3EZMnI" id="5hSMZ_lNwqF" role="3EZMnx">
@@ -3550,7 +3550,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxlgm">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="5j4j:JOGAOsxiLy" resolve="DataFormTemplate" />
     <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
       <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
@@ -3692,7 +3692,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="2L$SfAAUSzE">
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <ref role="1XX52x" to="5j4j:2L$SfAAUQEl" resolve="NewLineAttribute" />
     <node concept="3EZMnI" id="2L$SfAAUSzP" role="2wV5jI">
       <node concept="2SsqMj" id="2L$SfAAUSzW" role="3EZMnx" />
@@ -3713,7 +3713,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="2L$SfAB9FIw">
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <property role="TrG5h" value="NewLineAttribute_DELETE" />
     <ref role="1h_SK9" to="5j4j:2L$SfAAUQEl" resolve="NewLineAttribute" />
     <node concept="1hA7zw" id="2L$SfAB9FIx" role="1h_SK8">
@@ -4279,7 +4279,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="4vr5SAprGdP">
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="DataForm_open_DELETE" />
     <ref role="1h_SK9" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
     <node concept="1hA7zw" id="4vr5SAprGdQ" role="1h_SK8">
@@ -4538,7 +4538,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="24ciDNzqIwf">
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="" />
     <ref role="1XX52x" to="5j4j:24ciDNzqIuw" resolve="TermType" />
     <node concept="3EZMnI" id="24ciDNzqIwk" role="2wV5jI">
       <node concept="PMmxH" id="24ciDNzqIwr" role="3EZMnx">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index d462c058..e4e00ee4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -21,6 +21,13 @@
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
       <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
+      <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
+        <property id="7862711839422615217" name="text" index="t5JxN" />
+        <child id="7862711839422615224" name="seeAlso" index="t5JxU" />
+      </concept>
+      <concept id="7862711839422615221" name="jetbrains.mps.lang.structure.structure.DocumentationObjectiveRef" flags="ng" index="t5JxR">
+        <reference id="7862711839422615222" name="target" index="t5JxO" />
+      </concept>
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -119,6 +126,9 @@
       <property role="IQ2ns" value="7571593955706284441" />
       <ref role="20lvS9" node="6$jH9oLmYD_" resolve="RoleNode" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwfWy8" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to ForkNode!! A data node that contains other nodes separated by roles." />
+    </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYD_">
     <property role="TrG5h" value="RoleNode" />
@@ -144,6 +154,15 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <property role="IQ2ns" value="7571593955706137319" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
+      <node concept="t5JxF" id="3MfP0fwg5wn" role="lGtFl">
+        <property role="t5JxN" value="!!FIXME should be single containment!!" />
+      </node>
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg5wd" role="lGtFl">
+      <property role="t5JxN" value="Implements role that can only contain child node." />
+      <node concept="t5JxR" id="3MfP0fwg7BL" role="t5JxU">
+        <ref role="t5JxO" node="6$jH9oLmYC_" resolve="TermNode" />
+      </node>
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYI0">
@@ -159,6 +178,15 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <property role="IQ2ns" value="7571593955706137672" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
+      <node concept="t5JxF" id="3MfP0fwg5ws" role="lGtFl">
+        <property role="t5JxN" value="!!FIXME should be single containment!!" />
+      </node>
+    </node>
+    <node concept="t5JxF" id="3MfP0fwg7BE" role="lGtFl">
+      <property role="t5JxN" value="Implements role that can only contain value node." />
+      <node concept="t5JxR" id="3MfP0fwg7BT" role="t5JxU">
+        <ref role="t5JxO" node="6$jH9oLmYJ_" resolve="Value" />
+      </node>
     </node>
   </node>
   <node concept="1TIwiD" id="6$jH9oLmYJ_">
@@ -173,6 +201,12 @@
       <property role="IQ2nx" value="7571593955706137638" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg89n" role="lGtFl">
+      <property role="t5JxN" value="Data form that wraps an Object value. Only String can be directly specified." />
+      <node concept="t5JxR" id="3MfP0fwg9GW" role="t5JxU">
+        <ref role="t5JxO" node="dfChU1zo4B" resolve="Splice" />
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="5lJXKARS0">
     <property role="TrG5h" value="DataNode" />
@@ -181,6 +215,9 @@
     <property role="3GE5qa" value="dataform" />
     <property role="EcuMT" value="1503029989441024" />
     <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
+    <node concept="t5JxF" id="3MfP0fwg5wb" role="lGtFl">
+      <property role="t5JxN" value="An abstraction of any &quot;node&quot; that builds up a term. " />
+    </node>
   </node>
   <node concept="1TIwiD" id="2q_78a8W4yS">
     <property role="3GE5qa" value="dataform" />
@@ -196,6 +233,9 @@
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="logical.item" />
     <property role="EcuMT" value="8829335963591332101" />
+    <node concept="t5JxF" id="3MfP0fwfWyc" role="lGtFl">
+      <property role="t5JxN" value="An abstraction of any construct acceptable in a logical context." />
+    </node>
   </node>
   <node concept="1TIwiD" id="7E86$tKt5sV">
     <property role="3GE5qa" value="logical.item" />
@@ -264,7 +304,7 @@
   </node>
   <node concept="1TIwiD" id="dfChU1zo4B">
     <property role="TrG5h" value="Splice" />
-    <property role="3GE5qa" value="dataform.expression" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <property role="34LRSv" value="splice" />
     <property role="EcuMT" value="238586457668550951" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
@@ -284,6 +324,9 @@
         <property role="tnX3d" value="false" />
       </node>
     </node>
+    <node concept="t5JxF" id="3MfP0fwgajx" role="lGtFl">
+      <property role="t5JxN" value="Provides a way to substitute data form at runtime by evaluating the enclosed expresison." />
+    </node>
   </node>
   <node concept="1TIwiD" id="1OShD0HAY6y">
     <property role="3GE5qa" value="dataform" />
@@ -372,6 +415,9 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwgak1" role="lGtFl">
+      <property role="t5JxN" value="Allows to use data form in a logical context." />
+    </node>
   </node>
   <node concept="1TIwiD" id="5WBVN_MJ50y">
     <property role="EcuMT" value="6856711987711987746" />
@@ -422,20 +468,26 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="t5JxF" id="3MfP0fwfWy6" role="lGtFl">
+      <property role="t5JxN" value="An abstraction of data nodes and variables." />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxm2z">
     <property role="EcuMT" value="861509610434289827" />
     <property role="TrG5h" value="ChildFeature" />
     <property role="34LRSv" value="child" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5vf" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of child term." />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxiL_">
     <property role="EcuMT" value="861509610434276453" />
     <property role="TrG5h" value="DataFormFeature" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="JOGAOsxiLC" role="1TKVEl">
       <property role="IQ2nx" value="861509610434276456" />
@@ -451,10 +503,16 @@
       <property role="20kJfa" value="getter" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uK" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermFeature!! Defines a term feature." />
+      <node concept="t5JxR" id="3MfP0fwg5vc" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxiLy" resolve="DataFormTemplate" />
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxTDl">
     <property role="EcuMT" value="861509610434435669" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="DataFormFeatureOverride" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxTDo" role="1TKVEi">
@@ -470,20 +528,32 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uI" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermFeatureOverride!! Allows to override default feature value in term constructor" />
+      <node concept="t5JxR" id="3MfP0fwg5uX" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxpXw">
     <property role="EcuMT" value="861509610434305888" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="ListFeature" />
     <property role="34LRSv" value="list" />
     <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5w7" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of a list of child terms." />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxnj6">
     <property role="EcuMT" value="861509610434294982" />
     <property role="TrG5h" value="ValueFeature" />
     <property role="34LRSv" value="value" />
-    <property role="3GE5qa" value="dataform.constructor.feature" />
+    <property role="3GE5qa" value="term.feature" />
     <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <node concept="t5JxF" id="3MfP0fwg5w9" role="lGtFl">
+      <property role="t5JxN" value="Feature declaration of an Object value." />
+    </node>
   </node>
   <node concept="PlHQZ" id="JOGAOsIRhm">
     <property role="EcuMT" value="861509610437833814" />
@@ -493,7 +563,7 @@
   <node concept="1TIwiD" id="JOGAOsxanH">
     <property role="EcuMT" value="861509610434242029" />
     <property role="TrG5h" value="DataFormConstructor" />
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243078" />
@@ -508,11 +578,14 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uG" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermConstructor!! Creates a term using the template. Enables to override features." />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxaC9">
     <property role="EcuMT" value="861509610434243081" />
     <property role="TrG5h" value="DataFormDeclaration" />
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="4vr5SApqc6O" role="1TKVEl">
       <property role="IQ2nx" value="5177758076344254900" />
@@ -534,13 +607,19 @@
       <property role="20kJfa" value="prototype" />
       <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uQ" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermDeclaration!! Contains term template. Provides possibility to extend another term declaration." />
+      <node concept="t5JxR" id="3MfP0fwg5v7" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxaCw" resolve="DataFormTable" />
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxaCw">
     <property role="EcuMT" value="861509610434243104" />
     <property role="TrG5h" value="DataFormTable" />
     <property role="34LRSv" value="DataForm Table" />
     <property role="19KtqR" value="true" />
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243105" />
@@ -552,11 +631,14 @@
     <node concept="PrWs8" id="JOGAOsxfAQ" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uO" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermTable!! Contains term declarations." />
+    </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxiLy">
     <property role="EcuMT" value="861509610434276450" />
     <property role="TrG5h" value="DataFormTemplate" />
-    <property role="3GE5qa" value="dataform.constructor" />
+    <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
       <property role="IQ2ns" value="861509610434276451" />
@@ -565,6 +647,12 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg5uM" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to TermTemplate!! Defines a term structure by enumerating features." />
+      <node concept="t5JxR" id="3MfP0fwg5v2" role="t5JxU">
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="7lt0LtQg3tE">
     <property role="EcuMT" value="8456919074574710634" />
@@ -579,10 +667,13 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwgak3" role="lGtFl">
+      <property role="t5JxN" value="Bridges baseLanguage's Expression and logical item." />
+    </node>
   </node>
   <node concept="1TIwiD" id="2L$SfAAUQEl">
     <property role="EcuMT" value="3198928998191819413" />
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <property role="TrG5h" value="NewLineAttribute" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="M6xJ_" id="2L$SfAAUS3M" role="lGtFl">
@@ -646,6 +737,7 @@
       <property role="3tVfz5" value="7166797808989208714" />
       <ref role="2wpffI" node="6dP_abdQo2a" />
     </node>
+    <node concept="asaX9" id="3MfP0fwgdLs" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="PltxfHNb9C">
     <property role="EcuMT" value="960803923479540328" />
@@ -661,6 +753,9 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
+    <node concept="t5JxF" id="3MfP0fwg9H8" role="lGtFl">
+      <property role="t5JxN" value="Allows to use a logical variable that represents a data form." />
+    </node>
   </node>
   <node concept="1TIwiD" id="PltxfHULAb">
     <property role="EcuMT" value="960803923481532811" />
@@ -680,7 +775,7 @@
   </node>
   <node concept="1TIwiD" id="24ciDNzqIuw">
     <property role="EcuMT" value="2381360340662937504" />
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="" />
     <property role="TrG5h" value="TermType" />
     <property role="34LRSv" value="term" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 338a8dc6..9c430479 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -758,7 +758,7 @@
   </node>
   <node concept="1YbPZF" id="7dgRGU4$_5X">
     <property role="TrG5h" value="typeof_Splice" />
-    <property role="3GE5qa" value="dataform.expression" />
+    <property role="3GE5qa" value="dataform.attribute" />
     <node concept="3clFbS" id="7dgRGU4$_5Y" role="18ibNy">
       <node concept="3clFbJ" id="7dgRGU4$_64" role="3cqZAp">
         <node concept="3clFbS" id="7dgRGU4$_65" role="3clFbx">
@@ -1399,7 +1399,7 @@
     </node>
   </node>
   <node concept="2sgARr" id="24ciDNzqUsw">
-    <property role="3GE5qa" value="dataform" />
+    <property role="3GE5qa" value="" />
     <property role="TrG5h" value="supertypesOf_TermType" />
     <property role="2RFo0w" value="true" />
     <node concept="3clFbS" id="24ciDNzqUsx" role="2sgrp5">