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 df97eec4..fed2c326 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
@@ -15716,6 +15716,15 @@
       <node concept="1Koe21" id="6P1UyJpnUA6" role="1lVwrX">
         <node concept="312cEu" id="6P1UyJpnUA7" role="1Koe22">
           <property role="TrG5h" value="_DataForm" />
+          <node concept="3clFb_" id="5dFCr0xEfZX" role="jymVt">
+            <property role="TrG5h" value="feature" />
+            <node concept="3uibUv" id="5dFCr0xEfZY" role="3clF45">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+            <node concept="3Tm1VV" id="5dFCr0xEfZZ" role="1B3o_S" />
+            <node concept="3clFbS" id="5dFCr0xEg00" role="3clF47" />
+          </node>
+          <node concept="2tJIrI" id="5dFCr0xEfYS" role="jymVt" />
           <node concept="3KIgzJ" id="6P1UyJpnUA8" role="jymVt">
             <node concept="3clFbS" id="6P1UyJpnUA9" role="3KIlGz">
               <node concept="3cpWs6" id="6P1UyJpnUAa" role="3cqZAp">
@@ -15760,24 +15769,19 @@
                         </node>
                       </node>
                       <node concept="22Ky0T" id="6P1UyJpnUAu" role="lGtFl">
-                        <node concept="2OqwBi" id="6P1UyJpnUAv" role="22Ky0K">
-                          <node concept="Xjq3P" id="6P1UyJpnUAw" role="2Oq$k0">
-                            <ref role="1HBi2w" node="6P1UyJpnUA7" resolve="_DataForm" />
-                          </node>
-                          <node concept="liA8E" id="6P1UyJpnUAx" role="2OqNvi">
-                            <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                            <node concept="1ZhdrF" id="6P1UyJpnUAy" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="6P1UyJpnUAz" role="3$ytzL">
-                                <node concept="3clFbS" id="6P1UyJpnUA$" role="2VODD2">
-                                  <node concept="3clFbF" id="6P1UyJpnUA_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="6P1UyJpnUAA" role="3clFbG">
-                                      <node concept="1iwH7S" id="6P1UyJpnUAB" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="6P1UyJpnUAC" role="2OqNvi">
-                                        <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                        <node concept="30H73N" id="6P1UyJpnUAD" role="1iwH7V" />
-                                      </node>
+                        <node concept="1rXfSq" id="5dFCr0xMZ2k" role="22Ky0K">
+                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                          <node concept="1ZhdrF" id="5dFCr0xMZ2m" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="5dFCr0xMZ2n" role="3$ytzL">
+                              <node concept="3clFbS" id="5dFCr0xMZ2o" role="2VODD2">
+                                <node concept="3clFbF" id="6P1UyJpnUA_" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6P1UyJpnUAA" role="3clFbG">
+                                    <node concept="1iwH7S" id="6P1UyJpnUAB" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="6P1UyJpnUAC" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                      <node concept="30H73N" id="6P1UyJpnUAD" role="1iwH7V" />
                                     </node>
                                   </node>
                                 </node>
@@ -15830,24 +15834,19 @@
                         </node>
                       </node>
                       <node concept="22Ky0T" id="6P1UyJpnUAX" role="lGtFl">
-                        <node concept="2OqwBi" id="6P1UyJpnUAY" role="22Ky0K">
-                          <node concept="Xjq3P" id="6P1UyJpnUAZ" role="2Oq$k0">
-                            <ref role="1HBi2w" node="6P1UyJpnUA7" resolve="_DataForm" />
-                          </node>
-                          <node concept="liA8E" id="6P1UyJpnUB0" role="2OqNvi">
-                            <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                            <node concept="1ZhdrF" id="6P1UyJpnUB1" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="6P1UyJpnUB2" role="3$ytzL">
-                                <node concept="3clFbS" id="6P1UyJpnUB3" role="2VODD2">
-                                  <node concept="3clFbF" id="6P1UyJpnUB4" role="3cqZAp">
-                                    <node concept="2OqwBi" id="6P1UyJpnUB5" role="3clFbG">
-                                      <node concept="1iwH7S" id="6P1UyJpnUB6" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="6P1UyJpnUB7" role="2OqNvi">
-                                        <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                        <node concept="30H73N" id="6P1UyJpnUB8" role="1iwH7V" />
-                                      </node>
+                        <node concept="1rXfSq" id="5dFCr0xMZxE" role="22Ky0K">
+                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                          <node concept="1ZhdrF" id="5dFCr0xMZxG" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="5dFCr0xMZxH" role="3$ytzL">
+                              <node concept="3clFbS" id="5dFCr0xMZxI" role="2VODD2">
+                                <node concept="3clFbF" id="6P1UyJpnUB4" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6P1UyJpnUB5" role="3clFbG">
+                                    <node concept="1iwH7S" id="6P1UyJpnUB6" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="6P1UyJpnUB7" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                      <node concept="30H73N" id="6P1UyJpnUB8" role="1iwH7V" />
                                     </node>
                                   </node>
                                 </node>
@@ -15864,7 +15863,7 @@
               <node concept="3clFbH" id="6P1UyJpnUBa" role="3cqZAp" />
             </node>
           </node>
-          <node concept="3Tm1VV" id="6P1UyJpnUBb" role="1B3o_S" />
+          <node concept="3Tm6S6" id="5dFCr0xEfYP" role="1B3o_S" />
         </node>
       </node>
     </node>
@@ -15886,6 +15885,15 @@
       <node concept="1Koe21" id="4lCLOtwwaTB" role="1lVwrX">
         <node concept="312cEu" id="4lCLOtwwaTC" role="1Koe22">
           <property role="TrG5h" value="_DataForm" />
+          <node concept="3clFb_" id="5dFCr0xEfb4" role="jymVt">
+            <property role="TrG5h" value="feature" />
+            <node concept="3uibUv" id="5dFCr0xEfcn" role="3clF45">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+            <node concept="3Tm1VV" id="5dFCr0xEfb7" role="1B3o_S" />
+            <node concept="3clFbS" id="5dFCr0xEfb8" role="3clF47" />
+          </node>
+          <node concept="2tJIrI" id="5dFCr0xEf9X" role="jymVt" />
           <node concept="3KIgzJ" id="4lCLOtwwaTD" role="jymVt">
             <node concept="3clFbS" id="4lCLOtwwaTE" role="3KIlGz">
               <node concept="3cpWs6" id="4lCLOtwwaTF" role="3cqZAp">
@@ -15948,24 +15956,19 @@
                         </node>
                       </node>
                       <node concept="22Ky0T" id="4lCLOtwwaTZ" role="lGtFl">
-                        <node concept="2OqwBi" id="4lCLOtwwaU0" role="22Ky0K">
-                          <node concept="Xjq3P" id="4lCLOtwwaU1" role="2Oq$k0">
-                            <ref role="1HBi2w" node="4lCLOtwwaTC" resolve="_DataForm" />
-                          </node>
-                          <node concept="liA8E" id="4lCLOtwwaU2" role="2OqNvi">
-                            <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                            <node concept="1ZhdrF" id="4lCLOtwwaU3" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="4lCLOtwwaU4" role="3$ytzL">
-                                <node concept="3clFbS" id="4lCLOtwwaU5" role="2VODD2">
-                                  <node concept="3clFbF" id="4lCLOtwwaU6" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4lCLOtwwaU7" role="3clFbG">
-                                      <node concept="1iwH7S" id="4lCLOtwwaU8" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="4lCLOtwwaU9" role="2OqNvi">
-                                        <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                        <node concept="30H73N" id="4lCLOtwwaUa" role="1iwH7V" />
-                                      </node>
+                        <node concept="1rXfSq" id="5dFCr0xN3Ul" role="22Ky0K">
+                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                          <node concept="1ZhdrF" id="5dFCr0xN3Un" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="5dFCr0xN3Uo" role="3$ytzL">
+                              <node concept="3clFbS" id="5dFCr0xN3Up" role="2VODD2">
+                                <node concept="3clFbF" id="4lCLOtwwaU6" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4lCLOtwwaU7" role="3clFbG">
+                                    <node concept="1iwH7S" id="4lCLOtwwaU8" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4lCLOtwwaU9" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                      <node concept="30H73N" id="4lCLOtwwaUa" role="1iwH7V" />
                                     </node>
                                   </node>
                                 </node>
@@ -15992,24 +15995,19 @@
                         </node>
                       </node>
                       <node concept="22Ky0T" id="4lCLOtwwaUj" role="lGtFl">
-                        <node concept="2OqwBi" id="4lCLOtwwaUk" role="22Ky0K">
-                          <node concept="Xjq3P" id="4lCLOtwwaUl" role="2Oq$k0">
-                            <ref role="1HBi2w" node="4lCLOtwwaTC" resolve="_DataForm" />
-                          </node>
-                          <node concept="liA8E" id="4lCLOtwwaUm" role="2OqNvi">
-                            <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                            <node concept="1ZhdrF" id="4lCLOtwwaUn" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="4lCLOtwwaUo" role="3$ytzL">
-                                <node concept="3clFbS" id="4lCLOtwwaUp" role="2VODD2">
-                                  <node concept="3clFbF" id="4lCLOtwwaUq" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4lCLOtwwaUr" role="3clFbG">
-                                      <node concept="1iwH7S" id="4lCLOtwwaUs" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="4lCLOtwwaUt" role="2OqNvi">
-                                        <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                        <node concept="30H73N" id="4lCLOtwwaUu" role="1iwH7V" />
-                                      </node>
+                        <node concept="1rXfSq" id="5dFCr0xN44q" role="22Ky0K">
+                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                          <node concept="1ZhdrF" id="5dFCr0xN44J" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="5dFCr0xN44K" role="3$ytzL">
+                              <node concept="3clFbS" id="5dFCr0xN44L" role="2VODD2">
+                                <node concept="3clFbF" id="4lCLOtwwaUq" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4lCLOtwwaUr" role="3clFbG">
+                                    <node concept="1iwH7S" id="4lCLOtwwaUs" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4lCLOtwwaUt" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                      <node concept="30H73N" id="4lCLOtwwaUu" role="1iwH7V" />
                                     </node>
                                   </node>
                                 </node>
@@ -16025,7 +16023,7 @@
               </node>
             </node>
           </node>
-          <node concept="3Tm1VV" id="4lCLOtwwaUw" role="1B3o_S" />
+          <node concept="3Tm6S6" id="5dFCr0xEfcq" role="1B3o_S" />
         </node>
       </node>
     </node>