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 3e36fd0a..c6f0fd46 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -3390,6 +3390,22 @@
       <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
       <ref role="2rTdP9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
     </node>
+    <node concept="3aamgX" id="4nUKN9YPm7g" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+      <node concept="1Koe21" id="4nUKN9YPm7h" role="1lVwrX">
+        <node concept="3clFbS" id="4nUKN9YPm7i" role="1Koe22">
+          <node concept="3cpWs8" id="4nUKN9YPm7j" role="3cqZAp">
+            <node concept="3cpWsn" id="4nUKN9YPm7k" role="3cpWs9">
+              <property role="TrG5h" value="ln" />
+              <node concept="3uibUv" id="4nUKN9YPm7l" role="1tU5fm">
+                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                <node concept="raruj" id="4nUKN9YPm7m" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="jVnub" id="4lCLOtwvFAX">
     <property role="TrG5h" value="dataform_builder" />
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index a998a5a3..3e78eebf 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.logic" uuid="35320f26-77cb-4c55-be9f-a97a27770af1" languageVersion="11" moduleVersion="0">
+<language namespace="jetbrains.mps.logic" uuid="35320f26-77cb-4c55-be9f-a97a27770af1" languageVersion="12" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index d710044d..6d298d46 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -4538,7 +4538,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="24ciDNzqIwf">
-    <property role="3GE5qa" value="" />
+    <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="5j4j:24ciDNzqIuw" resolve="TermType" />
     <node concept="3EZMnI" id="24ciDNzqIwk" role="2wV5jI">
       <node concept="PMmxH" id="24ciDNzqIwr" role="3EZMnx">
@@ -5295,5 +5295,69 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="4nUKN9YNYrP">
+    <property role="3GE5qa" value="logical.type" />
+    <ref role="1XX52x" to="5j4j:7HUwyZb1HXL" resolve="MultiLogicalType" />
+    <node concept="3EZMnI" id="4nUKN9YNYrR" role="2wV5jI">
+      <node concept="PMmxH" id="4nUKN9YNYwz" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3EZMnI" id="4nUKN9YNYw$" role="3EZMnx">
+        <node concept="VPM3Z" id="4nUKN9YNYw_" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="4nUKN9YNYwA" role="3EZMnx">
+          <property role="3F0ifm" value="&lt;" />
+          <ref role="1k5W1q" to="tpen:75A9veqzBn9" resolve="LeftAngleBracket" />
+          <node concept="11L4FC" id="4nUKN9YNYwB" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F1sOY" id="4nUKN9YNYwC" role="3EZMnx">
+          <ref role="1NtTu8" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+        </node>
+        <node concept="3F0ifn" id="4nUKN9YNYwD" role="3EZMnx">
+          <property role="3F0ifm" value="&gt;" />
+          <ref role="1k5W1q" to="tpen:75A9veqzBna" resolve="RightAngleBracket" />
+          <node concept="11LMrY" id="4nUKN9YNYwE" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="4nUKN9YNYwF" role="2iSdaV" />
+        <node concept="pkWqt" id="4nUKN9YNYwG" role="pqm2j">
+          <node concept="3clFbS" id="4nUKN9YNYwH" role="2VODD2">
+            <node concept="3clFbF" id="4nUKN9YNYwI" role="3cqZAp">
+              <node concept="2OqwBi" id="4nUKN9YNYwJ" role="3clFbG">
+                <node concept="2OqwBi" id="4nUKN9YNYwK" role="2Oq$k0">
+                  <node concept="pncrf" id="4nUKN9YNYwL" role="2Oq$k0" />
+                  <node concept="Bykcj" id="4nUKN9YNYwM" role="2OqNvi">
+                    <node concept="1aIX9F" id="4nUKN9YNYwN" role="1xVPHs">
+                      <node concept="26LbJo" id="4nUKN9YNYwO" role="1aIX9E">
+                        <ref role="26LbJp" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4nUKN9YNYwP" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="4nUKN9YNYrU" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4nUKN9YPlxW">
+    <property role="3GE5qa" value="term" />
+    <ref role="1XX52x" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+    <node concept="3EZMnI" id="4nUKN9YPlxY" role="2wV5jI">
+      <node concept="PMmxH" id="4nUKN9YPlxZ" role="3EZMnx">
+        <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="l2Vlx" id="4nUKN9YPly0" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index e8dda0ac..d2fc6a61 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -22,6 +22,7 @@
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -135,6 +136,22 @@
         <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" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </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="8182547171709614739" name="jetbrains.mps.lang.quotation.structure.NodeBuilderRef" flags="nn" index="36bGnv">
+        <reference id="8182547171709614741" name="target" index="36bGnp" />
+      </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>
@@ -167,6 +184,7 @@
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
         <child id="1180031783297" name="conceptArgument" index="2Zo12j" />
       </concept>
@@ -2428,5 +2446,140 @@
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
     </node>
   </node>
+  <node concept="3SyAh_" id="4nUKN9YPSRH">
+    <property role="qMTe8" value="11" />
+    <property role="TrG5h" value="UseTermListType" />
+    <node concept="3Tm1VV" id="4nUKN9YPSRI" role="1B3o_S" />
+    <node concept="3tTeZs" id="4nUKN9YPSRJ" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="4nUKN9YPSRK" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
+    </node>
+    <node concept="3tTeZs" id="4nUKN9YPSRL" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
+    </node>
+    <node concept="2tJIrI" id="4nUKN9YPSRM" role="jymVt" />
+    <node concept="3tYpMH" id="4nUKN9YPSRN" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="4nUKN9YPSRO" role="1B3o_S" />
+      <node concept="10P_77" id="4nUKN9YPSRP" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="4nUKN9YQlpt" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Use termlist type instead of classifier type ListNode in logical variable declaration. " />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="4nUKN9YQlpv" role="1B3o_S" />
+      <node concept="17QB3L" id="4nUKN9YQlpw" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="4nUKN9YPSRR" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="4nUKN9YPSRT" role="1B3o_S" />
+      <node concept="3clFbS" id="4nUKN9YPSRV" role="3clF47">
+        <node concept="L3pyB" id="4nUKN9YPTwz" role="3cqZAp">
+          <node concept="3clFbS" id="4nUKN9YPTw$" role="L3pyw">
+            <node concept="3clFbF" id="4nUKN9YPTw_" role="3cqZAp">
+              <node concept="2OqwBi" id="4nUKN9YPTwA" role="3clFbG">
+                <node concept="2OqwBi" id="4nUKN9YPTwB" role="2Oq$k0">
+                  <node concept="qVDSY" id="4nUKN9YPTwC" role="2Oq$k0">
+                    <node concept="chp4Y" id="4nUKN9YPUh3" role="qVDSX">
+                      <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
+                    </node>
+                    <node concept="1dO9Bo" id="4nUKN9YPTwE" role="1dOa5D" />
+                  </node>
+                  <node concept="3zZkjj" id="4nUKN9YPTwF" role="2OqNvi">
+                    <node concept="1bVj0M" id="4nUKN9YPTwG" role="23t8la">
+                      <node concept="3clFbS" id="4nUKN9YPTwH" role="1bW5cS">
+                        <node concept="3clFbF" id="4nUKN9YPVwc" role="3cqZAp">
+                          <node concept="2YFouu" id="4nUKN9YPWGO" role="3clFbG">
+                            <node concept="2pJPEk" id="4nUKN9YPWSA" role="3uHU7w">
+                              <node concept="2pJPED" id="4nUKN9YPXiq" role="2pJPEn">
+                                <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                <node concept="2pIpSj" id="4nUKN9YPXzV" role="2pJxcM">
+                                  <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                  <node concept="36bGnv" id="4nUKN9YPZP2" role="28nt2d">
+                                    <ref role="36bGnp" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="4nUKN9YPVPh" role="3uHU7B">
+                              <node concept="37vLTw" id="4nUKN9YPVwb" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4nUKN9YPTwW" resolve="it" />
+                              </node>
+                              <node concept="3TrEf2" id="4nUKN9YPWc3" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="4nUKN9YPTwW" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="4nUKN9YPTwX" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2es0OD" id="4nUKN9YPTwY" role="2OqNvi">
+                  <node concept="1bVj0M" id="4nUKN9YPTwZ" role="23t8la">
+                    <property role="3yWfEV" value="true" />
+                    <node concept="3clFbS" id="4nUKN9YPTx0" role="1bW5cS">
+                      <node concept="3clFbF" id="4nUKN9YQ0PS" role="3cqZAp">
+                        <node concept="2OqwBi" id="4nUKN9YQ24D" role="3clFbG">
+                          <node concept="2OqwBi" id="4nUKN9YQ1lE" role="2Oq$k0">
+                            <node concept="37vLTw" id="4nUKN9YQ0PQ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4nUKN9YPTxH" resolve="lvdc" />
+                            </node>
+                            <node concept="3TrEf2" id="4nUKN9YQ1HM" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
+                            </node>
+                          </node>
+                          <node concept="1_qnLN" id="4nUKN9YQ2HT" role="2OqNvi">
+                            <ref role="1_rbq0" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="4nUKN9YPTxH" role="1bW2Oz">
+                      <property role="TrG5h" value="lvdc" />
+                      <node concept="2jxLKc" id="4nUKN9YPTxI" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4nUKN9YPTxJ" role="L3pyr">
+            <ref role="3cqZAo" node="4nUKN9YPSRX" resolve="m" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="4nUKN9YPSRX" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="4nUKN9YPSRW" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="4nUKN9YPSRY" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="4nUKN9YPSRR" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="4nUKN9YPSRZ" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+    <node concept="3uibUv" id="4nUKN9YPSS0" role="1zkMxy">
+      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index de8b54ac..8c918867 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -368,9 +368,12 @@
   <node concept="1TIwiD" id="7HUwyZb1HXL">
     <property role="3GE5qa" value="logical.type" />
     <property role="TrG5h" value="MultiLogicalType" />
-    <property role="34LRSv" value="multiLogical" />
+    <property role="34LRSv" value="logical[]" />
     <property role="EcuMT" value="8897567155605135217" />
     <ref role="1TJDcQ" node="1mP5b6jNC0S" resolve="LogicalType" />
+    <node concept="t5JxF" id="4nUKN9YNYro" role="lGtFl">
+      <property role="t5JxN" value="!!FIXME rename to LogicalArrayType!!" />
+    </node>
   </node>
   <node concept="1TIwiD" id="5NAQwIkRIXT">
     <property role="EcuMT" value="6694277639409954681" />
@@ -778,7 +781,7 @@
   </node>
   <node concept="1TIwiD" id="24ciDNzqIuw">
     <property role="EcuMT" value="2381360340662937504" />
-    <property role="3GE5qa" value="" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="TermType" />
     <property role="34LRSv" value="term" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
@@ -858,5 +861,12 @@
       <ref role="20lvS9" node="JOGAOsxanH" resolve="DataFormConstructor" />
     </node>
   </node>
+  <node concept="1TIwiD" id="4nUKN9YPlxw">
+    <property role="EcuMT" value="5042557354438383712" />
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="TermListType" />
+    <property role="34LRSv" value="termlist" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 9c430479..e5eb0086 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -1399,7 +1399,7 @@
     </node>
   </node>
   <node concept="2sgARr" id="24ciDNzqUsw">
-    <property role="3GE5qa" value="" />
+    <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="supertypesOf_TermType" />
     <property role="2RFo0w" value="true" />
     <node concept="3clFbS" id="24ciDNzqUsx" role="2sgrp5">
@@ -1558,5 +1558,22 @@
       <ref role="1YaFvo" to="5j4j:hYA4REbm1C" resolve="LogicalVariableRefExpression" />
     </node>
   </node>
+  <node concept="2sgARr" id="4nUKN9YPlyX">
+    <property role="3GE5qa" value="term" />
+    <property role="TrG5h" value="supertypesOf_TermListType" />
+    <node concept="3clFbS" id="4nUKN9YPlyY" role="2sgrp5">
+      <node concept="3clFbF" id="4nUKN9YPlzW" role="3cqZAp">
+        <node concept="2c44tf" id="4nUKN9YPlzX" role="3clFbG">
+          <node concept="3uibUv" id="4nUKN9YPl$t" role="2c44tc">
+            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="4nUKN9YPlz0" role="1YuTPh">
+      <property role="TrG5h" value="termListType" />
+      <ref role="1YaFvo" to="5j4j:4nUKN9YPlxw" resolve="TermListType" />
+    </node>
+  </node>
 </model>