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 03f05aff..6d2c81d4 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
@@ -15723,7 +15723,11 @@
               <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 concept="3clFbS" id="5dFCr0xEg00" role="3clF47">
+              <node concept="3clFbF" id="1RYTbd6H_1k" role="3cqZAp">
+                <node concept="10Nm6u" id="1RYTbd6H_1j" role="3clFbG" />
+              </node>
+            </node>
           </node>
           <node concept="2tJIrI" id="5dFCr0xEfYS" role="jymVt" />
           <node concept="3KIgzJ" id="6P1UyJpnUA8" role="jymVt">
@@ -15806,62 +15810,8 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5ST" id="6P1UyJpnUAE" role="1ojpOf">
-                      <property role="TrG5h" value="_specification_" />
-                      <node concept="1oi5UN" id="6P1UyJpnUAF" role="1oi5TL">
-                        <node concept="1sPUBX" id="6P1UyJpnUAG" role="lGtFl">
-                          <ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
-                          <node concept="v3LJS" id="6P1UyJpnUAH" role="v9R3O">
-                            <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
-                          </node>
-                          <node concept="v3LJS" id="6P1UyJpnUAI" role="v9R3O">
-                            <ref role="v3LJV" node="6P1UyJpnSC$" resolve="originSrcNode" />
-                          </node>
-                          <node concept="3NFfHV" id="6P1UyJpnUAJ" role="1sPUBK">
-                            <node concept="3clFbS" id="6P1UyJpnUAK" role="2VODD2">
-                              <node concept="3clFbF" id="6P1UyJpnUAL" role="3cqZAp">
-                                <node concept="2OqwBi" id="6P1UyJpnUAM" role="3clFbG">
-                                  <node concept="v3LJS" id="6P1UyJpnUAN" role="2Oq$k0">
-                                    <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
-                                  </node>
-                                  <node concept="2Kt2Hk" id="6P1UyJpnUAO" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="17Uvod" id="1RYTbd6oIKB" role="lGtFl">
-                        <property role="2qtEX9" value="name" />
-                        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                        <node concept="3zFVjK" id="1RYTbd6oIKC" role="3zH0cK">
-                          <node concept="3clFbS" id="1RYTbd6oIKD" role="2VODD2">
-                            <node concept="3clFbF" id="1RYTbd6oIL_" role="3cqZAp">
-                              <node concept="10M0yZ" id="1RYTbd6oIQH" role="3clFbG">
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
                     <node concept="1oi5ST" id="6P1UyJpnUAP" role="1ojpOf">
                       <property role="TrG5h" value="name" />
-                      <node concept="1WS0z7" id="6P1UyJpnUAQ" role="lGtFl">
-                        <node concept="3JmXsc" id="6P1UyJpnUAR" role="3Jn$fo">
-                          <node concept="3clFbS" id="6P1UyJpnUAS" role="2VODD2">
-                            <node concept="3clFbF" id="6P1UyJpnUAT" role="3cqZAp">
-                              <node concept="2OqwBi" id="6P1UyJpnUAU" role="3clFbG">
-                                <node concept="30H73N" id="6P1UyJpnUAV" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6P1UyJpnUAW" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                       <node concept="22Ky0T" id="6P1UyJpnUAX" role="lGtFl">
                         <node concept="1rXfSq" id="5dFCr0xMZxE" role="22Ky0K">
                           <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
@@ -15884,6 +15834,60 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="1WS0z7" id="6P1UyJpnUAQ" role="lGtFl">
+                        <node concept="3JmXsc" id="6P1UyJpnUAR" role="3Jn$fo">
+                          <node concept="3clFbS" id="6P1UyJpnUAS" role="2VODD2">
+                            <node concept="3clFbF" id="6P1UyJpnUAT" role="3cqZAp">
+                              <node concept="2OqwBi" id="6P1UyJpnUAU" role="3clFbG">
+                                <node concept="30H73N" id="6P1UyJpnUAV" role="2Oq$k0" />
+                                <node concept="2qgKlT" id="6P1UyJpnUAW" role="2OqNvi">
+                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1oi5ST" id="1RYTbd6Hzn7" role="1ojpOf">
+                      <property role="TrG5h" value="_specification_" />
+                      <node concept="1oi5UN" id="1RYTbd6Hzn8" role="1oi5TL">
+                        <node concept="1sPUBX" id="1RYTbd6Hzn9" role="lGtFl">
+                          <ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
+                          <node concept="v3LJS" id="1RYTbd6Hzna" role="v9R3O">
+                            <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
+                          </node>
+                          <node concept="v3LJS" id="1RYTbd6Hznb" role="v9R3O">
+                            <ref role="v3LJV" node="6P1UyJpnSC$" resolve="originSrcNode" />
+                          </node>
+                          <node concept="3NFfHV" id="1RYTbd6Hznc" role="1sPUBK">
+                            <node concept="3clFbS" id="1RYTbd6Hznd" role="2VODD2">
+                              <node concept="3clFbF" id="1RYTbd6Hzne" role="3cqZAp">
+                                <node concept="2OqwBi" id="1RYTbd6Hznf" role="3clFbG">
+                                  <node concept="v3LJS" id="1RYTbd6Hzng" role="2Oq$k0">
+                                    <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
+                                  </node>
+                                  <node concept="2Kt2Hk" id="1RYTbd6Hznh" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="17Uvod" id="1RYTbd6Hzni" role="lGtFl">
+                        <property role="2qtEX9" value="name" />
+                        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                        <node concept="3zFVjK" id="1RYTbd6Hznj" role="3zH0cK">
+                          <node concept="3clFbS" id="1RYTbd6Hznk" role="2VODD2">
+                            <node concept="3clFbF" id="1RYTbd6Hznl" role="3cqZAp">
+                              <node concept="10M0yZ" id="1RYTbd6Hznm" role="3clFbG">
+                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                     <node concept="raruj" id="6P1UyJpnUB9" role="lGtFl" />
                   </node>
@@ -15919,7 +15923,11 @@
               <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 concept="3clFbS" id="5dFCr0xEfb8" role="3clF47">
+              <node concept="3clFbF" id="1RYTbd6H_0I" role="3cqZAp">
+                <node concept="10Nm6u" id="1RYTbd6H_0H" role="3clFbG" />
+              </node>
+            </node>
           </node>
           <node concept="2tJIrI" id="5dFCr0xEf9X" role="jymVt" />
           <node concept="3KIgzJ" id="4lCLOtwwaTD" role="jymVt">
@@ -15963,38 +15971,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5ST" id="4vr5SAptRDh" role="1ojpOf">
-                      <property role="TrG5h" value="_specification_" />
-                      <node concept="2IllgU" id="4vr5SAptSzP" role="1oi5TL" />
-                      <node concept="1W57fq" id="4vr5SAptSzT" role="lGtFl">
-                        <node concept="3IZrLx" id="4vr5SAptSzU" role="3IZSJc">
-                          <node concept="3clFbS" id="4vr5SAptSzV" role="2VODD2">
-                            <node concept="3clFbF" id="4vr5SAptSBX" role="3cqZAp">
-                              <node concept="2OqwBi" id="4vr5SAptSQd" role="3clFbG">
-                                <node concept="30H73N" id="4vr5SAptSBW" role="2Oq$k0" />
-                                <node concept="3TrcHB" id="4vr5SAptT0v" role="2OqNvi">
-                                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="17Uvod" id="1RYTbd6oJuM" role="lGtFl">
-                        <property role="2qtEX9" value="name" />
-                        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                        <node concept="3zFVjK" id="1RYTbd6oJuN" role="3zH0cK">
-                          <node concept="3clFbS" id="1RYTbd6oJuO" role="2VODD2">
-                            <node concept="3clFbF" id="1RYTbd6oJzW" role="3cqZAp">
-                              <node concept="10M0yZ" id="1RYTbd6oJ$b" role="3clFbG">
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
                     <node concept="1oi5Wm" id="4lCLOtwwaTR" role="1ojpOf">
                       <property role="TrG5h" value="name" />
                       <node concept="1WS0z7" id="4lCLOtwwaTS" role="lGtFl">
@@ -16073,6 +16049,38 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="1oi5ST" id="1RYTbd6H$uV" role="1ojpOf">
+                      <property role="TrG5h" value="_specification_" />
+                      <node concept="2IllgU" id="1RYTbd6H$uW" role="1oi5TL" />
+                      <node concept="1W57fq" id="1RYTbd6H$uX" role="lGtFl">
+                        <node concept="3IZrLx" id="1RYTbd6H$uY" role="3IZSJc">
+                          <node concept="3clFbS" id="1RYTbd6H$uZ" role="2VODD2">
+                            <node concept="3clFbF" id="1RYTbd6H$v0" role="3cqZAp">
+                              <node concept="2OqwBi" id="1RYTbd6H$v1" role="3clFbG">
+                                <node concept="30H73N" id="1RYTbd6H$v2" role="2Oq$k0" />
+                                <node concept="3TrcHB" id="1RYTbd6H$v3" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="17Uvod" id="1RYTbd6H$v4" role="lGtFl">
+                        <property role="2qtEX9" value="name" />
+                        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                        <node concept="3zFVjK" id="1RYTbd6H$v5" role="3zH0cK">
+                          <node concept="3clFbS" id="1RYTbd6H$v6" role="2VODD2">
+                            <node concept="3clFbF" id="1RYTbd6H$v7" role="3cqZAp">
+                              <node concept="10M0yZ" id="1RYTbd6H$v8" role="3clFbG">
+                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
+                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="raruj" id="4lCLOtwwaUv" role="lGtFl" />
                   </node>
                 </node>