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 1c81c72a..777b6035 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
@@ -41,6 +41,9 @@
       </concept>
       <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
+        <child id="2323553266850475953" name="modifiers" index="2frcjj" />
+      </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="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
@@ -70,6 +73,7 @@
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
+      <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -3476,6 +3480,26 @@
     <node concept="3HP615" id="104EUzFOARB" role="jymVt">
       <property role="TrG5h" value="Visitor" />
       <node concept="2tJIrI" id="104EUzFOARC" role="jymVt" />
+      <node concept="3clFb_" id="4WeLqVwUsof" role="jymVt">
+        <property role="TrG5h" value="visitAbstract" />
+        <node concept="16syzq" id="4WeLqVwUsog" role="3clF45">
+          <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
+        </node>
+        <node concept="3Tm1VV" id="4WeLqVwUsoh" role="1B3o_S" />
+        <node concept="3clFbS" id="4WeLqVwUsoi" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUsoj" role="3cqZAp">
+            <node concept="10Nm6u" id="4WeLqVwUsok" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="4WeLqVwUsol" role="3clF46">
+          <property role="TrG5h" value="treeForm" />
+          <node concept="3uibUv" id="4WeLqVwUsom" role="1tU5fm">
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+        </node>
+        <node concept="2JFqV2" id="4WeLqVwUson" role="2frcjj" />
+      </node>
+      <node concept="2tJIrI" id="4WeLqVwUslq" role="jymVt" />
       <node concept="3clFb_" id="6YPNC4OOzqx" role="jymVt">
         <property role="TrG5h" value="visitNode" />
         <node concept="37vLTG" id="6YPNC4OOCwV" role="3clF46">
@@ -3488,7 +3512,17 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="6YPNC4OOzq$" role="1B3o_S" />
-        <node concept="3clFbS" id="6YPNC4OOzq_" role="3clF47" />
+        <node concept="3clFbS" id="6YPNC4OOzq_" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUtwd" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUtwe" role="3clFbG">
+              <ref role="37wK5l" node="4WeLqVwUsof" resolve="visitAbstract" />
+              <node concept="37vLTw" id="4WeLqVwUtwf" role="37wK5m">
+                <ref role="3cqZAo" node="6YPNC4OOCwV" resolve="node" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2JFqV2" id="4WeLqVwUrzt" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="6YPNC4OOxgB" role="jymVt" />
       <node concept="3Tm1VV" id="104EUzFOARD" role="1B3o_S" />
@@ -3498,13 +3532,23 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="104EUzFOARG" role="1B3o_S" />
-        <node concept="3clFbS" id="104EUzFOARH" role="3clF47" />
+        <node concept="3clFbS" id="104EUzFOARH" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUuVY" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUuVZ" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOzqx" resolve="visitNode" />
+              <node concept="37vLTw" id="4WeLqVwUuW0" role="37wK5m">
+                <ref role="3cqZAo" node="104EUzFOARI" resolve="termNode" />
+              </node>
+            </node>
+          </node>
+        </node>
         <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="TermNode" />
           </node>
         </node>
+        <node concept="2JFqV2" id="4WeLqVwUulf" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="6YPNC4NZ7rq" role="jymVt" />
       <node concept="3clFb_" id="6YPNC4OOTg2" role="jymVt">
@@ -3519,7 +3563,17 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="6YPNC4OOTg5" role="1B3o_S" />
-        <node concept="3clFbS" id="6YPNC4OOTg6" role="3clF47" />
+        <node concept="3clFbS" id="6YPNC4OOTg6" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUwbH" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUwbI" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOzqx" resolve="visitNode" />
+              <node concept="37vLTw" id="4WeLqVwUwbJ" role="37wK5m">
+                <ref role="3cqZAo" node="6YPNC4OOY$d" resolve="roleNode" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2JFqV2" id="4WeLqVwUv$b" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="6YPNC4OOR23" role="jymVt" />
       <node concept="3clFb_" id="6YPNC4NZ8iR" role="jymVt">
@@ -3534,7 +3588,17 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="6YPNC4NZ8iU" role="1B3o_S" />
-        <node concept="3clFbS" id="6YPNC4NZ8iV" role="3clF47" />
+        <node concept="3clFbS" id="6YPNC4NZ8iV" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUxt2" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUxt3" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOTg2" resolve="visitRole" />
+              <node concept="37vLTw" id="4WeLqVwUxt4" role="37wK5m">
+                <ref role="3cqZAo" node="6YPNC4NZaEr" resolve="childRole" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2JFqV2" id="4WeLqVwUwOH" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="6YPNC4OETOD" role="jymVt" />
       <node concept="3clFb_" id="6YPNC4OET1Y" role="jymVt">
@@ -3549,7 +3613,17 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="6YPNC4OET22" role="1B3o_S" />
-        <node concept="3clFbS" id="6YPNC4OET23" role="3clF47" />
+        <node concept="3clFbS" id="6YPNC4OET23" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUyYl" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUyYm" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOTg2" resolve="visitRole" />
+              <node concept="37vLTw" id="4WeLqVwUyYn" role="37wK5m">
+                <ref role="3cqZAo" node="6YPNC4OET1Z" resolve="listRole" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2JFqV2" id="4WeLqVwUy65" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="6YPNC4NZ6zZ" role="jymVt" />
       <node concept="3clFb_" id="104EUzFOARP" role="jymVt">
@@ -3567,10 +3641,20 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="104EUzFOARU" role="1B3o_S" />
-        <node concept="3clFbS" id="104EUzFOARV" role="3clF47" />
+        <node concept="3clFbS" id="104EUzFOARV" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwU$q0" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwU$q1" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOTg2" resolve="visitRole" />
+              <node concept="37vLTw" id="4WeLqVwU$q2" role="37wK5m">
+                <ref role="3cqZAo" node="104EUzFOARQ" resolve="valueRole" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="16euLQ" id="104EUzFOARW" role="16eVyc">
           <property role="TrG5h" value="V" />
         </node>
+        <node concept="2JFqV2" id="4WeLqVwUzKP" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="104EUzFOARX" role="jymVt" />
       <node concept="3clFb_" id="104EUzFOAS5" role="jymVt">
@@ -3579,13 +3663,23 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="104EUzFOAS7" role="1B3o_S" />
-        <node concept="3clFbS" id="104EUzFOAS8" role="3clF47" />
+        <node concept="3clFbS" id="104EUzFOAS8" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwU_Zp" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwU_Zq" role="3clFbG">
+              <ref role="37wK5l" node="6YPNC4OOzqx" resolve="visitNode" />
+              <node concept="37vLTw" id="4WeLqVwU_Zr" role="37wK5m">
+                <ref role="3cqZAo" node="104EUzFOAS9" resolve="list" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="37vLTG" id="104EUzFOAS9" role="3clF46">
           <property role="TrG5h" value="list" />
           <node concept="3uibUv" id="104EUzFOASa" role="1tU5fm">
             <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
+        <node concept="2JFqV2" id="4WeLqVwU_k_" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="104EUzFOASe" role="jymVt" />
       <node concept="3clFb_" id="104EUzFOASf" role="jymVt">
@@ -3603,10 +3697,20 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="104EUzFOASk" role="1B3o_S" />
-        <node concept="3clFbS" id="104EUzFOASl" role="3clF47" />
+        <node concept="3clFbS" id="104EUzFOASl" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUBmy" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUBmz" role="3clFbG">
+              <ref role="37wK5l" node="4WeLqVwUsof" resolve="visitAbstract" />
+              <node concept="37vLTw" id="4WeLqVwUBm$" role="37wK5m">
+                <ref role="3cqZAo" node="104EUzFOASg" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="16euLQ" id="104EUzFOASm" role="16eVyc">
           <property role="TrG5h" value="V" />
         </node>
+        <node concept="2JFqV2" id="4WeLqVwUAEV" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="104EUzFOASn" role="jymVt" />
       <node concept="3clFb_" id="104EUzFOASo" role="jymVt">
@@ -3621,296 +3725,17 @@
           <ref role="16sUi3" node="6YPNC4OFzzK" resolve="T" />
         </node>
         <node concept="3Tm1VV" id="104EUzFOASs" role="1B3o_S" />
-        <node concept="3clFbS" id="104EUzFOASt" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="6HT7BWBQcuz" role="jymVt" />
-      <node concept="312cEu" id="6HT7BWBQcxv" role="jymVt">
-        <property role="TrG5h" value="Stub" />
-        <node concept="2tJIrI" id="6YPNC4PnrOZ" role="jymVt" />
-        <node concept="3clFb_" id="6YPNC4PnxDD" role="jymVt">
-          <property role="TrG5h" value="visitAbstract" />
-          <node concept="16syzq" id="6YPNC4Pn_rN" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6YPNC4PnxDG" role="1B3o_S" />
-          <node concept="3clFbS" id="6YPNC4PnxDH" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4PnE8I" role="3cqZAp">
-              <node concept="10Nm6u" id="6YPNC4PnE8H" role="3clFbG" />
-            </node>
-          </node>
-          <node concept="37vLTG" id="6YPNC4Pq7Bu" role="3clF46">
-            <property role="TrG5h" value="treeForm" />
-            <node concept="3uibUv" id="6YPNC4Pq7Bt" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="6YPNC4PnrQs" role="jymVt" />
-        <node concept="3clFb_" id="6YPNC4OOIs5" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitNode" />
-          <node concept="37vLTG" id="6YPNC4OOIs6" role="3clF46">
-            <property role="TrG5h" value="node" />
-            <node concept="3uibUv" id="6YPNC4OOIs7" role="1tU5fm">
-              <ref role="3uigEE" node="1msb0mq9ID4" resolve="DataNode" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OOIsb" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6YPNC4OOIs9" role="1B3o_S" />
-          <node concept="3clFbS" id="6YPNC4OOIsc" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4PnFzE" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4PnFzB" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4PnxDD" resolve="visitAbstract" />
-                <node concept="37vLTw" id="6YPNC4PqaHi" role="37wK5m">
-                  <ref role="3cqZAo" node="6YPNC4OOIs6" resolve="node" />
-                </node>
+        <node concept="3clFbS" id="104EUzFOASt" role="3clF47">
+          <node concept="3clFbF" id="4WeLqVwUD8O" role="3cqZAp">
+            <node concept="1rXfSq" id="4WeLqVwUD8P" role="3clFbG">
+              <ref role="37wK5l" node="4WeLqVwUsof" resolve="visitAbstract" />
+              <node concept="37vLTw" id="4WeLqVwUD8Q" role="37wK5m">
+                <ref role="3cqZAo" node="104EUzFOASp" resolve="variable" />
               </node>
             </node>
           </node>
-          <node concept="2AHcQZ" id="6YPNC4OOIsd" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6HT7BWBQcNL" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitTermNode" />
-          <node concept="16syzq" id="6YPNC4OFG6Y" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6HT7BWBQcNN" role="1B3o_S" />
-          <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="TermNode" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="6HT7BWBQcNR" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4OOP4x" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4OOP4w" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OOIs5" resolve="visitNode" />
-                <node concept="37vLTw" id="6YPNC4OOPxK" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBQcNP" resolve="termNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6HT7BWBQd0T" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6YPNC4OP337" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitRole" />
-          <node concept="37vLTG" id="6YPNC4OP338" role="3clF46">
-            <property role="TrG5h" value="roleNode" />
-            <node concept="3uibUv" id="6YPNC4OP339" role="1tU5fm">
-              <ref role="3uigEE" node="6YPNC4ODVle" resolve="RoleNode" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OP33d" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6YPNC4OP33b" role="1B3o_S" />
-          <node concept="3clFbS" id="6YPNC4OP33e" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4Pf4cL" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4Pf4cK" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OOIs5" resolve="visitNode" />
-                <node concept="37vLTw" id="6YPNC4Pf4v0" role="37wK5m">
-                  <ref role="3cqZAo" node="6YPNC4OP338" resolve="roleNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6YPNC4OP33f" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6YPNC4NZb84" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitChildRole" />
-          <node concept="37vLTG" id="6YPNC4NZb85" role="3clF46">
-            <property role="TrG5h" value="childRole" />
-            <node concept="3uibUv" id="6YPNC4NZb86" role="1tU5fm">
-              <ref role="3uigEE" node="6YPNC4NYnau" resolve="ChildRole" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OFGZM" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6YPNC4NZb88" role="1B3o_S" />
-          <node concept="3clFbS" id="6YPNC4NZb8a" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4OP7Tv" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4OP7Tu" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OP337" resolve="visitRole" />
-                <node concept="37vLTw" id="6YPNC4OP8pK" role="37wK5m">
-                  <ref role="3cqZAo" node="6YPNC4NZb85" resolve="childRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6YPNC4NZb8b" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6YPNC4OEVZg" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitListRole" />
-          <node concept="37vLTG" id="6YPNC4OEVZh" role="3clF46">
-            <property role="TrG5h" value="listRole" />
-            <node concept="3uibUv" id="6YPNC4OEVZi" role="1tU5fm">
-              <ref role="3uigEE" node="6YPNC4OECgm" resolve="ListRole" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OFHSB" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6YPNC4OEVZk" role="1B3o_S" />
-          <node concept="3clFbS" id="6YPNC4OEVZm" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4OP944" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4OP943" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OP337" resolve="visitRole" />
-                <node concept="37vLTw" id="6YPNC4OP9$y" role="37wK5m">
-                  <ref role="3cqZAo" node="6YPNC4OEVZh" resolve="listRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6YPNC4OEVZn" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6HT7BWBQcNU" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitValueRole" />
-          <node concept="37vLTG" id="6HT7BWBQcNV" role="3clF46">
-            <property role="TrG5h" value="valueRole" />
-            <node concept="3uibUv" id="6HT7BWBQcNW" role="1tU5fm">
-              <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueRole" />
-              <node concept="16syzq" id="6HT7BWBQcNX" role="11_B2D">
-                <ref role="16sUi3" node="6HT7BWBQcO1" resolve="V" />
-              </node>
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OFILt" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6HT7BWBQcNZ" role="1B3o_S" />
-          <node concept="16euLQ" id="6HT7BWBQcO1" role="16eVyc">
-            <property role="TrG5h" value="V" />
-          </node>
-          <node concept="3clFbS" id="6HT7BWBQcO2" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4OPb7K" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4OPb7J" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OP337" resolve="visitRole" />
-                <node concept="37vLTw" id="6YPNC4OPbCr" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBQcNV" resolve="valueRole" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6HT7BWBQd4X" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6HT7BWBQcOf" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitList" />
-          <node concept="16syzq" id="6YPNC4OFJEm" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6HT7BWBQcOh" role="1B3o_S" />
-          <node concept="37vLTG" id="6HT7BWBQcOj" role="3clF46">
-            <property role="TrG5h" value="list" />
-            <node concept="3uibUv" id="6HT7BWBQcOk" role="1tU5fm">
-              <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="6HT7BWBQcOl" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4Pfysq" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4Pfysp" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4OOIs5" resolve="visitNode" />
-                <node concept="37vLTw" id="6YPNC4PfyHb" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBQcOj" resolve="list" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6HT7BWBQdd0" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6HT7BWBQcOo" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitValue" />
-          <node concept="37vLTG" id="6HT7BWBQcOp" role="3clF46">
-            <property role="TrG5h" value="value" />
-            <node concept="3uibUv" id="6HT7BWBQcOq" role="1tU5fm">
-              <ref role="3uigEE" node="2xQ7eRAD2dj" resolve="Value" />
-              <node concept="16syzq" id="6HT7BWBQcOr" role="11_B2D">
-                <ref role="16sUi3" node="6HT7BWBQcOv" resolve="V" />
-              </node>
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OFKze" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6HT7BWBQcOt" role="1B3o_S" />
-          <node concept="16euLQ" id="6HT7BWBQcOv" role="16eVyc">
-            <property role="TrG5h" value="V" />
-          </node>
-          <node concept="3clFbS" id="6HT7BWBQcOw" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4PnH9B" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4PnH9A" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4PnxDD" resolve="visitAbstract" />
-                <node concept="37vLTw" id="6YPNC4PqcO8" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBQcOp" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6HT7BWBQdh4" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3clFb_" id="6HT7BWBQcOz" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="visitVariable" />
-          <node concept="37vLTG" id="6HT7BWBQcO$" role="3clF46">
-            <property role="TrG5h" value="variable" />
-            <node concept="3uibUv" id="6HT7BWBQcO_" role="1tU5fm">
-              <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6YPNC4OFLs9" role="3clF45">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-          <node concept="3Tm1VV" id="6HT7BWBQcOB" role="1B3o_S" />
-          <node concept="3clFbS" id="6HT7BWBQcOD" role="3clF47">
-            <node concept="3clFbF" id="6YPNC4PnIls" role="3cqZAp">
-              <node concept="1rXfSq" id="6YPNC4PnIlr" role="3clFbG">
-                <ref role="37wK5l" node="6YPNC4PnxDD" resolve="visitAbstract" />
-                <node concept="37vLTw" id="6YPNC4Pqe_m" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBQcO$" resolve="variable" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6HT7BWBQdl4" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="6HT7BWBQcxw" role="1B3o_S" />
-        <node concept="3uibUv" id="6HT7BWBQcHt" role="EKbjA">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="DataForm.Visitor" />
-          <node concept="16syzq" id="6YPNC4OFFK7" role="11_B2D">
-            <ref role="16sUi3" node="6YPNC4OFF7C" resolve="T" />
-          </node>
-        </node>
-        <node concept="16euLQ" id="6YPNC4OFF7C" role="16eVyc">
-          <property role="TrG5h" value="T" />
         </node>
+        <node concept="2JFqV2" id="4WeLqVwUCko" role="2frcjj" />
       </node>
       <node concept="2tJIrI" id="104EUzG8L8d" role="jymVt" />
       <node concept="16euLQ" id="6YPNC4OFzzK" role="16eVyc">
@@ -4014,12 +3839,6 @@
       <node concept="3uibUv" id="2ev$9JFHGVP" role="EKbjA">
         <ref role="3uigEE" node="3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
       </node>
-      <node concept="3uibUv" id="6YPNC4PfWOU" role="1zkMxy">
-        <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-        <node concept="3uibUv" id="6YPNC4PfY3u" role="11_B2D">
-          <ref role="3uigEE" node="2q_78a95hAL" resolve="Action" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="3JgCwkqhoku" role="jymVt" />
     <node concept="3clFbW" id="47nvOnTQN6Q" role="jymVt">
@@ -4973,12 +4792,6 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
     </node>
-    <node concept="3uibUv" id="6YPNC4OOr_n" role="1zkMxy">
-      <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-      <node concept="3uibUv" id="6YPNC4OOv0L" role="11_B2D">
-        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="3OPtF03lco4">
     <property role="TrG5h" value="ListNode" />
@@ -7982,12 +7795,6 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
-      <node concept="3uibUv" id="6YPNC4OOjf8" role="1zkMxy">
-        <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-        <node concept="3uibUv" id="6YPNC4OOlep" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="5s497VqXz0L" role="jymVt" />
     <node concept="312cEg" id="5s497Vr90Ww" role="jymVt">
@@ -8055,12 +7862,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="262rtspU0ZZ" role="jymVt" />
-    <node concept="3uibUv" id="6YPNC4PgOLv" role="1zkMxy">
-      <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-      <node concept="3uibUv" id="6YPNC4PgSTi" role="11_B2D">
-        <ref role="3uigEE" node="2q_78a95hAL" resolve="Action" />
-      </node>
-    </node>
   </node>
   <node concept="Qs71p" id="2q_78a95hAL">
     <property role="TrG5h" value="Action" />
@@ -8311,12 +8112,6 @@
           <ref role="3uigEE" node="3OPtF031GQe" resolve="Mappers.MapDelegate" />
         </node>
       </node>
-      <node concept="3uibUv" id="6YPNC4OObZt" role="1zkMxy">
-        <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-        <node concept="3uibUv" id="6YPNC4OOdB1" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="5s497VqqG$D" role="jymVt" />
     <node concept="3Tm1VV" id="3OPtF02T8yy" role="1B3o_S" />
@@ -12977,12 +12772,6 @@
       <node concept="3Tm6S6" id="6kEuCh$OweJ" role="1B3o_S" />
       <node concept="10P_77" id="6kEuCh$OweL" role="1tU5fm" />
     </node>
-    <node concept="3uibUv" id="6YPNC4PgA1x" role="1zkMxy">
-      <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-      <node concept="3uibUv" id="6YPNC4PgE8M" role="11_B2D">
-        <ref role="3uigEE" node="2q_78a95hAL" resolve="Action" />
-      </node>
-    </node>
     <node concept="312cEg" id="3KN3A4uuUFM" role="jymVt">
       <property role="TrG5h" value="printable" />
       <node concept="3Tm6S6" id="3KN3A4uuUFN" role="1B3o_S" />
@@ -13249,12 +13038,6 @@
     </node>
     <node concept="2tJIrI" id="7lmP5gAhFgZ" role="jymVt" />
     <node concept="3Tm1VV" id="7lmP5gAhjKs" role="1B3o_S" />
-    <node concept="3uibUv" id="7lmP5gAhlm8" role="1zkMxy">
-      <ref role="3uigEE" node="6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-      <node concept="3uibUv" id="7lmP5gAhlq1" role="11_B2D">
-        <ref role="3uigEE" node="2q_78a95hAL" resolve="Action" />
-      </node>
-    </node>
     <node concept="3uibUv" id="7lmP5gAhoak" role="EKbjA">
       <ref role="3uigEE" node="3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
     </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 83bb8392..20c16079 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
@@ -5259,7 +5259,7 @@
                           <node concept="YeOm9" id="500mE4_xd_d" role="2ShVmc">
                             <node concept="1Y3b0j" id="500mE4_xd_e" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="6exd:6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
+                              <ref role="1Y3XeK" to="6exd:104EUzFOARB" resolve="Visitor" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="500mE4_xd_f" role="1B3o_S" />
                               <node concept="3clFb_" id="500mE4_xd_g" role="jymVt">
@@ -5353,7 +5353,7 @@
                                     <node concept="3cpWsn" id="500mE4_xd_P" role="3cpWs9">
                                       <property role="TrG5h" value="visitor" />
                                       <node concept="3uibUv" id="500mE4_xd_Q" role="1tU5fm">
-                                        <ref role="3uigEE" to="6exd:6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
+                                        <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="Visitor" />
                                         <node concept="3uibUv" id="500mE4_xd_R" role="11_B2D">
                                           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                         </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 0dd38e0e..d3408684 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -2735,9 +2735,9 @@
       <node concept="3Tm1VV" id="tc9pc3wRUa" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="tc9pc3z7lL" role="jymVt" />
-    <node concept="3uibUv" id="tc9pc3z9Bb" role="1zkMxy">
-      <ref role="3uigEE" to="6exd:6HT7BWBQcxv" resolve="DataForm.Visitor.Stub" />
-      <node concept="3uibUv" id="4aLjyB0FEwb" role="11_B2D">
+    <node concept="3uibUv" id="4WeLqVwUHoU" role="EKbjA">
+      <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
+      <node concept="3uibUv" id="4WeLqVwUJug" role="11_B2D">
         <ref role="3uigEE" to="wyt6:~Void" resolve="Void" />
       </node>
     </node>